urbanopt-cli 0.4.1 → 0.5.0

data/example_files/resources/hpxml-measures/BuildResidentialHPXML/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>bc1b14bf-fa8c-49cb-8e88-28765be9a85c</version_id>
-  <version_modified>20201005T184019Z</version_modified>
+  <version_id>7aa3b3de-5d4d-4fff-a48e-34d7b4893671</version_id>
+  <version_modified>20201208T174726Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -146,7 +146,7 @@
     <argument>
       <name>schedules_type</name>
       <display_name>Schedules: Type</display_name>
-      <description>The type of occupant-related schedules to use. Schedules corresponding to 'default' are average (e.g., Building America). Schedules corresponding to 'stochastic' are generated using time-inhomogenous Markov chains derived from American Time Use Survey data, and supplemented with sampling duration and power level from NEEA RBSA data as well as DHW draw duration and flow rate from Aquacraft/AWWA data.</description>
+      <description>The type of occupant-related schedules to use. Schedules corresponding to 'default' are average (e.g., Building America). Schedules corresponding to 'stochastic' are generated using time-inhomogeneous Markov chains derived from American Time Use Survey data, and supplemented with sampling duration and power level from NEEA RBSA data as well as DHW draw duration and flow rate from Aquacraft/AWWA data.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -210,6 +210,15 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>schedules_random_seed</name>
+      <display_name>Schedules: Random Seed</display_name>
+      <description>This numeric field is the seed for the random number generator. Only applies if the schedules type is 'stochastic'.</description>
+      <type>Integer</type>
+      <units>#</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>weather_station_epw_filepath</name>
       <display_name>EnergyPlus Weather (EPW) Filepath</display_name>
@@ -590,25 +599,6 @@
         </choice>
       </choices>
     </argument>
-    <argument>
-      <name>geometry_roof_structure</name>
-      <display_name>Geometry: Roof Structure</display_name>
-      <description>The roof structure of the building. Ignored if the building has a flat roof.</description>
-      <type>Choice</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>truss, cantilever</default_value>
-      <choices>
-        <choice>
-          <value>truss, cantilever</value>
-          <display_name>truss, cantilever</display_name>
-        </choice>
-        <choice>
-          <value>rafter</value>
-          <display_name>rafter</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>geometry_attic_type</name>
       <display_name>Geometry: Attic Type</display_name>
@@ -783,6 +773,15 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>foundation_wall_thickness</name>
+      <display_name>Foundation: Wall Thickness</display_name>
+      <description>The thickness of the foundation wall.</description>
+      <type>String</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
+    </argument>
     <argument>
       <name>slab_perimeter_insulation_r</name>
       <display_name>Slab: Perimeter Insulation Nominal R-value</display_name>
@@ -823,25 +822,34 @@
       <model_dependent>false</model_dependent>
       <default_value>0</default_value>
     </argument>
+    <argument>
+      <name>slab_thickness</name>
+      <display_name>Slab: Thickness</display_name>
+      <description>The thickness of the slab.</description>
+      <type>String</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
+    </argument>
     <argument>
       <name>slab_carpet_fraction</name>
       <display_name>Slab: Carpet Fraction</display_name>
       <description>Fraction of the slab floor area that is carpeted.</description>
-      <type>Double</type>
+      <type>String</type>
       <units>Frac</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>0</default_value>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>slab_carpet_r</name>
       <display_name>Slab: Carpet R-value</display_name>
       <description>R-value of the slab carpet.</description>
-      <type>Double</type>
+      <type>String</type>
       <units>h-ft^2-R/Btu</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>0</default_value>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>ceiling_assembly_r</name>
@@ -945,29 +953,19 @@
       <name>roof_emittance</name>
       <display_name>Roof: Emittance</display_name>
       <description>The emittance of the roof.</description>
-      <type>Double</type>
+      <type>String</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>0.92</default_value>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>roof_radiant_barrier</name>
       <display_name>Roof: Has Radiant Barrier</display_name>
       <description>Specifies whether the attic has a radiant barrier.</description>
-      <type>Boolean</type>
+      <type>String</type>
       <required>true</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>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>roof_radiant_barrier_grade</name>
@@ -1219,10 +1217,10 @@
       <name>wall_emittance</name>
       <display_name>Wall: Emittance</display_name>
       <description>The emittance of the exterior walls.</description>
-      <type>Double</type>
+      <type>String</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>0.92</default_value>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>window_front_wwr</name>
@@ -1670,12 +1668,30 @@
     <argument>
       <name>heating_system_electric_auxiliary_energy</name>
       <display_name>Heating System: Electric Auxiliary Energy</display_name>
-      <description>The electric auxiliary energy of the heating system.</description>
+      <description>The electric auxiliary energy of the heating system. Applies to Boiler.</description>
       <type>Double</type>
       <units>kWh/yr</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>heating_system_fan_power_watts_per_cfm</name>
+      <display_name>Heating System: Fan Power</display_name>
+      <description>Blower fan power. Applies to Furnace.</description>
+      <type>Double</type>
+      <units>W/CFM</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>heating_system_fan_power_watts</name>
+      <display_name>Heating System: Fan Power</display_name>
+      <description>Blower fan power. Ignored for ElectricResistance, Furnace, and Boiler.</description>
+      <type>Double</type>
+      <units>W</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>heating_system_has_flue_or_chimney</name>
       <display_name>Heating System: Has Flue or Chimney</display_name>
@@ -1816,6 +1832,15 @@
         </choice>
       </choices>
     </argument>
+    <argument>
+      <name>cooling_system_fan_power_watts_per_cfm</name>
+      <display_name>Cooling System: Fan Power</display_name>
+      <description>Blower fan power. Applies to central air conditioner, evaporative cooler, and mini-split.</description>
+      <type>Double</type>
+      <units>W/CFM</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>heat_pump_type</name>
       <display_name>Heat Pump: Type</display_name>
@@ -2042,27 +2067,27 @@
       </choices>
     </argument>
     <argument>
-      <name>heat_pump_ground_to_air_pump_power</name>
+      <name>heat_pump_pump_power_watts_per_ton</name>
       <display_name>Heat Pump: Ground-to-Air Pump Power</display_name>
       <description>Ground loop circulator pump power during operation of the heat pump.</description>
       <type>Double</type>
-      <units>watt/ton</units>
+      <units>W/ton</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>heat_pump_ground_to_air_fan_power</name>
-      <display_name>Heat Pump: Ground-to-Air Fan Power</display_name>
+      <name>heat_pump_fan_power_watts_per_cfm</name>
+      <display_name>Heat Pump: Fan Power</display_name>
       <description>Blower fan power.</description>
       <type>Double</type>
-      <units>watt/CFM</units>
+      <units>W/CFM</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>setpoint_heating_temp</name>
-      <display_name>Setpoint: Heating Temperature</display_name>
-      <description>Specify the heating setpoint temperature.</description>
+      <name>setpoint_heating_weekday_temp</name>
+      <display_name>Heating Setpoint: Weekday Temperature</display_name>
+      <description>Specify the weekday heating setpoint temperature.</description>
       <type>Double</type>
       <units>deg-F</units>
       <required>true</required>
@@ -2070,9 +2095,9 @@
       <default_value>71</default_value>
     </argument>
     <argument>
-      <name>setpoint_heating_setback_temp</name>
-      <display_name>Setpoint: Heating Setback Temperature</display_name>
-      <description>Specify the heating setback temperature.</description>
+      <name>setpoint_heating_weekend_temp</name>
+      <display_name>Heating Setpoint: Weekend Temperature</display_name>
+      <description>Specify the weekend heating setpoint temperature.</description>
       <type>Double</type>
       <units>deg-F</units>
       <required>true</required>
@@ -2080,27 +2105,45 @@
       <default_value>71</default_value>
     </argument>
     <argument>
-      <name>setpoint_heating_setback_hours_per_week</name>
-      <display_name>Setpoint: Heating Setback Hours per Week</display_name>
-      <description>Specify the heating setback number of hours per week value.</description>
+      <name>setpoint_heating_weekday_offset_magnitude</name>
+      <display_name>Heating Setpoint: Weekday Offset Magnitude</display_name>
+      <description>Specify the weekday heating offset magnitude.</description>
       <type>Double</type>
-      <required>true</required>
+      <units>deg-F</units>
+      <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>0</default_value>
     </argument>
     <argument>
-      <name>setpoint_heating_setback_start_hour</name>
-      <display_name>Setpoint: Heating Setback Start Hour</display_name>
-      <description>Specify the heating setback start hour value. 0 = midnight, 12 = noon</description>
+      <name>setpoint_heating_weekend_offset_magnitude</name>
+      <display_name>Heating Setpoint: Weekend Offset Magnitude</display_name>
+      <description>Specify the weekend heating offset magnitude.</description>
       <type>Double</type>
-      <required>true</required>
+      <units>deg-F</units>
+      <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>23</default_value>
     </argument>
     <argument>
-      <name>setpoint_cooling_temp</name>
-      <display_name>Setpoint: Cooling Temperature</display_name>
-      <description>Specify the cooling setpoint temperature.</description>
+      <name>setpoint_heating_weekday_schedule</name>
+      <display_name>Heating Setpoint: Weekday Schedule</display_name>
+      <description>Specify the 24-hour comma-separated weekday heating schedule of 0s and 1s.</description>
+      <type>String</type>
+      <units>deg-F</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>setpoint_heating_weekend_schedule</name>
+      <display_name>Heating Setpoint: Weekend Schedule</display_name>
+      <description>Specify the 24-hour comma-separated weekend heating schedule of 0s and 1s.</description>
+      <type>String</type>
+      <units>deg-F</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>setpoint_cooling_weekday_temp</name>
+      <display_name>Cooling Setpoint: Weekday Temperature</display_name>
+      <description>Specify the weekday cooling setpoint temperature.</description>
       <type>Double</type>
       <units>deg-F</units>
       <required>true</required>
@@ -2108,9 +2151,9 @@
       <default_value>76</default_value>
     </argument>
     <argument>
-      <name>setpoint_cooling_setup_temp</name>
-      <display_name>Setpoint: Cooling Setup Temperature</display_name>
-      <description>Specify the cooling setup temperature.</description>
+      <name>setpoint_cooling_weekend_temp</name>
+      <display_name>Cooling Setpoint: Weekend Temperature</display_name>
+      <description>Specify the weekend cooling setpoint temperature.</description>
       <type>Double</type>
       <units>deg-F</units>
       <required>true</required>
@@ -2118,22 +2161,40 @@
       <default_value>76</default_value>
     </argument>
     <argument>
-      <name>setpoint_cooling_setup_hours_per_week</name>
-      <display_name>Setpoint: Cooling Setup Hours per Week</display_name>
-      <description>Specify the cooling setup number of hours per week value.</description>
+      <name>setpoint_cooling_weekday_offset_magnitude</name>
+      <display_name>Cooling Setpoint: Weekday Offset Magnitude</display_name>
+      <description>Specify the weekday cooling offset magnitude.</description>
       <type>Double</type>
-      <required>true</required>
+      <units>deg-F</units>
+      <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>0</default_value>
     </argument>
     <argument>
-      <name>setpoint_cooling_setup_start_hour</name>
-      <display_name>Setpoint: Cooling Setup Start Hour</display_name>
-      <description>Specify the cooling setup start hour value. 0 = midnight, 12 = noon</description>
+      <name>setpoint_cooling_weekend_offset_magnitude</name>
+      <display_name>Cooling Setpoint: Weekend Offset Magnitude</display_name>
+      <description>Specify the weekend cooling offset magnitude.</description>
       <type>Double</type>
-      <required>true</required>
+      <units>deg-F</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>setpoint_cooling_weekday_schedule</name>
+      <display_name>Cooling Setpoint: Weekday Schedule</display_name>
+      <description>Specify the 24-hour comma-separated weekday cooling schedule of 0s and 1s.</description>
+      <type>String</type>
+      <units>deg-F</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>setpoint_cooling_weekend_schedule</name>
+      <display_name>Cooling Setpoint: Weekend Schedule</display_name>
+      <description>Specify the 24-hour comma-separated weekend cooling schedule of 0s and 1s.</description>
+      <type>String</type>
+      <units>deg-F</units>
+      <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>9</default_value>
     </argument>
     <argument>
       <name>ducts_supply_leakage_units</name>
@@ -2516,6 +2577,15 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>heating_system_fan_power_watts_2</name>
+      <display_name>Heating System 2: Fan Power</display_name>
+      <description>Blower fan power. Ignored for ElectricResistance.</description>
+      <type>Double</type>
+      <units>W/CFM</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>heating_system_has_flue_or_chimney_2</name>
       <display_name>Heating System 2: Has Flue or Chimney</display_name>
@@ -2663,32 +2733,14 @@
       <default_value>30</default_value>
     </argument>
     <argument>
-      <name>mech_vent_is_shared_system</name>
-      <display_name>Mechanical Ventilation: Is Shared System</display_name>
-      <description>Whether the mechanical ventilation is a shared system. If true, assumed to serve all the units in the building.</description>
-      <type>Boolean</type>
+      <name>mech_vent_num_units_served</name>
+      <display_name>Mechanical Ventilation: Number of Units Served</display_name>
+      <description>Number of dwelling units served by the mechanical ventilation system. Must be 1 if single-family detached. Used to apportion flow rate and fan power to the unit.</description>
+      <type>Integer</type>
+      <units>#</units>
       <required>true</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>shared_mech_vent_in_unit_flow_rate</name>
-      <display_name>Shared Mechanical Ventilation: In-Unit Flow Rate</display_name>
-      <description>The flow rate delivered to the dwelling unit. This is required for a shared mechanical ventilation system.</description>
-      <type>Double</type>
-      <units>CFM</units>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
+      <default_value>1</default_value>
     </argument>
     <argument>
       <name>shared_mech_vent_frac_recirculation</name>
@@ -3258,22 +3310,23 @@
       </choices>
     </argument>
     <argument>
-      <name>water_heater_efficiency_ef</name>
-      <display_name>Water Heater: Energy Factor</display_name>
-      <description>Ratio of useful energy output from water heater to the total amount of energy delivered from the water heater.</description>
+      <name>water_heater_efficiency</name>
+      <display_name>Water Heater: Efficiency</display_name>
+      <description>Rated Energy Factor or Uniform Energy Factor. Does not apply to space-heating boilers.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>0.67</default_value>
     </argument>
     <argument>
-      <name>water_heater_efficiency_uef</name>
-      <display_name>Water Heater: Uniform Energy Factor</display_name>
-      <description>The uniform energy factor of water heater. Does not apply to space-heating boilers.</description>
+      <name>water_heater_first_hour_rating</name>
+      <display_name>Water Heater: First Hour Rating</display_name>
+      <description>Rated gallons of hot water supplied in an hour. Required if Efficiency Type is UniformEnergyFactor and Type is not instantaneous water heater. Does not apply to space-heating boilers.</description>
       <type>Double</type>
-      <required>true</required>
+      <units>gal/hr</units>
+      <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>0.67</default_value>
+      <default_value>56</default_value>
     </argument>
     <argument>
       <name>water_heater_recovery_efficiency</name>
@@ -3313,15 +3366,6 @@
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>water_heater_performance_adjustment</name>
-      <display_name>Water Heater: Performance Adjustment</display_name>
-      <description>A performance adjustment due to cycling inefficiencies. Only applies to instantaneous water heater.</description>
-      <type>Double</type>
-      <units>Frac</units>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-    </argument>
     <argument>
       <name>water_heater_has_flue_or_chimney</name>
       <display_name>Water Heater: Has Flue or Chimney</display_name>
@@ -3342,23 +3386,14 @@
       </choices>
     </argument>
     <argument>
-      <name>water_heater_is_shared_system</name>
-      <display_name>Water Heater: Is Shared System</display_name>
-      <description>Whether the water heater is a shared system. If true, assumed to serve all the units in the building.</description>
-      <type>Boolean</type>
+      <name>water_heater_num_units_served</name>
+      <display_name>Water Heater: Number of Units Served</display_name>
+      <description>Number of dwelling units served (directly or indirectly) by the water heater. Must be 1 if single-family detached. Used to apportion water heater tank losses to the unit.</description>
+      <type>Integer</type>
+      <units>#</units>
       <required>true</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>
+      <default_value>1</default_value>
     </argument>
     <argument>
       <name>dhw_distribution_system_type</name>
@@ -3454,16 +3489,16 @@
       <name>dhw_distribution_pipe_r</name>
       <display_name>Hot Water Distribution: Pipe Insulation Nominal R-Value</display_name>
       <description>Nominal R-value of the pipe insulation.</description>
-      <type>Double</type>
+      <type>String</type>
       <units>h-ft^2-R/Btu</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>0</default_value>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>dwhr_facilities_connected</name>
       <display_name>Drain Water Heat Recovery: Facilities Connected</display_name>
-      <description>Which facilities are connected for the drain water heat recovery. Use 'none' if there is no drawin water heat recovery system.</description>
+      <description>Which facilities are connected for the drain water heat recovery. Use 'none' if there is no drain water heat recovery system.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -3711,6 +3746,10 @@
           <value>none</value>
           <display_name>none</display_name>
         </choice>
+        <choice>
+          <value>auto</value>
+          <display_name>auto</display_name>
+        </choice>
         <choice>
           <value>standard</value>
           <display_name>standard</display_name>
@@ -3732,8 +3771,12 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>roof</default_value>
+      <default_value>auto</default_value>
       <choices>
+        <choice>
+          <value>auto</value>
+          <display_name>auto</display_name>
+        </choice>
         <choice>
           <value>roof</value>
           <display_name>roof</display_name>
@@ -3751,8 +3794,12 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>fixed</default_value>
+      <default_value>auto</default_value>
       <choices>
+        <choice>
+          <value>auto</value>
+          <display_name>auto</display_name>
+        </choice>
         <choice>
           <value>fixed</value>
           <display_name>fixed</display_name>
@@ -3820,23 +3867,14 @@
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>pv_system_is_shared_1</name>
-      <display_name>Photovoltaics 1: Is Shared System</display_name>
-      <description>Whether PV system 1 is shared. If true, assumed to serve all the units in the building.</description>
-      <type>Boolean</type>
+      <name>pv_system_num_units_served_1</name>
+      <display_name>Photovoltaics 1: Number of Units Served</display_name>
+      <description>Number of dwelling units served by PV system 1. Must be 1 if single-family detached. Used to apportion PV generation to the unit.</description>
+      <type>Integer</type>
+      <units>#</units>
       <required>true</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>
+      <default_value>1</default_value>
     </argument>
     <argument>
       <name>pv_system_module_type_2</name>
@@ -3851,6 +3889,10 @@
           <value>none</value>
           <display_name>none</display_name>
         </choice>
+        <choice>
+          <value>auto</value>
+          <display_name>auto</display_name>
+        </choice>
         <choice>
           <value>standard</value>
           <display_name>standard</display_name>
@@ -3872,8 +3914,12 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>roof</default_value>
+      <default_value>auto</default_value>
       <choices>
+        <choice>
+          <value>auto</value>
+          <display_name>auto</display_name>
+        </choice>
         <choice>
           <value>roof</value>
           <display_name>roof</display_name>
@@ -3891,8 +3937,12 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>fixed</default_value>
+      <default_value>auto</default_value>
       <choices>
+        <choice>
+          <value>auto</value>
+          <display_name>auto</display_name>
+        </choice>
         <choice>
           <value>fixed</value>
           <display_name>fixed</display_name>
@@ -3960,23 +4010,14 @@
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>pv_system_is_shared_2</name>
-      <display_name>Photovoltaics 2: Is Shared System</display_name>
-      <description>Whether PV system 2 is shared. If true, assumed to serve all the units in the building.</description>
-      <type>Boolean</type>
+      <name>pv_system_num_units_served_2</name>
+      <display_name>Photovoltaics 2: Number of Units Served</display_name>
+      <description>Number of dwelling units served by PV system 2. Must be 1 if single-family detached. Used to apportion PV generation to the unit.</description>
+      <type>Integer</type>
+      <units>#</units>
       <required>true</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>
+      <default_value>1</default_value>
     </argument>
     <argument>
       <name>lighting_fraction_cfl_interior</name>
@@ -4174,6 +4215,25 @@
         </choice>
       </choices>
     </argument>
+    <argument>
+      <name>dehumidifier_type</name>
+      <display_name>Dehumidifier: Type</display_name>
+      <description>The type of dehumidifier.</description>
+      <type>Choice</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>portable</default_value>
+      <choices>
+        <choice>
+          <value>portable</value>
+          <display_name>portable</display_name>
+        </choice>
+        <choice>
+          <value>whole-home</value>
+          <display_name>whole-home</display_name>
+        </choice>
+      </choices>
+    </argument>
     <argument>
       <name>dehumidifier_efficiency_type</name>
       <display_name>Dehumidifier: Efficiency Type</display_name>
@@ -5187,7 +5247,7 @@
       <display_name>Ceiling Fan: Efficiency</display_name>
       <description>The efficiency rating of the ceiling fan(s) at medium speed.</description>
       <type>String</type>
-      <units>CFM/watt</units>
+      <units>CFM/W</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
@@ -5231,6 +5291,15 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
+    <argument>
+      <name>plug_loads_television_usage_multiplier_2</name>
+      <display_name>Plug Loads: Television Usage Multiplier 2</display_name>
+      <description>Additional multiplier on the television energy usage that can reflect, e.g., high/low usage occupants.</description>
+      <type>Double</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>1</default_value>
+    </argument>
     <argument>
       <name>plug_loads_other_annual_kwh</name>
       <display_name>Plug Loads: Other Annual kWh</display_name>
@@ -5270,6 +5339,15 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
+    <argument>
+      <name>plug_loads_other_usage_multiplier_2</name>
+      <display_name>Plug Loads: Other Usage Multiplier 2</display_name>
+      <description>Additional multiplier on the other energy usage that can reflect, e.g., high/low usage occupants.</description>
+      <type>Double</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>1</default_value>
+    </argument>
     <argument>
       <name>plug_loads_well_pump_present</name>
       <display_name>Plug Loads: Well Pump Present</display_name>
@@ -5302,16 +5380,25 @@
     <argument>
       <name>plug_loads_well_pump_usage_multiplier</name>
       <display_name>Plug Loads: Well Pump Usage Multiplier</display_name>
-      <description>Multiplier on the well_pump energy usage that can reflect, e.g., high/low usage occupants.</description>
+      <description>Multiplier on the well pump energy usage that can reflect, e.g., high/low usage occupants.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
+      <default_value>0</default_value>
+    </argument>
+    <argument>
+      <name>plug_loads_well_pump_usage_multiplier_2</name>
+      <display_name>Plug Loads: Well Pump Usage Multiplier 2</display_name>
+      <description>Additional multiplier on the well pump energy usage that can reflect, e.g., high/low usage occupants.</description>
+      <type>Double</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>0</default_value>
     </argument>
     <argument>
       <name>plug_loads_vehicle_present</name>
       <display_name>Plug Loads: Vehicle Present</display_name>
-      <description>Whether there is a vehicle.</description>
+      <description>Whether there is an electric vehicle.</description>
       <type>Boolean</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -5330,7 +5417,7 @@
     <argument>
       <name>plug_loads_vehicle_annual_kwh</name>
       <display_name>Plug Loads: Vehicle Annual kWh</display_name>
-      <description>The annual energy consumption of the well pump plug loads.</description>
+      <description>The annual energy consumption of the electric vehicle plug loads.</description>
       <type>String</type>
       <units>kWh/yr</units>
       <required>true</required>
@@ -5340,11 +5427,20 @@
     <argument>
       <name>plug_loads_vehicle_usage_multiplier</name>
       <display_name>Plug Loads: Vehicle Usage Multiplier</display_name>
-      <description>Multiplier on the well_pump energy usage that can reflect, e.g., high/low usage occupants.</description>
+      <description>Multiplier on the electric vehicle energy usage that can reflect, e.g., high/low usage occupants.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
+      <default_value>0</default_value>
+    </argument>
+    <argument>
+      <name>plug_loads_vehicle_usage_multiplier_2</name>
+      <display_name>Plug Loads: Vehicle Usage Multiplier 2</display_name>
+      <description>Additional multiplier on the electric vehicle energy usage that can reflect, e.g., high/low usage occupants.</description>
+      <type>Double</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>0</default_value>
     </argument>
     <argument>
       <name>fuel_loads_grill_present</name>
@@ -5406,29 +5502,6 @@
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>fuel_loads_grill_location</name>
-      <display_name>Fuel Loads: Grill Location</display_name>
-      <description>The location of the fuel loads grill.</description>
-      <type>Choice</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-      <choices>
-        <choice>
-          <value>auto</value>
-          <display_name>auto</display_name>
-        </choice>
-        <choice>
-          <value>interior</value>
-          <display_name>interior</display_name>
-        </choice>
-        <choice>
-          <value>exterior</value>
-          <display_name>exterior</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>fuel_loads_grill_usage_multiplier</name>
       <display_name>Fuel Loads: Grill Usage Multiplier</display_name>
@@ -5436,7 +5509,7 @@
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
+      <default_value>0</default_value>
     </argument>
     <argument>
       <name>fuel_loads_lighting_present</name>
@@ -5498,29 +5571,6 @@
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>fuel_loads_lighting_location</name>
-      <display_name>Fuel Loads: Lighting Location</display_name>
-      <description>The location of the fuel loads lighting.</description>
-      <type>Choice</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-      <choices>
-        <choice>
-          <value>auto</value>
-          <display_name>auto</display_name>
-        </choice>
-        <choice>
-          <value>interior</value>
-          <display_name>interior</display_name>
-        </choice>
-        <choice>
-          <value>exterior</value>
-          <display_name>exterior</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>fuel_loads_lighting_usage_multiplier</name>
       <display_name>Fuel Loads: Lighting Usage Multiplier</display_name>
@@ -5528,7 +5578,7 @@
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
+      <default_value>0</default_value>
     </argument>
     <argument>
       <name>fuel_loads_fireplace_present</name>
@@ -5591,27 +5641,24 @@
       <default_value>auto</default_value>
     </argument>
     <argument>
-      <name>fuel_loads_fireplace_location</name>
-      <display_name>Fuel Loads: Fireplace Location</display_name>
-      <description>The location of the fuel loads fireplace.</description>
-      <type>Choice</type>
+      <name>fuel_loads_fireplace_frac_sensible</name>
+      <display_name>Fuel Loads: Fireplace Sensible Fraction</display_name>
+      <description>Fraction of fireplace residual fuel loads' internal gains that are sensible.</description>
+      <type>String</type>
+      <units>Frac</units>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
+    </argument>
+    <argument>
+      <name>fuel_loads_fireplace_frac_latent</name>
+      <display_name>Fuel Loads: Fireplace Latent Fraction</display_name>
+      <description>Fraction of fireplace residual fuel loads' internal gains that are latent.</description>
+      <type>String</type>
+      <units>Frac</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
-      <choices>
-        <choice>
-          <value>auto</value>
-          <display_name>auto</display_name>
-        </choice>
-        <choice>
-          <value>interior</value>
-          <display_name>interior</display_name>
-        </choice>
-        <choice>
-          <value>exterior</value>
-          <display_name>exterior</display_name>
-        </choice>
-      </choices>
     </argument>
     <argument>
       <name>fuel_loads_fireplace_usage_multiplier</name>
@@ -5620,7 +5667,7 @@
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
+      <default_value>0</default_value>
     </argument>
     <argument>
       <name>pool_present</name>
@@ -5824,12 +5871,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>geometry.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>0ABBC934</checksum>
-    </file>
     <file>
       <filename>location.rb</filename>
       <filetype>rb</filetype>
@@ -5878,12 +5919,6 @@
       <usage_type>resource</usage_type>
       <checksum>7F0BFEDA</checksum>
     </file>
-    <file>
-      <filename>schedules_config.yml</filename>
-      <filetype>yml</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>7DAD9145</checksum>
-    </file>
     <file>
       <filename>schedules_cooking_power_consumption_dist.csv</filename>
       <filetype>csv</filetype>
@@ -6611,1024 +6646,1048 @@
       <checksum>F0F0F886</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-mini-split-heat-pump-ducted.osw</filename>
-      <filetype>osw</filetype>
+      <filename>schedules_config.yml</filename>
+      <filetype>yml</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>64DD9D54</checksum>
+    </file>
+    <file>
+      <filename>schedules.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>9ED612C8</checksum>
+    </file>
+    <file>
+      <filename>test_rakefile.xml</filename>
+      <filetype>xml</filetype>
       <usage_type>test</usage_type>
-      <checksum>E613C282</checksum>
+      <checksum>4D13CDAD</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-heat-pump-ducted.osw</filename>
+      <filename>test_measure.xml</filename>
+      <filetype>xml</filetype>
+      <usage_type>test</usage_type>
+      <checksum>5935D082</checksum>
+    </file>
+    <file>
+      <filename>geometry.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>D8BA3AF2</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-indirect-outside.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F97B1842</checksum>
+      <checksum>1E89A5A9</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-heat-pump-ducted-heating-only.osw</filename>
+      <filename>base-hvac-boiler-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3367F91B</checksum>
+      <checksum>62888CD2</checksum>
     </file>
     <file>
-      <filename>base-multifamily.osw</filename>
+      <filename>base-dhw-indirect-standbyloss.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1C51A365</checksum>
+      <checksum>CE3941C6</checksum>
     </file>
     <file>
-      <filename>base.osw</filename>
+      <filename>base-dhw-indirect.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2033ECB2</checksum>
+      <checksum>9E6596C8</checksum>
     </file>
     <file>
-      <filename>base-appliances-none.osw</filename>
+      <filename>base-dhw-jacket-indirect.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8964C4E2</checksum>
+      <checksum>E260FE10</checksum>
     </file>
     <file>
-      <filename>base-single-family-attached.osw</filename>
+      <filename>base-hvac-wall-furnace-elec-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>257B15B9</checksum>
+      <checksum>012F12BD</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.osw</filename>
+      <filename>base-dhw-indirect-with-solar-fraction.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D1141C4F</checksum>
+      <checksum>DBF9672B</checksum>
     </file>
     <file>
-      <filename>base-mechvent-cfis.osw</filename>
+      <filename>base-dhw-combi-tankless-outside.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>53BDDABE</checksum>
+      <checksum>9299285B</checksum>
     </file>
     <file>
-      <filename>base-dhw-indirect-outside.osw</filename>
+      <filename>base-dhw-combi-tankless.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>414735C0</checksum>
+      <checksum>E7FE15A0</checksum>
     </file>
     <file>
-      <filename>base-dhw-jacket-electric.osw</filename>
+      <filename>base-hvac-floor-furnace-propane-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F43213BB</checksum>
+      <checksum>6DBF6443</checksum>
     </file>
     <file>
-      <filename>base-dhw-low-flow-fixtures.osw</filename>
+      <filename>base-hvac-boiler-gas-central-ac-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>729D5DDE</checksum>
+      <checksum>429E7B93</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-demand.osw</filename>
+      <filename>base-hvac-fireplace-wood-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>915D207E</checksum>
+      <checksum>78AF74BA</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-manual.osw</filename>
+      <filename>base-hvac-fixed-heater-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9AF2593D</checksum>
+      <checksum>1C3264B9</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-nocontrol.osw</filename>
+      <filename>base-hvac-portable-heater-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B1580D3B</checksum>
+      <checksum>0E161630</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-temperature.osw</filename>
+      <filename>base-hvac-dual-fuel-mini-split-heat-pump-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>21F51B75</checksum>
+      <checksum>F0AF579D</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-timer.osw</filename>
+      <filename>base.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>01824660</checksum>
+      <checksum>155524E4</checksum>
     </file>
     <file>
-      <filename>base-dhw-solar-fraction.osw</filename>
+      <filename>base-appliances-none.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>88BEE447</checksum>
+      <checksum>DD39CD4B</checksum>
     </file>
     <file>
-      <filename>base-dhw-uef.osw</filename>
+      <filename>base-mechvent-cfis.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>426E2969</checksum>
+      <checksum>A3DC2DA0</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-cfm50.osw</filename>
+      <filename>base-dhw-jacket-electric.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>ADF3D148</checksum>
+      <checksum>517D3FA7</checksum>
     </file>
     <file>
-      <filename>base-foundation-conditioned-basement-slab-insulation.osw</filename>
+      <filename>base-dhw-low-flow-fixtures.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>356C1F7B</checksum>
+      <checksum>6408603D</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-gas-only.osw</filename>
+      <filename>base-dhw-recirc-demand.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>80EED7FA</checksum>
+      <checksum>C97AB35B</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-oil-only.osw</filename>
+      <filename>base-dhw-recirc-manual.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3C39C475</checksum>
+      <checksum>E6E11B85</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-propane-only.osw</filename>
+      <filename>base-dhw-recirc-nocontrol.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8F195E34</checksum>
+      <checksum>DFFE00DC</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-wood-only.osw</filename>
+      <filename>base-dhw-recirc-temperature.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>24A279F8</checksum>
+      <checksum>A3F98C91</checksum>
     </file>
     <file>
-      <filename>base-hvac-central-ac-only-1-speed.osw</filename>
+      <filename>base-dhw-recirc-timer.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>41634850</checksum>
+      <checksum>E19E92F5</checksum>
     </file>
     <file>
-      <filename>base-hvac-ducts-leakage-percent.osw</filename>
+      <filename>base-dhw-solar-fraction.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8E46611D</checksum>
+      <checksum>46E0C710</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-elec-only.osw</filename>
+      <filename>base-enclosure-infil-cfm50.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2F565F74</checksum>
+      <checksum>097284B4</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-gas-only.osw</filename>
+      <filename>base-foundation-conditioned-basement-slab-insulation.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D6B020AB</checksum>
+      <checksum>CABCFF4F</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-oil-only.osw</filename>
+      <filename>base-hvac-boiler-oil-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C132FE0E</checksum>
+      <checksum>61FD6C00</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-propane-only.osw</filename>
+      <filename>base-hvac-boiler-propane-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8C44FBF9</checksum>
+      <checksum>629B42C4</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-wood-only.osw</filename>
+      <filename>base-hvac-boiler-wood-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3BE6ADC5</checksum>
+      <checksum>49D1FC81</checksum>
     </file>
     <file>
-      <filename>base-hvac-none.osw</filename>
+      <filename>base-hvac-ducts-leakage-percent.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>56D4ADDD</checksum>
+      <checksum>B2A4D026</checksum>
     </file>
     <file>
-      <filename>base-hvac-programmable-thermostat.osw</filename>
+      <filename>base-hvac-furnace-elec-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E952823E</checksum>
+      <checksum>21A96F3C</checksum>
     </file>
     <file>
-      <filename>base-hvac-setpoints.osw</filename>
+      <filename>base-hvac-furnace-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9D201D67</checksum>
+      <checksum>3B19ECD9</checksum>
     </file>
     <file>
-      <filename>base-location-baltimore-md.osw</filename>
+      <filename>base-hvac-furnace-oil-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BD8FCDAE</checksum>
+      <checksum>1A3EEAFE</checksum>
     </file>
     <file>
-      <filename>base-location-duluth-mn.osw</filename>
+      <filename>base-hvac-furnace-propane-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8CA1B86F</checksum>
+      <checksum>06D17BA2</checksum>
     </file>
     <file>
-      <filename>base-mechvent-balanced.osw</filename>
+      <filename>base-hvac-furnace-wood-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>62166E23</checksum>
+      <checksum>B47E8EAA</checksum>
     </file>
     <file>
-      <filename>base-mechvent-erv.osw</filename>
+      <filename>base-hvac-none.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1962B025</checksum>
+      <checksum>FAEE9145</checksum>
     </file>
     <file>
-      <filename>base-mechvent-exhaust.osw</filename>
+      <filename>base-hvac-setpoints.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>01A0D3FF</checksum>
+      <checksum>89AC0A92</checksum>
     </file>
     <file>
-      <filename>base-mechvent-hrv.osw</filename>
+      <filename>base-location-baltimore-md.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6D763794</checksum>
+      <checksum>3F92EE9D</checksum>
     </file>
     <file>
-      <filename>base-mechvent-supply.osw</filename>
+      <filename>base-location-duluth-mn.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BB58E790</checksum>
+      <checksum>5192EF46</checksum>
     </file>
     <file>
-      <filename>base-hvac-air-to-air-heat-pump-1-speed.osw</filename>
+      <filename>base-mechvent-balanced.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>225837A3</checksum>
+      <checksum>BFF31E84</checksum>
     </file>
     <file>
-      <filename>base-mechvent-erv-atre-asre.osw</filename>
+      <filename>base-mechvent-erv.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3E79DE6</checksum>
+      <checksum>12964A12</checksum>
     </file>
     <file>
-      <filename>base-enclosure-windows-none.osw</filename>
+      <filename>base-mechvent-exhaust.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C6C67558</checksum>
+      <checksum>9AFFA4A4</checksum>
     </file>
     <file>
-      <filename>base-dhw-indirect-standbyloss.osw</filename>
+      <filename>base-mechvent-hrv.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4F3E2FD4</checksum>
+      <checksum>28F83581</checksum>
     </file>
     <file>
-      <filename>base-dhw-indirect.osw</filename>
+      <filename>base-mechvent-supply.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>716C47BE</checksum>
+      <checksum>848FB91D</checksum>
     </file>
     <file>
-      <filename>base-dhw-jacket-indirect.osw</filename>
+      <filename>base-mechvent-erv-atre-asre.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>727DB977</checksum>
+      <checksum>20AB23EE</checksum>
     </file>
     <file>
-      <filename>base-hvac-undersized.osw</filename>
+      <filename>base-enclosure-windows-none.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FCBBCAD4</checksum>
+      <checksum>7153E1CF</checksum>
     </file>
     <file>
-      <filename>base-atticroof-unvented-insulated-roof.osw</filename>
+      <filename>base-hvac-undersized.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0BB08D37</checksum>
+      <checksum>63FBCEA3</checksum>
     </file>
     <file>
-      <filename>base-pv.osw</filename>
+      <filename>base-atticroof-unvented-insulated-roof.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>61E88C45</checksum>
+      <checksum>5B8B20A8</checksum>
     </file>
     <file>
       <filename>base-mechvent-hrv-asre.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5B77BB2C</checksum>
+      <checksum>2CBBA0AF</checksum>
     </file>
     <file>
       <filename>base-enclosure-overhangs.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8826D4A5</checksum>
+      <checksum>2A9495FF</checksum>
     </file>
     <file>
       <filename>base-atticroof-vented.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4BA58555</checksum>
+      <checksum>B5EC5A8A</checksum>
     </file>
     <file>
       <filename>base-dhw-dwhr.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E0E65CB9</checksum>
+      <checksum>ED8177E7</checksum>
     </file>
     <file>
       <filename>base-enclosure-beds-4.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>671E7696</checksum>
+      <checksum>ACED3C4D</checksum>
     </file>
     <file>
       <filename>base-foundation-ambient.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6F48E517</checksum>
+      <checksum>8B64CEE4</checksum>
     </file>
     <file>
       <filename>base-foundation-vented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>13197A30</checksum>
+      <checksum>50CAD2CC</checksum>
     </file>
     <file>
       <filename>base-foundation-unvented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>52729CEF</checksum>
-    </file>
-    <file>
-      <filename>base-hvac-central-ac-plus-air-to-air-heat-pump-heating.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>1F6978B0</checksum>
+      <checksum>3813CB8A</checksum>
     </file>
     <file>
       <filename>base-hvac-air-to-air-heat-pump-2-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BBDAA897</checksum>
+      <checksum>F5BB1A9A</checksum>
     </file>
     <file>
       <filename>base-hvac-central-ac-only-2-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E1025820</checksum>
+      <checksum>42EAFB64</checksum>
     </file>
     <file>
       <filename>base-hvac-air-to-air-heat-pump-var-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0D12FF97</checksum>
+      <checksum>B02B6F2F</checksum>
     </file>
     <file>
       <filename>base-hvac-furnace-gas-central-ac-2-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3A884AD</checksum>
+      <checksum>5DBE5163</checksum>
     </file>
     <file>
       <filename>base-hvac-central-ac-only-var-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B0DDE2FA</checksum>
+      <checksum>5D5480CD</checksum>
     </file>
     <file>
       <filename>base-hvac-evap-cooler-furnace-gas.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5D61DDF3</checksum>
-    </file>
-    <file>
-      <filename>base-hvac-evap-cooler-only.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>93417B88</checksum>
+      <checksum>C290A69D</checksum>
     </file>
     <file>
       <filename>base-hvac-evap-cooler-only-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4B1CB24A</checksum>
+      <checksum>2F903986</checksum>
     </file>
     <file>
       <filename>base-hvac-furnace-gas-central-ac-var-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3BE3A16</checksum>
+      <checksum>5D709D01</checksum>
     </file>
     <file>
       <filename>base-hvac-furnace-gas-room-ac.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9725F9DD</checksum>
+      <checksum>0C4DDDB5</checksum>
     </file>
     <file>
       <filename>base-hvac-room-ac-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5D5C3B8E</checksum>
+      <checksum>56644CAF</checksum>
     </file>
     <file>
       <filename>base-mechvent-cfis-evap-cooler-only-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FA0B1D2D</checksum>
+      <checksum>49C7C8F6</checksum>
     </file>
     <file>
       <filename>base-atticroof-flat.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>7F03911A</checksum>
+      <checksum>15F4417C</checksum>
     </file>
     <file>
       <filename>extra-dhw-solar-latitude.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2F3374E0</checksum>
+      <checksum>987C7988</checksum>
     </file>
     <file>
       <filename>extra-pv-roofpitch.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8843AEEE</checksum>
+      <checksum>723366DA</checksum>
     </file>
     <file>
       <filename>extra-auto.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FCBD0BBC</checksum>
+      <checksum>E00056BD</checksum>
     </file>
     <file>
       <filename>base-hvac-boiler-elec-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>654EA48D</checksum>
-    </file>
-    <file>
-      <filename>base-hvac-stove-oil-only.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>8688418D</checksum>
-    </file>
-    <file>
-      <filename>base-hvac-wall-furnace-elec-only.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>F7FA39BB</checksum>
-    </file>
-    <file>
-      <filename>base-hvac-stove-wood-pellets-only.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>D001450C</checksum>
+      <checksum>8B9DF47C</checksum>
     </file>
     <file>
       <filename>base-mechvent-bath-kitchen-fans.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>AEC979B3</checksum>
+      <checksum>762E5163</checksum>
     </file>
     <file>
       <filename>base-misc-neighbor-shading.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B94FDE68</checksum>
-    </file>
-    <file>
-      <filename>base-dhw-indirect-with-solar-fraction.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>725B3D12</checksum>
-    </file>
-    <file>
-      <filename>base-dhw-combi-tankless-outside.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>3DDE9929</checksum>
-    </file>
-    <file>
-      <filename>base-dhw-combi-tankless.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>0DBFB838</checksum>
+      <checksum>073B1191</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-heat-pump-outside.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D5CE48D4</checksum>
+      <checksum>6FB84D61</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-heat-pump-with-solar-fraction.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>09D1A794</checksum>
+      <checksum>EA349FC1</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-heat-pump.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9876396A</checksum>
+      <checksum>E6186F44</checksum>
     </file>
     <file>
       <filename>base-dhw-jacket-hpwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CE237888</checksum>
+      <checksum>C3E8BEF8</checksum>
     </file>
     <file>
       <filename>base-dhw-jacket-gas.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>80A63128</checksum>
+      <checksum>33CB70F8</checksum>
     </file>
     <file>
       <filename>base-dhw-solar-direct-evacuated-tube.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A93D7F32</checksum>
+      <checksum>C296E83B</checksum>
     </file>
     <file>
       <filename>base-dhw-solar-direct-flat-plate.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>967E441B</checksum>
+      <checksum>0035DE0D</checksum>
     </file>
     <file>
       <filename>base-dhw-solar-direct-ics.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FC2C4111</checksum>
+      <checksum>95B86CE5</checksum>
     </file>
     <file>
       <filename>base-dhw-solar-indirect-flat-plate.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>04A72517</checksum>
+      <checksum>61F374CE</checksum>
     </file>
     <file>
       <filename>base-dhw-solar-thermosyphon-flat-plate.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EC1280FC</checksum>
+      <checksum>C70E55C5</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-heat-pump-with-solar.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F6F1DB49</checksum>
+      <checksum>B7B7521E</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-gas-outside.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DAD66976</checksum>
+      <checksum>C285FBED</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-gas.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4C0CD5A9</checksum>
+      <checksum>39BAFF80</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-oil.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>32EB5275</checksum>
+      <checksum>BC80CA32</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-wood.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8AA7E5E7</checksum>
+      <checksum>E2CD5211</checksum>
     </file>
     <file>
       <filename>base-dhw-tankless-gas-with-solar.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DD885799</checksum>
+      <checksum>0E5344B1</checksum>
     </file>
     <file>
       <filename>base-dhw-tankless-electric.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>75CBC7FC</checksum>
+      <checksum>E132BC0E</checksum>
     </file>
     <file>
       <filename>base-dhw-tankless-gas-with-solar-fraction.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>586419F7</checksum>
+      <checksum>A98CD2D3</checksum>
     </file>
     <file>
       <filename>base-dhw-tankless-propane.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D9184DB9</checksum>
+      <checksum>2FCD6B89</checksum>
     </file>
     <file>
       <filename>base-dhw-tankless-gas.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>412B1972</checksum>
+      <checksum>C82641E0</checksum>
     </file>
     <file>
       <filename>base-hvac-room-ac-only-33percent.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>84C00DBE</checksum>
+      <checksum>8768C9F0</checksum>
     </file>
     <file>
       <filename>base-hvac-furnace-elec-central-ac-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4F55D160</checksum>
+      <checksum>137F9ECB</checksum>
     </file>
     <file>
       <filename>base-enclosure-infil-natural-ach.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4CD1F411</checksum>
+      <checksum>63DF9CBF</checksum>
     </file>
     <file>
       <filename>base-foundation-unconditioned-basement.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C38F2CB1</checksum>
-    </file>
-    <file>
-      <filename>base-hvac-floor-furnace-propane-only.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>278E2F0B</checksum>
+      <checksum>4828D346</checksum>
     </file>
     <file>
       <filename>base-enclosure-2stories-garage.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6E8007CC</checksum>
+      <checksum>D0A827BE</checksum>
     </file>
     <file>
       <filename>base-enclosure-2stories.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>70705570</checksum>
+      <checksum>20C4C9FE</checksum>
     </file>
     <file>
       <filename>base-foundation-slab.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C581F9AD</checksum>
+      <checksum>D6B28BA1</checksum>
     </file>
     <file>
       <filename>extra-second-refrigerator.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>03AFA5FC</checksum>
+      <checksum>7935F54F</checksum>
     </file>
     <file>
       <filename>base-enclosure-garage.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>77A40F53</checksum>
+      <checksum>44D180C7</checksum>
     </file>
     <file>
       <filename>base-dhw-tank-coal.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>35D27CA7</checksum>
+      <checksum>6EE31FE3</checksum>
     </file>
     <file>
       <filename>base-hvac-boiler-coal-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A0F6604B</checksum>
+      <checksum>58216DA4</checksum>
     </file>
     <file>
       <filename>base-hvac-elec-resistance-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0CD23832</checksum>
+      <checksum>E4C2DDAB</checksum>
     </file>
     <file>
       <filename>base-simcontrol-timestep-10-mins.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EFBFCE72</checksum>
+      <checksum>2C23A8D2</checksum>
     </file>
     <file>
       <filename>base-simcontrol-daylight-saving-custom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>7CB85254</checksum>
+      <checksum>E065EA5D</checksum>
     </file>
     <file>
       <filename>base-simcontrol-daylight-saving-disabled.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C45A81C1</checksum>
+      <checksum>7EB96166</checksum>
     </file>
     <file>
       <filename>extra-second-heating-system-fireplace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>11FBC7AF</checksum>
+      <checksum>BD3E8DF0</checksum>
     </file>
     <file>
       <filename>extra-second-heating-system-portable-heater.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DF721AF7</checksum>
+      <checksum>1AF86B14</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-air-conditioner-only-ducted.osw</filename>
+      <filename>base-lighting-detailed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>807D99FA</checksum>
+      <checksum>A342EE4B</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-air-conditioner-only-ductless.osw</filename>
+      <filename>base-mechvent-whole-house-fan.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4EF003DD</checksum>
+      <checksum>DEE732DF</checksum>
     </file>
     <file>
-      <filename>base-lighting-ceiling-fans.osw</filename>
+      <filename>base-dhw-none.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>967D9A4C</checksum>
+      <checksum>EC0FAF91</checksum>
     </file>
     <file>
-      <filename>base-lighting-detailed.osw</filename>
+      <filename>base-enclosure-infil-flue.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F9BE33AD</checksum>
+      <checksum>25992FCC</checksum>
     </file>
     <file>
-      <filename>base-mechvent-whole-house-fan.osw</filename>
+      <filename>base-enclosure-infil-ach-house-pressure.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4B74EB64</checksum>
+      <checksum>B484D508</checksum>
     </file>
     <file>
-      <filename>base-misc-loads-large-uncommon.osw</filename>
+      <filename>base-enclosure-infil-cfm-house-pressure.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8464094F</checksum>
+      <checksum>C2238C5F</checksum>
     </file>
     <file>
-      <filename>base-misc-loads-large-uncommon2.osw</filename>
+      <filename>base-dhw-tankless-electric-outside.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D586B20B</checksum>
+      <checksum>E9BA3D56</checksum>
     </file>
     <file>
-      <filename>base-dhw-none.osw</filename>
+      <filename>base-enclosure-beds-5.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EEE9EAF8</checksum>
+      <checksum>99C50F57</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-flue.osw</filename>
+      <filename>base-enclosure-beds-1.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6AFFBD8C</checksum>
+      <checksum>76DA310F</checksum>
     </file>
     <file>
-      <filename>extra-dhw-shared-water-heater.osw</filename>
+      <filename>base-enclosure-beds-2.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6C7C653F</checksum>
+      <checksum>B831A793</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-ach-house-pressure.osw</filename>
+      <filename>base-simcontrol-runperiod-1-month.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BA4305DE</checksum>
+      <checksum>DEE43FEB</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-cfm-house-pressure.osw</filename>
+      <filename>extra-enclosure-garage-partially-protruded.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B8374C43</checksum>
+      <checksum>CAA12DE0</checksum>
     </file>
     <file>
-      <filename>extra-pv-shared.osw</filename>
+      <filename>base-atticroof-radiant-barrier.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0EFC87B7</checksum>
+      <checksum>72D99701</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-electric-outside.osw</filename>
+      <filename>base-location-miami-fl.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C2B033CC</checksum>
+      <checksum>3FF9CA9D</checksum>
     </file>
     <file>
-      <filename>base-enclosure-beds-5.osw</filename>
+      <filename>base-appliances-dehumidifier.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>7F635A73</checksum>
+      <checksum>302D8CE2</checksum>
     </file>
     <file>
-      <filename>base-enclosure-beds-1.osw</filename>
+      <filename>base-location-dallas-tx.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>42ED111A</checksum>
+      <checksum>C8A3E936</checksum>
     </file>
     <file>
-      <filename>base-enclosure-beds-2.osw</filename>
+      <filename>base-appliances-dehumidifier-50percent.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D51A7C78</checksum>
+      <checksum>CB76AD87</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-gas-central-ac-1-speed.osw</filename>
+      <filename>base-foundation-unconditioned-basement-assembly-r.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C17DCF28</checksum>
+      <checksum>493D6DBD</checksum>
     </file>
     <file>
-      <filename>base-hvac-fireplace-wood-only.osw</filename>
+      <filename>base-foundation-unconditioned-basement-wall-insulation.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FFEC8D38</checksum>
+      <checksum>03687155</checksum>
     </file>
     <file>
-      <filename>base-hvac-ground-to-air-heat-pump.osw</filename>
+      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F3DB9F60</checksum>
+      <checksum>1965EA1F</checksum>
     </file>
     <file>
-      <filename>base-hvac-fixed-heater-gas-only.osw</filename>
+      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3F442714</checksum>
+      <checksum>1206BCA0</checksum>
     </file>
     <file>
-      <filename>base-hvac-portable-heater-gas-only.osw</filename>
+      <filename>base-appliances-coal.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CC5DC345</checksum>
+      <checksum>29461AFF</checksum>
     </file>
     <file>
-      <filename>base-misc-usage-multiplier.osw</filename>
+      <filename>base-appliances-gas.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E7D3D5DB</checksum>
+      <checksum>EB100678</checksum>
     </file>
     <file>
-      <filename>base-simcontrol-runperiod-1-month.osw</filename>
+      <filename>base-appliances-modified.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3837CAD0</checksum>
+      <checksum>3ED546F1</checksum>
     </file>
     <file>
-      <filename>extra-enclosure-garage-partially-protruded.osw</filename>
+      <filename>base-appliances-oil.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EBDD4837</checksum>
+      <checksum>5CF5A14B</checksum>
     </file>
     <file>
-      <filename>base-atticroof-radiant-barrier.osw</filename>
+      <filename>base-appliances-propane.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F162AD7E</checksum>
+      <checksum>CA2AFC29</checksum>
     </file>
     <file>
-      <filename>base-location-miami-fl.osw</filename>
+      <filename>base-appliances-wood.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B732D13C</checksum>
+      <checksum>F6B45DAC</checksum>
     </file>
     <file>
-      <filename>base-appliances-dehumidifier-ief.osw</filename>
+      <filename>base-simcontrol-calendar-year-custom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1F7847A8</checksum>
+      <checksum>B0D7ABE6</checksum>
     </file>
     <file>
-      <filename>base-appliances-dehumidifier.osw</filename>
+      <filename>base-location-AMY-2012.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DD7BBE5F</checksum>
+      <checksum>31FADCAA</checksum>
     </file>
     <file>
-      <filename>base-location-dallas-tx.osw</filename>
+      <filename>base-schedules-stochastic.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>34F77BFA</checksum>
+      <checksum>DF17F238</checksum>
     </file>
     <file>
-      <filename>base-appliances-dehumidifier-50percent.osw</filename>
+      <filename>base-schedules-user-specified.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D54DB23F</checksum>
+      <checksum>1B1FE4E1</checksum>
     </file>
     <file>
-      <filename>base-foundation-unconditioned-basement-assembly-r.osw</filename>
+      <filename>extra-vacancy-6-months.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3E014C7</checksum>
+      <checksum>63C3D539</checksum>
     </file>
     <file>
-      <filename>base-foundation-unconditioned-basement-wall-insulation.osw</filename>
+      <filename>base-lighting-ceiling-fans.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>AC106189</checksum>
+      <checksum>6DA267C2</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-evap-cooler-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>41B5D34C</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-mini-split-air-conditioner-only-ducted.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>533A2E15</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-mini-split-air-conditioner-only-ductless.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BC77F924</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>D938CFE5</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-air-to-air-heat-pump-1-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>28D9662C</checksum>
     </file>
     <file>
       <filename>base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-electric.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E35B8FC6</checksum>
+      <checksum>38177272</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.osw</filename>
+      <filename>base-hvac-central-ac-only-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B2951D91</checksum>
+      <checksum>5D103DE7</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.osw</filename>
+      <filename>base-hvac-central-ac-plus-air-to-air-heat-pump-heating.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A745651D</checksum>
+      <checksum>A948DD1C</checksum>
     </file>
     <file>
       <filename>base-hvac-mini-split-heat-pump-ducted-cooling-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>93714E30</checksum>
+      <checksum>D19C01A6</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-heat-pump-ductless.osw</filename>
+      <filename>base-hvac-ground-to-air-heat-pump.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D2044A98</checksum>
+      <checksum>3A354092</checksum>
     </file>
     <file>
-      <filename>extra-mechvent-shared-preconditioning.osw</filename>
+      <filename>base-hvac-mini-split-heat-pump-ducted-heating-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1CFB171E</checksum>
+      <checksum>556939DA</checksum>
     </file>
     <file>
-      <filename>extra-mechvent-shared.osw</filename>
+      <filename>base-hvac-mini-split-heat-pump-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>31621933</checksum>
+      <checksum>C131ACD3</checksum>
     </file>
     <file>
-      <filename>base-appliances-coal.osw</filename>
+      <filename>base-hvac-mini-split-heat-pump-ductless.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FC58A092</checksum>
+      <checksum>8DBE3E53</checksum>
     </file>
     <file>
-      <filename>base-appliances-gas.osw</filename>
+      <filename>base-hvac-stove-oil-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>662C5475</checksum>
+      <checksum>02C8C1CD</checksum>
     </file>
     <file>
-      <filename>base-appliances-modified.osw</filename>
+      <filename>base-hvac-stove-wood-pellets-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6CFE47F7</checksum>
+      <checksum>9684023E</checksum>
     </file>
     <file>
-      <filename>base-appliances-oil.osw</filename>
+      <filename>extra-schedules-random-seed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>62EE9F67</checksum>
+      <checksum>4D67B18A</checksum>
     </file>
     <file>
-      <filename>base-appliances-propane.osw</filename>
+      <filename>extra-hvac-programmable-thermostat.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C442B351</checksum>
+      <checksum>AAE42D2C</checksum>
     </file>
     <file>
-      <filename>base-appliances-wood.osw</filename>
+      <filename>extra-plug-loads-additional-multipliers.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6B2C62FA</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-dehumidifier-ief-portable.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>916B82AC</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-dehumidifier-ief-whole-home.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>891B690B</checksum>
+      <checksum>847D5567</checksum>
     </file>
     <file>
       <filename>base-misc-defaults.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B3F7F31D</checksum>
+      <checksum>96EC0815</checksum>
+    </file>
+    <file>
+      <filename>base-misc-usage-multiplier.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>93BB5F73</checksum>
+    </file>
+    <file>
+      <filename>base-pv.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>11672F8C</checksum>
     </file>
     <file>
       <version>
@@ -7639,49 +7698,91 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>79362B4A</checksum>
+      <checksum>2F7DF2BC</checksum>
     </file>
     <file>
-      <filename>base-simcontrol-calendar-year-custom.osw</filename>
+      <filename>base-misc-loads-large-uncommon.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EC193099</checksum>
+      <checksum>4616C7CB</checksum>
+    </file>
+    <file>
+      <filename>base-misc-loads-large-uncommon2.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E93C4A01</checksum>
     </file>
     <file>
       <filename>build_residential_hpxml_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>E6DB7AE7</checksum>
+      <checksum>E900963F</checksum>
     </file>
     <file>
-      <filename>base-location-AMY-2012.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-mechvent-preconditioning.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>09AED060</checksum>
+      <checksum>A061E175</checksum>
     </file>
     <file>
-      <filename>base-schedules-stochastic.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-mechvent.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8A77FB53</checksum>
+      <checksum>01E627F9</checksum>
     </file>
     <file>
-      <filename>base-schedules-user-specified.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-pv.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>90037338</checksum>
+      <checksum>26B150D2</checksum>
     </file>
     <file>
-      <filename>extra-vacancy-6-months.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-water-heater.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>72703462</checksum>
+      <checksum>C6D8DB9C</checksum>
     </file>
     <file>
-      <filename>schedules.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>2B97A62C</checksum>
+      <filename>base-bldgtype-multifamily.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>AA0852F0</checksum>
+    </file>
+    <file>
+      <filename>base-bldgtype-single-family-attached.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>77081C8C</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-elec-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1C39C5AE</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-gas-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>70CDC766</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-heat-pump-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1E503FB5</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-electric-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8BDD0815</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-gas-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>063501DA</checksum>
     </file>
   </files>
 </measure>