urbanopt-cli 0.9.3 → 0.10.0

data/example_files/measures/BuildResidentialModel/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>build_residential_model</name>
   <uid>259dc35f-65e8-47d4-913f-69efede5a267</uid>
-  <version_id>b3c7ec2e-10f5-45d9-9a10-7527fec4565a</version_id>
-  <version_modified>20230105T165234Z</version_modified>
+  <version_id>62a1cfcd-d73a-4ea0-80e6-9c045acf63e7</version_id>
+  <version_modified>2023-07-13T21:29:35Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialModel</class_name>
   <display_name>Build Residential Model</display_name>
@@ -99,31 +99,51 @@
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>occupancy_calculation_type</name>
-      <display_name>Occupancy Calculation Type</display_name>
-      <description>The type of occupancy calculation type. If 'asset' is chosen, various end uses (e.g., clothes washer) are calculated using number of bedrooms and/or conditioned floor area. If 'operational' is chosen, end uses based on number of bedrooms are adjusted for the number of occupants. If not provided, the OS-HPXML default is used.</description>
+      <name>schedules_filepaths</name>
+      <display_name>Schedules: CSV File Paths</display_name>
+      <description>Absolute/relative paths of csv files containing user-specified detailed schedules. If multiple files, use a comma-separated list.</description>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>schedules_vacancy_period</name>
+      <display_name>Schedules: Vacancy Period</display_name>
+      <description>Specifies the vacancy period. Enter a date like "Dec 15 - Jan 15". Optionally, can enter hour of the day like "Dec 15 2 - Jan 15 20" (start hour can be 0 through 23 and end hour can be 1 through 24).</description>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>schedules_power_outage_period</name>
+      <display_name>Schedules: Power Outage Period</display_name>
+      <description>Specifies the power outage period. Enter a date like "Dec 15 - Jan 15". Optionally, can enter hour of the day like "Dec 15 2 - Jan 15 20" (start hour can be 0 through 23 and end hour can be 1 through 24).</description>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>schedules_power_outage_window_natvent_availability</name>
+      <display_name>Schedules: Power Outage Period Window Natural Ventilation Availability</display_name>
+      <description>The availability of the natural ventilation schedule during the outage period.</description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
       <choices>
         <choice>
-          <value>asset</value>
-          <display_name>asset</display_name>
+          <value>regular schedule</value>
+          <display_name>regular schedule</display_name>
         </choice>
         <choice>
-          <value>operational</value>
-          <display_name>operational</display_name>
+          <value>always available</value>
+          <display_name>always available</display_name>
+        </choice>
+        <choice>
+          <value>always unavailable</value>
+          <display_name>always unavailable</display_name>
         </choice>
       </choices>
     </argument>
-    <argument>
-      <name>schedules_filepaths</name>
-      <display_name>Schedules: CSV File Paths</display_name>
-      <description>Absolute/relative paths of csv files containing user-specified detailed schedules. If multiple files, use a comma-separated list.</description>
-      <type>String</type>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-    </argument>
     <argument>
       <name>simulation_control_timestep</name>
       <display_name>Simulation Control: Timestep</display_name>
@@ -603,7 +623,7 @@
       <display_name>Geometry: Unit Left Wall Is Adiabatic</display_name>
       <description>Presence of an adiabatic left wall.</description>
       <type>Boolean</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>false</default_value>
       <choices>
@@ -622,7 +642,7 @@
       <display_name>Geometry: Unit Right Wall Is Adiabatic</display_name>
       <description>Presence of an adiabatic right wall.</description>
       <type>Boolean</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>false</default_value>
       <choices>
@@ -641,7 +661,7 @@
       <display_name>Geometry: Unit Front Wall Is Adiabatic</display_name>
       <description>Presence of an adiabatic front wall, for example, the unit is adjacent to a conditioned corridor.</description>
       <type>Boolean</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>false</default_value>
       <choices>
@@ -660,7 +680,7 @@
       <display_name>Geometry: Unit Back Wall Is Adiabatic</display_name>
       <description>Presence of an adiabatic back wall.</description>
       <type>Boolean</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>false</default_value>
       <choices>
@@ -717,7 +737,7 @@
     <argument>
       <name>geometry_unit_num_bedrooms</name>
       <display_name>Geometry: Unit Number of Bedrooms</display_name>
-      <description>The number of bedrooms in the unit. Used to determine the energy usage of appliances and plug loads, hot water usage, etc.</description>
+      <description>The number of bedrooms in the unit.</description>
       <type>Integer</type>
       <units>#</units>
       <required>true</required>
@@ -736,7 +756,7 @@
     <argument>
       <name>geometry_unit_num_occupants</name>
       <display_name>Geometry: Unit Number of Occupants</display_name>
-      <description>The number of occupants in the unit. If not provided, the OS-HPXML default is used. Required if Occupancy Calculation Type is 'operational'.</description>
+      <description>The number of occupants in the unit. If not provided, an *asset* calculation is performed assuming standard occupancy, in which various end use defaults (e.g., plug loads, appliances, and hot water usage) are calculated based on Number of Bedrooms and Conditioned Floor Area per ANSI/RESNET/ICC 301-2019. If provided, an *operational* calculation is instead performed in which the end use defaults are adjusted using the relationship between Number of Bedrooms and Number of Occupants from RECS 2015.</description>
       <type>Double</type>
       <units>#</units>
       <required>false</required>
@@ -1001,24 +1021,6 @@
       <model_dependent>false</model_dependent>
       <default_value>2</default_value>
     </argument>
-    <argument>
-      <name>geometry_has_flue_or_chimney</name>
-      <display_name>Geometry: Has Flue or Chimney</display_name>
-      <description>Presence of flue or chimney for infiltration model. If not provided, the OS-HPXML default is used.</description>
-      <type>Boolean</type>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-      <choices>
-        <choice>
-          <value>true</value>
-          <display_name>true</display_name>
-        </choice>
-        <choice>
-          <value>false</value>
-          <display_name>false</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>neighbor_front_distance</name>
       <display_name>Neighbor: Front Distance</display_name>
@@ -1444,9 +1446,9 @@
     <argument>
       <name>roof_radiant_barrier_grade</name>
       <display_name>Roof: Radiant Barrier Grade</display_name>
-      <description>The grade of the radiant barrier, if it exists.</description>
+      <description>The grade of the radiant barrier. If not provided, the OS-HPXML default is used.</description>
       <type>Choice</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
       <choices>
@@ -1743,7 +1745,7 @@
     <argument>
       <name>window_interior_shading_winter</name>
       <display_name>Windows: Winter Interior Shading</display_name>
-      <description>Interior shading multiplier for the heating season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
+      <description>Interior shading coefficient for the winter season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>false</required>
@@ -1752,7 +1754,7 @@
     <argument>
       <name>window_interior_shading_summer</name>
       <display_name>Windows: Summer Interior Shading</display_name>
-      <description>Interior shading multiplier for the cooling season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
+      <description>Interior shading coefficient for the summer season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>false</required>
@@ -1761,7 +1763,7 @@
     <argument>
       <name>window_exterior_shading_winter</name>
       <display_name>Windows: Winter Exterior Shading</display_name>
-      <description>Exterior shading multiplier for the heating season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
+      <description>Exterior shading coefficient for the winter season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>false</required>
@@ -1770,12 +1772,20 @@
     <argument>
       <name>window_exterior_shading_summer</name>
       <display_name>Windows: Summer Exterior Shading</display_name>
-      <description>Exterior shading multiplier for the cooling season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
+      <description>Exterior shading coefficient for the summer season. 1.0 indicates no reduction in solar gain, 0.85 indicates 15% reduction, etc. If not provided, the OS-HPXML default is used.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>window_shading_summer_season</name>
+      <display_name>Windows: Shading Summer Season</display_name>
+      <description>Enter a date like "May 1 - Sep 30". Defines the summer season for purposes of shading coefficients; the rest of the year is assumed to be winter. If not provided, the OS-HPXML default is used.</description>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>window_storm_type</name>
       <display_name>Windows: Storm Type</display_name>
@@ -2032,6 +2042,14 @@
           <value>ACHnatural</value>
           <display_name>ACHnatural</display_name>
         </choice>
+        <choice>
+          <value>CFMnatural</value>
+          <display_name>CFMnatural</display_name>
+        </choice>
+        <choice>
+          <value>EffectiveLeakageArea</value>
+          <display_name>EffectiveLeakageArea</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -2047,12 +2065,48 @@
     <argument>
       <name>air_leakage_value</name>
       <display_name>Air Leakage: Value</display_name>
-      <description>Air exchange rate value.</description>
+      <description>Air exchange rate value. For 'EffectiveLeakageArea', provide value in sq. in.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>3</default_value>
     </argument>
+    <argument>
+      <name>air_leakage_type</name>
+      <display_name>Air Leakage: Type</display_name>
+      <description>Type of air leakage. If 'unit total', represents the total infiltration to the unit as measured by a compartmentalization test, in which case the air leakage value will be adjusted by the ratio of exterior envelope surface area to total envelope surface area. Otherwise, if 'unit exterior only', represents the infiltration to the unit from outside only as measured by a guarded test. Required when unit type is single-family attached or apartment unit.</description>
+      <type>Choice</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+      <choices>
+        <choice>
+          <value>unit total</value>
+          <display_name>unit total</display_name>
+        </choice>
+        <choice>
+          <value>unit exterior only</value>
+          <display_name>unit exterior only</display_name>
+        </choice>
+      </choices>
+    </argument>
+    <argument>
+      <name>air_leakage_has_flue_or_chimney_in_conditioned_space</name>
+      <display_name>Air Leakage: Has Flue or Chimney in Conditioned Space</display_name>
+      <description>Presence of flue or chimney with combustion air from conditioned space; used for infiltration model. If not provided, the OS-HPXML default is used.</description>
+      <type>Boolean</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+      <choices>
+        <choice>
+          <value>true</value>
+          <display_name>true</display_name>
+        </choice>
+        <choice>
+          <value>false</value>
+          <display_name>false</display_name>
+        </choice>
+      </choices>
+    </argument>
     <argument>
       <name>heating_system_type</name>
       <display_name>Heating System: Type</display_name>
@@ -2180,6 +2234,15 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
+    <argument>
+      <name>heating_system_pilot_light</name>
+      <display_name>Heating System: Pilot Light</display_name>
+      <description>The fuel usage of the pilot light. Applies only to Furnace, WallFurnace, FloorFurnace, Stove, Boiler, and Fireplace with non-electric fuel type. If not provided, assumes no pilot light.</description>
+      <type>Double</type>
+      <units>Btuh</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>heating_system_airflow_defect_ratio</name>
       <display_name>Heating System: Airflow Defect Ratio</display_name>
@@ -2315,7 +2378,7 @@
       <display_name>Cooling System: Is Ducted</display_name>
       <description>Whether the cooling system is ducted or not. Only used for mini-split and evaporative cooler. It's assumed that central air conditioner is ducted, and room air conditioner and packaged terminal air conditioner are not ducted.</description>
       <type>Boolean</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>false</default_value>
       <choices>
@@ -2347,6 +2410,15 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>cooling_system_crankcase_heater_watts</name>
+      <display_name>Cooling System: Crankcase Heater Power Watts</display_name>
+      <description>Cooling system crankcase heater power consumption in Watts. Applies only to central air conditioner, mini-split, packaged terminal air conditioner and room air conditioner. If not provided, the OS-HPXML default is used.</description>
+      <type>Double</type>
+      <units>W</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>cooling_system_integrated_heating_system_fuel</name>
       <display_name>Cooling System: Integrated Heating System Fuel Type</display_name>
@@ -2556,11 +2628,20 @@
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>heat_pump_heating_capacity_17_f</name>
-      <display_name>Heat Pump: Heating Capacity 17F</display_name>
-      <description>The output heating capacity of the heat pump at 17F. Only applies to air-to-air and mini-split. If not provided, the OS-HPXML default is used.</description>
+      <name>heat_pump_heating_capacity_retention_fraction</name>
+      <display_name>Heat Pump: Heating Capacity Retention Fraction</display_name>
+      <description>The output heating capacity of the heat pump at a user-specified temperature (e.g., 17F or 5F) divided by the above nominal heating capacity. Applies to all heat pump types except ground-to-air. If not provided, the OS-HPXML default is used.</description>
       <type>Double</type>
-      <units>Btu/hr</units>
+      <units>Frac</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>heat_pump_heating_capacity_retention_temp</name>
+      <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>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -2593,6 +2674,15 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
+    <argument>
+      <name>heat_pump_compressor_lockout_temp</name>
+      <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 is used.</description>
+      <type>Double</type>
+      <units>deg-F</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>heat_pump_backup_type</name>
       <display_name>Heat Pump: Backup Type</display_name>
@@ -2661,19 +2751,10 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
-    <argument>
-      <name>heat_pump_backup_heating_switchover_temp</name>
-      <display_name>Heat Pump: Backup Heating Switchover Temperature</display_name>
-      <description>The temperature at which the heat pump stops operating and the backup heating system starts running. Only applies to air-to-air and mini-split. If not provided, backup heating will operate as needed when heat pump capacity is insufficient. Applies if Backup Type is either 'integrated' or 'separate'. Both Switchover Temperature and Lockout Temperature cannot be specified.</description>
-      <type>Double</type>
-      <units>deg-F</units>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-    </argument>
     <argument>
       <name>heat_pump_backup_heating_lockout_temp</name>
       <display_name>Heat Pump: Backup Heating Lockout Temperature</display_name>
-      <description>The temperature above which the backup system is disabled in order to prevent backup heating operation during, e.g., a thermostat heating setback recovery event. If not provided, backup heating will operate as needed when heat pump capacity is insufficient. Only applies if Backup Type is 'integrated'. Both Switchover Temperature and Lockout Temperature cannot be specified.</description>
+      <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 is used.</description>
       <type>Double</type>
       <units>deg-F</units>
       <required>false</required>
@@ -2704,7 +2785,7 @@
     <argument>
       <name>heat_pump_is_ducted</name>
       <display_name>Heat Pump: Is Ducted</display_name>
-      <description>Whether the heat pump is ducted or not. Only used for mini-split. It's assumed that air-to-air and ground-to-air are ducted. If not provided, assumes not ducted.</description>
+      <description>Whether the heat pump is ducted or not. Only used for mini-split. It's assumed that air-to-air and ground-to-air are ducted, and packaged terminal heat pump and room air conditioner with reverse cycle are not ducted. If not provided, assumes not ducted.</description>
       <type>Boolean</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -2737,6 +2818,15 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>heat_pump_crankcase_heater_watts</name>
+      <display_name>Heat Pump: Crankcase Heater Power Watts</display_name>
+      <description>Heat Pump crankcase heater power consumption in Watts. Applies only to air-to-air, mini-split, packaged terminal heat pump and room air conditioner with reverse cycle. If not provided, the OS-HPXML default is used.</description>
+      <type>Double</type>
+      <units>W</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>heating_system_2_type</name>
       <display_name>Heating System 2: Type</display_name>
@@ -2750,6 +2840,10 @@
           <value>none</value>
           <display_name>none</display_name>
         </choice>
+        <choice>
+          <value>Furnace</value>
+          <display_name>Furnace</display_name>
+        </choice>
         <choice>
           <value>WallFurnace</value>
           <display_name>WallFurnace</display_name>
@@ -2778,6 +2872,10 @@
           <value>Fireplace</value>
           <display_name>Fireplace</display_name>
         </choice>
+        <choice>
+          <value>FixedHeater</value>
+          <display_name>FixedHeater</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -3029,6 +3127,32 @@
       <model_dependent>false</model_dependent>
       <default_value>0</default_value>
     </argument>
+    <argument>
+      <name>ducts_supply_buried_insulation_level</name>
+      <display_name>Ducts: Supply Buried Insulation Level</display_name>
+      <description>Whether the supply ducts are buried in, e.g., attic loose-fill insulation. Partially buried ducts have insulation that does not cover the top of the ducts. Fully buried ducts have insulation that just covers the top of the ducts. Deeply buried ducts have insulation that continues above the top of the ducts.</description>
+      <type>Choice</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+      <choices>
+        <choice>
+          <value>not buried</value>
+          <display_name>not buried</display_name>
+        </choice>
+        <choice>
+          <value>partially buried</value>
+          <display_name>partially buried</display_name>
+        </choice>
+        <choice>
+          <value>fully buried</value>
+          <display_name>fully buried</display_name>
+        </choice>
+        <choice>
+          <value>deeply buried</value>
+          <display_name>deeply buried</display_name>
+        </choice>
+      </choices>
+    </argument>
     <argument>
       <name>ducts_supply_surface_area</name>
       <display_name>Ducts: Supply Surface Area</display_name>
@@ -3126,6 +3250,32 @@
       <model_dependent>false</model_dependent>
       <default_value>0</default_value>
     </argument>
+    <argument>
+      <name>ducts_return_buried_insulation_level</name>
+      <display_name>Ducts: Return Buried Insulation Level</display_name>
+      <description>Whether the return ducts are buried in, e.g., attic loose-fill insulation. Partially buried ducts have insulation that does not cover the top of the ducts. Fully buried ducts have insulation that just covers the top of the ducts. Deeply buried ducts have insulation that continues above the top of the ducts.</description>
+      <type>Choice</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+      <choices>
+        <choice>
+          <value>not buried</value>
+          <display_name>not buried</display_name>
+        </choice>
+        <choice>
+          <value>partially buried</value>
+          <display_name>partially buried</display_name>
+        </choice>
+        <choice>
+          <value>fully buried</value>
+          <display_name>fully buried</display_name>
+        </choice>
+        <choice>
+          <value>deeply buried</value>
+          <display_name>deeply buried</display_name>
+        </choice>
+      </choices>
+    </argument>
     <argument>
       <name>ducts_return_surface_area</name>
       <display_name>Ducts: Return Surface Area</display_name>
@@ -3880,14 +4030,14 @@
     <argument>
       <name>water_heater_operating_mode</name>
       <display_name>Water Heater: Operating Mode</display_name>
-      <description>The water heater operating mode. The 'heat pump only' option only uses the heat pump, while 'standard' allows the backup electric resistance to come on in high demand situations. This is ignored if a scheduled operating mode type is selected. Applies only to heat pump water heater. If not provided, the OS-HPXML default is used.</description>
+      <description>The water heater operating mode. The 'heat pump only' option only uses the heat pump, while 'hybrid/auto' allows the backup electric resistance to come on in high demand situations. This is ignored if a scheduled operating mode type is selected. Applies only to heat pump water heater. If not provided, the OS-HPXML default is used.</description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
       <choices>
         <choice>
-          <value>standard</value>
-          <display_name>standard</display_name>
+          <value>hybrid/auto</value>
+          <display_name>hybrid/auto</display_name>
         </choice>
         <choice>
           <value>heat pump only</value>
@@ -3928,7 +4078,7 @@
       <display_name>Hot Water Distribution: Recirculation Control Type</display_name>
       <description>If the distribution system is Recirculation, the type of hot water recirculation control, if any.</description>
       <type>Choice</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>no control</default_value>
       <choices>
@@ -4018,7 +4168,7 @@
       <display_name>Drain Water Heat Recovery: Equal Flow</display_name>
       <description>Whether the drain water heat recovery has equal flow.</description>
       <type>Boolean</type>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>true</default_value>
       <choices>
@@ -4038,7 +4188,7 @@
       <description>The efficiency of the drain water heat recovery.</description>
       <type>Double</type>
       <units>Frac</units>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
       <default_value>0.55</default_value>
     </argument>
@@ -5678,7 +5828,7 @@
     <argument>
       <name>ceiling_fan_cooling_setpoint_temp_offset</name>
       <display_name>Ceiling Fan: Cooling Setpoint Temperature Offset</display_name>
-      <description>The setpoint temperature offset during cooling season for the ceiling fan(s). Only applies if ceiling fan quantity is greater than zero. If not provided, the OS-HPXML default is used.</description>
+      <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 is used.</description>
       <type>Double</type>
       <units>deg-F</units>
       <required>false</required>
@@ -6512,10 +6662,29 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>combine_like_surfaces</name>
+      <display_name>Combine like surfaces?</display_name>
+      <description>If true, combines like surfaces to simplify the HPXML file generated.</description>
+      <type>Boolean</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+      <default_value>false</default_value>
+      <choices>
+        <choice>
+          <value>true</value>
+          <display_name>true</display_name>
+        </choice>
+        <choice>
+          <value>false</value>
+          <display_name>false</display_name>
+        </choice>
+      </choices>
+    </argument>
     <argument>
       <name>apply_defaults</name>
       <display_name>Apply Default Values?</display_name>
-      <description>If true, applies OS-HPXML default values to the HPXML output file.</description>
+      <description>If true, applies OS-HPXML default values to the HPXML output file. Setting to true will also force validation of the HPXML output file before applying OS-HPXML default values.</description>
       <type>Boolean</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -6564,6 +6733,17 @@
     </attribute>
   </attributes>
   <files>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>2.9.1</identifier>
+        <min_compatible>2.9.1</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>B83724CD</checksum>
+    </file>
     <file>
       <filename>constants.rb</filename>
       <filetype>rb</filetype>
@@ -6588,16 +6768,5 @@
       <usage_type>resource</usage_type>
       <checksum>055F0A54</checksum>
     </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>2.9.1</identifier>
-        <min_compatible>2.9.1</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>A1FFBF5C</checksum>
-    </file>
   </files>
 </measure>