Reduce diffs.

NREL · Jun 27, 2024 · 54a0b6a · 54a0b6a
1 parent 375f04a
commit 54a0b6a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/BuildResidentialHPXML/README.md b/BuildResidentialHPXML/README.md
@@ -5912,6 +5912,17 @@ Electricity tariff file specified as an absolute/relative path to a file with ut
 
 <br/>
 
+**Utility Bills: Electricity Fixed Charges**
+
+Electricity utility bill monthly fixed charges. If multiple scenarios, use a comma-separated list.
+
+- **Name:** ``utility_bill_electricity_fixed_charges``
+- **Type:** ``String``
+
+- **Required:** ``false``
+
+<br/>
+
 **Utility Bills: Natural Gas Fixed Charges**
 
 Natural gas utility bill monthly fixed charges. If multiple scenarios, use a comma-separated list.
@@ -5978,11 +5989,11 @@ Wood pellets utility bill monthly fixed charges. If multiple scenarios, use a co
 
 <br/>
 
-**Utility Bills: Electricity Fixed Charges**
+**Utility Bills: Electricity Marginal Rates**
 
-Electricity utility bill monthly fixed charges. If multiple scenarios, use a comma-separated list.
+Electricity utility bill marginal rates. If multiple scenarios, use a comma-separated list.
 
-- **Name:** ``utility_bill_electricity_fixed_charges``
+- **Name:** ``utility_bill_electricity_marginal_rates``
 - **Type:** ``String``
 
 - **Required:** ``false``
@@ -6055,17 +6066,6 @@ Wood pellets utility bill marginal rates. If multiple scenarios, use a comma-sep
 
 <br/>
 
-**Utility Bills: Electricity Marginal Rates**
-
-Electricity utility bill marginal rates. If multiple scenarios, use a comma-separated list.
-
-- **Name:** ``utility_bill_electricity_marginal_rates``
-- **Type:** ``String``
-
-- **Required:** ``false``
-
-<br/>
-
 **Utility Bills: PV Compensation Types**
 
 Utility bill PV compensation types. If multiple scenarios, use a comma-separated list.

diff --git a/BuildResidentialHPXML/measure.xml b/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>41c90290-b4c5-478f-a31e-626566b840c7</version_id>
-  <version_modified>2024-06-27T22:08:05Z</version_modified>
+  <version_id>289ea4ef-9493-46b1-bbb0-60af732e217a</version_id>
+  <version_modified>2024-06-27T22:13:46Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -7100,6 +7100,14 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>utility_bill_electricity_fixed_charges</name>
+      <display_name>Utility Bills: Electricity Fixed Charges</display_name>
+      <description>Electricity utility bill monthly fixed charges. If multiple scenarios, use a comma-separated list.</description>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>utility_bill_natural_gas_fixed_charges</name>
       <display_name>Utility Bills: Natural Gas Fixed Charges</display_name>
@@ -7149,9 +7157,9 @@
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>utility_bill_electricity_fixed_charges</name>
-      <display_name>Utility Bills: Electricity Fixed Charges</display_name>
-      <description>Electricity utility bill monthly fixed charges. If multiple scenarios, use a comma-separated list.</description>
+      <name>utility_bill_electricity_marginal_rates</name>
+      <display_name>Utility Bills: Electricity Marginal Rates</display_name>
+      <description>Electricity utility bill marginal rates. If multiple scenarios, use a comma-separated list.</description>
       <type>String</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -7204,14 +7212,6 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
-    <argument>
-      <name>utility_bill_electricity_marginal_rates</name>
-      <display_name>Utility Bills: Electricity Marginal Rates</display_name>
-      <description>Electricity utility bill marginal rates. If multiple scenarios, use a comma-separated list.</description>
-      <type>String</type>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-    </argument>
     <argument>
       <name>utility_bill_pv_compensation_types</name>
       <display_name>Utility Bills: PV Compensation Types</display_name>
@@ -7343,7 +7343,7 @@
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
-      <checksum>69BB1079</checksum>
+      <checksum>4A4D37DD</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>43ac48fb-2bea-4d71-961a-5f20e4eba646</version_id>
-  <version_modified>2024-06-27T22:08:08Z</version_modified>
+  <version_id>f415d90a-7373-4854-8b51-90431e1dacca</version_id>
+  <version_modified>2024-06-27T22:12:25Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -345,7 +345,7 @@
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>3E6A2424</checksum>
+      <checksum>4F11ECF6</checksum>
     </file>
     <file>
       <filename>hpxml_defaults.rb</filename>

diff --git a/HPXMLtoOpenStudio/resources/hpxml.rb b/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -8342,7 +8342,7 @@ def self.fossil_fuels
   end
 
   def self.all_fuels
-    return fossil_fuels + [HPXML::FuelTypeElectricity]
+    return [HPXML::FuelTypeElectricity] + fossil_fuels
   end
 
   def self.vented_locations