Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…

…o ansi_301_2022_cfis # Conflicts: # HPXMLtoOpenStudio/measure.xml
NREL · Jul 2, 2024 · cb1bd15 · cb1bd15
2 parents aefb49b + e10e41e
commit cb1bd15
Show file tree

Hide file tree

Showing 60 changed files with 3,148 additions and 1,409 deletions.
diff --git a/BuildResidentialHPXML/README.md b/BuildResidentialHPXML/README.md
@@ -2238,7 +2238,7 @@ The user-specified temperature (e.g., 17F or 5F) for the above heating capacity
 - **Name:** ``heat_pump_heating_capacity_retention_temp``
 - **Type:** ``Double``
 
-- **Units:** ``deg-F``
+- **Units:** ``F``
 
 - **Required:** ``false``
 
@@ -2314,7 +2314,7 @@ The temperature below which the heat pump compressor is disabled. If both this a
 - **Name:** ``heat_pump_compressor_lockout_temp``
 - **Type:** ``Double``
 
-- **Units:** ``deg-F``
+- **Units:** ``F``
 
 - **Required:** ``false``
 
@@ -2401,7 +2401,7 @@ The temperature above which the heat pump backup system is disabled. If both thi
 - **Name:** ``heat_pump_backup_heating_lockout_temp``
 - **Type:** ``Double``
 
-- **Units:** ``deg-F``
+- **Units:** ``F``
 
 - **Required:** ``false``
 
@@ -2498,7 +2498,7 @@ Type of capacity values for detailed performance data if available. Applies only
 
 **HVAC Detailed Performance Data: Heating Outdoor Temperatures**
 
-Outdoor temperatures of heating detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 47 deg-F. At least two performance data points are required using a comma-separated list.
+Outdoor temperatures of heating detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 47 F. At least two performance data points are required using a comma-separated list.
 
 - **Name:** ``hvac_perf_data_heating_outdoor_temperatures``
 - **Type:** ``String``
@@ -2553,7 +2553,7 @@ Maximum speed efficiency COP values of heating detailed performance data if avai
 
 **HVAC Detailed Performance Data: Cooling Outdoor Temperatures**
 
-Outdoor temperatures of cooling detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 95 deg-F. At least two performance data points are required using a comma-separated list.
+Outdoor temperatures of cooling detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 95 F. At least two performance data points are required using a comma-separated list.
 
 - **Name:** ``hvac_perf_data_cooling_outdoor_temperatures``
 - **Type:** ``String``
@@ -3683,7 +3683,7 @@ The standby loss of water heater. Only applies to space-heating boilers. If not
 - **Name:** ``water_heater_standby_loss``
 - **Type:** ``Double``
 
-- **Units:** ``deg-F/hr``
+- **Units:** ``F/hr``
 
 - **Required:** ``false``
 
@@ -3709,7 +3709,7 @@ The setpoint temperature of water heater. If not provided, the OS-HPXML default
 - **Name:** ``water_heater_setpoint_temperature``
 - **Type:** ``Double``
 
-- **Units:** ``deg-F``
+- **Units:** ``F``
 
 - **Required:** ``false``
 
@@ -5049,7 +5049,7 @@ The space type for the extra refrigerator location. If not provided, the OS-HPXM
 
 **Extra Refrigerator: Rated Annual Consumption**
 
-The EnergyGuide rated annual energy consumption for an extra rrefrigerator. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#hpxml-refrigerators'>HPXML Refrigerators</a>) is used.
+The EnergyGuide rated annual energy consumption for an extra refrigerator. If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#hpxml-refrigerators'>HPXML Refrigerators</a>) is used.
 
 - **Name:** ``extra_refrigerator_rated_annual_kwh``
 - **Type:** ``Double``
@@ -5246,7 +5246,7 @@ The cooling setpoint temperature offset during months when the ceiling fans are
 - **Name:** ``ceiling_fan_cooling_setpoint_temp_offset``
 - **Type:** ``Double``
 
-- **Units:** ``deg-F``
+- **Units:** ``F``
 
 - **Required:** ``false``
 

diff --git a/BuildResidentialHPXML/measure.rb b/BuildResidentialHPXML/measure.rb
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>5bba0282-12b2-4602-b7cf-7242adce2cab</version_id>
-  <version_modified>2024-06-20T23:43:28Z</version_modified>
+  <version_id>343865cd-52dc-4e6d-af60-afb743eed6ec</version_id>
+  <version_modified>2024-07-01T16:47:23Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -2807,7 +2807,7 @@
       <display_name>Heat Pump: Heating Capacity Retention Temperature</display_name>
       <description>The user-specified temperature (e.g., 17F or 5F) for the above heating capacity retention fraction. Applies to all heat pump types except ground-to-air. Required if the Heating Capacity Retention Fraction is provided.</description>
       <type>Double</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -2862,7 +2862,7 @@
       <display_name>Heat Pump: Compressor Lockout Temperature</display_name>
       <description>The temperature below which the heat pump compressor is disabled. If both this and Backup Heating Lockout Temperature are provided and use the same value, it essentially defines a switchover temperature (for, e.g., a dual-fuel heat pump). Applies to all heat pump types other than ground-to-air. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#air-to-air-heat-pump'&gt;Air-to-Air Heat Pump&lt;/a&gt;, &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#mini-split-heat-pump'&gt;Mini-Split Heat Pump&lt;/a&gt;, &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#packaged-terminal-heat-pump'&gt;Packaged Terminal Heat Pump&lt;/a&gt;, &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#room-air-conditioner-w-reverse-cycle'&gt;Room Air Conditioner w/ Reverse Cycle&lt;/a&gt;) is used.</description>
       <type>Double</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -2956,7 +2956,7 @@
       <display_name>Heat Pump: Backup Heating Lockout Temperature</display_name>
       <description>The temperature above which the heat pump backup system is disabled. If both this and Compressor Lockout Temperature are provided and use the same value, it essentially defines a switchover temperature (for, e.g., a dual-fuel heat pump). Applies for both Backup Type of 'integrated' and 'separate'. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#backup'&gt;Backup&lt;/a&gt;) is used.</description>
       <type>Double</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -3067,9 +3067,9 @@
     <argument>
       <name>hvac_perf_data_heating_outdoor_temperatures</name>
       <display_name>HVAC Detailed Performance Data: Heating Outdoor Temperatures</display_name>
-      <description>Outdoor temperatures of heating detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 47 deg-F. At least two performance data points are required using a comma-separated list.</description>
+      <description>Outdoor temperatures of heating detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 47 F. At least two performance data points are required using a comma-separated list.</description>
       <type>String</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -3112,9 +3112,9 @@
     <argument>
       <name>hvac_perf_data_cooling_outdoor_temperatures</name>
       <display_name>HVAC Detailed Performance Data: Cooling Outdoor Temperatures</display_name>
-      <description>Outdoor temperatures of cooling detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 95 deg-F. At least two performance data points are required using a comma-separated list.</description>
+      <description>Outdoor temperatures of cooling detailed performance data if available. Applies only to variable-speed air-source HVAC systems (central air conditioners, mini-split air conditioners, air-to-air heat pumps, and mini-split heat pumps). One of the outdoor temperatures must be 95 F. At least two performance data points are required using a comma-separated list.</description>
       <type>String</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -3447,7 +3447,7 @@
       <display_name>HVAC Control: Heating Weekday Setpoint Schedule</display_name>
       <description>Specify the constant or 24-hour comma-separated weekday heating setpoint schedule. Required unless a detailed CSV schedule is provided.</description>
       <type>String</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -3456,7 +3456,7 @@
       <display_name>HVAC Control: Heating Weekend Setpoint Schedule</display_name>
       <description>Specify the constant or 24-hour comma-separated weekend heating setpoint schedule. Required unless a detailed CSV schedule is provided.</description>
       <type>String</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -3465,7 +3465,7 @@
       <display_name>HVAC Control: Cooling Weekday Setpoint Schedule</display_name>
       <description>Specify the constant or 24-hour comma-separated weekday cooling setpoint schedule. Required unless a detailed CSV schedule is provided.</description>
       <type>String</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -3474,7 +3474,7 @@
       <display_name>HVAC Control: Cooling Weekend Setpoint Schedule</display_name>
       <description>Specify the constant or 24-hour comma-separated weekend cooling setpoint schedule. Required unless a detailed CSV schedule is provided.</description>
       <type>String</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -4532,7 +4532,7 @@
       <display_name>Water Heater: Standby Loss</display_name>
       <description>The standby loss of water heater. Only applies to space-heating boilers. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#combi-boiler-w-storage'&gt;Combi Boiler w/ Storage&lt;/a&gt;) is used.</description>
       <type>Double</type>
-      <units>deg-F/hr</units>
+      <units>F/hr</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -4550,7 +4550,7 @@
       <display_name>Water Heater: Setpoint Temperature</display_name>
       <description>The setpoint temperature of water heater. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#hpxml-water-heating-systems'&gt;HPXML Water Heating Systems&lt;/a&gt;) is used.</description>
       <type>Double</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -6153,7 +6153,7 @@
     <argument>
       <name>extra_refrigerator_rated_annual_kwh</name>
       <display_name>Extra Refrigerator: Rated Annual Consumption</display_name>
-      <description>The EnergyGuide rated annual energy consumption for an extra rrefrigerator. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#hpxml-refrigerators'&gt;HPXML Refrigerators&lt;/a&gt;) is used.</description>
+      <description>The EnergyGuide rated annual energy consumption for an extra refrigerator. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#hpxml-refrigerators'&gt;HPXML Refrigerators&lt;/a&gt;) is used.</description>
       <type>Double</type>
       <units>kWh/yr</units>
       <required>false</required>
@@ -6436,7 +6436,7 @@
       <display_name>Ceiling Fan: Cooling Setpoint Temperature Offset</display_name>
       <description>The cooling setpoint temperature offset during months when the ceiling fans are operating. Only applies if ceiling fan quantity is greater than zero. If not provided, the OS-HPXML default (see &lt;a href='https://openstudio-hpxml.readthedocs.io/en/v1.8.1/workflow_inputs.html#hpxml-ceiling-fans'&gt;HPXML Ceiling Fans&lt;/a&gt;) is used.</description>
       <type>Double</type>
-      <units>deg-F</units>
+      <units>F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -7343,7 +7343,7 @@
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
-      <checksum>7BEAF038</checksum>
+      <checksum>CFBA07D1</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>
@@ -7360,19 +7360,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>D8FCCD88</checksum>
+      <checksum>512A8D37</checksum>
     </file>
     <file>
       <filename>geometry.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F6952477</checksum>
+      <checksum>8AE4C454</checksum>
     </file>
     <file>
       <filename>test_build_residential_hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>92AD700D</checksum>
+      <checksum>A40F646C</checksum>
     </file>
   </files>
 </measure>