urbanopt-cli 0.5.1 → 0.6.2

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>7aa3b3de-5d4d-4fff-a48e-34d7b4893671</version_id>
-  <version_modified>20201208T174726Z</version_modified>
+  <version_id>87bdf2d0-cc16-481f-8178-df8046cdc9fe</version_id>
+  <version_modified>20210423T210940Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -259,10 +259,6 @@
       <model_dependent>false</model_dependent>
       <default_value>single-family detached</default_value>
       <choices>
-        <choice>
-          <value>manufactured home</value>
-          <display_name>manufactured home</display_name>
-        </choice>
         <choice>
           <value>single-family detached</value>
           <display_name>single-family detached</display_name>
@@ -290,7 +286,7 @@
     <argument>
       <name>geometry_num_floors_above_grade</name>
       <display_name>Geometry: Number of Floors</display_name>
-      <description>The number of floors above grade (in the unit if single-family attached, and in the building if apartment unit).</description>
+      <description>The number of floors above grade (in the unit if single-family detached or single-family attached, and in the building if apartment unit). Conditioned attics are included.</description>
       <type>Integer</type>
       <units>#</units>
       <required>true</required>
@@ -310,7 +306,7 @@
     <argument>
       <name>geometry_orientation</name>
       <display_name>Geometry: Orientation</display_name>
-      <description>The house's orientation is measured clockwise from due south when viewed from above (e.g., North=0, East=90, South=180, West=270).</description>
+      <description>The unit's orientation is measured clockwise from due south when viewed from above (e.g., North=0, East=90, South=180, West=270).</description>
       <type>Double</type>
       <units>degrees</units>
       <required>true</required>
@@ -330,7 +326,7 @@
     <argument>
       <name>geometry_corridor_position</name>
       <display_name>Geometry: Corridor Position</display_name>
-      <description>The position of the corridor.</description>
+      <description>The position of the corridor. Only applies to single-family attached and apartment unit units. Exterior corridors are shaded, but not enclosed. Interior corridors are enclosed and conditioned.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -357,7 +353,7 @@
     <argument>
       <name>geometry_corridor_width</name>
       <display_name>Geometry: Corridor Width</display_name>
-      <description>The width of the corridor.</description>
+      <description>The width of the corridor. Only applies to apartment unit units.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -367,7 +363,7 @@
     <argument>
       <name>geometry_inset_width</name>
       <display_name>Geometry: Inset Width</display_name>
-      <description>The width of the inset.</description>
+      <description>The width of the inset. Only applies to apartment unit units.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -377,7 +373,7 @@
     <argument>
       <name>geometry_inset_depth</name>
       <display_name>Geometry: Inset Depth</display_name>
-      <description>The depth of the inset.</description>
+      <description>The depth of the inset. Only applies to apartment unit units.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -387,7 +383,7 @@
     <argument>
       <name>geometry_inset_position</name>
       <display_name>Geometry: Inset Position</display_name>
-      <description>The position of the inset.</description>
+      <description>The position of the inset. Only applies to apartment unit units.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -406,7 +402,7 @@
     <argument>
       <name>geometry_balcony_depth</name>
       <display_name>Geometry: Balcony Depth</display_name>
-      <description>The depth of the balcony.</description>
+      <description>The depth of the balcony. Only applies to apartment unit units.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -416,7 +412,7 @@
     <argument>
       <name>geometry_garage_width</name>
       <display_name>Geometry: Garage Width</display_name>
-      <description>The width of the garage. Enter zero for no garage.</description>
+      <description>The width of the garage. Enter zero for no garage. Only applies to single-family detached units.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -426,7 +422,7 @@
     <argument>
       <name>geometry_garage_depth</name>
       <display_name>Geometry: Garage Depth</display_name>
-      <description>The depth of the garage.</description>
+      <description>The depth of the garage. Only applies to single-family detached units.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -436,7 +432,7 @@
     <argument>
       <name>geometry_garage_protrusion</name>
       <display_name>Geometry: Garage Protrusion</display_name>
-      <description>The fraction of the garage that is protruding from the living space.</description>
+      <description>The fraction of the garage that is protruding from the living space. Only applies to single-family detached units.</description>
       <type>Double</type>
       <units>frac</units>
       <required>true</required>
@@ -446,7 +442,7 @@
     <argument>
       <name>geometry_garage_position</name>
       <display_name>Geometry: Garage Position</display_name>
-      <description>The position of the garage.</description>
+      <description>The position of the garage. Only applies to single-family detached units.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -517,10 +513,20 @@
       <model_dependent>false</model_dependent>
       <default_value>0</default_value>
     </argument>
+    <argument>
+      <name>geometry_rim_joist_height</name>
+      <display_name>Geometry: Rim Joist Height</display_name>
+      <description>The height of the rim joists. Only applies to basements/crawlspaces.</description>
+      <type>Double</type>
+      <units>in</units>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>9.25</default_value>
+    </argument>
     <argument>
       <name>geometry_roof_type</name>
       <display_name>Geometry: Roof Type</display_name>
-      <description>The roof type of the building.</description>
+      <description>The roof type of the building. Assumed flat for apartment unit units.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -662,6 +668,15 @@
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
+    <argument>
+      <name>geometry_has_flue_or_chimney</name>
+      <display_name>Geometry: Has Flue or Chimney</display_name>
+      <description>Whether there is a flue or chimney.</description>
+      <type>String</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
+    </argument>
     <argument>
       <name>geometry_level</name>
       <display_name>Geometry: Level</display_name>
@@ -709,7 +724,7 @@
     <argument>
       <name>geometry_building_num_units</name>
       <display_name>Geometry: Building Number of Units</display_name>
-      <description>The number of units in the building. This is required for single-family attached and apartment unit buildings.</description>
+      <description>The number of units in the building. This is required for single-family attached and apartment unit units.</description>
       <type>Integer</type>
       <units>#</units>
       <required>false</required>
@@ -718,7 +733,7 @@
     <argument>
       <name>geometry_building_num_bedrooms</name>
       <display_name>Geometry: Building Number of Bedrooms</display_name>
-      <description>The number of bedrooms in the building. This is required for single-family attached and apartment unit buildings with shared PV systems.</description>
+      <description>The number of bedrooms in the building. This is required for single-family attached and apartment unit units with shared PV systems.</description>
       <type>Integer</type>
       <units>#</units>
       <required>false</required>
@@ -727,7 +742,7 @@
     <argument>
       <name>floor_assembly_r</name>
       <display_name>Floor: Assembly R-value</display_name>
-      <description>Assembly R-value for the floor (foundation ceiling). Ignored if a slab foundation.</description>
+      <description>Assembly R-value for the floor (foundation ceiling). Ignored if the building has a slab foundation.</description>
       <type>Double</type>
       <units>h-ft^2-R/Btu</units>
       <required>true</required>
@@ -757,12 +772,12 @@
     <argument>
       <name>foundation_wall_insulation_distance_to_bottom</name>
       <display_name>Foundation: Wall Insulation Distance To Bottom</display_name>
-      <description>The distance from the top of the foundation wall to the bottom of the foundation wall insulation. Only applies to basements/crawlspaces.</description>
-      <type>Double</type>
+      <description>The distance from the top of the foundation wall to the bottom of the foundation wall insulation. Only applies to basements/crawlspaces. A value of 'auto' will use the same height as the foundation.</description>
+      <type>String</type>
       <units>ft</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>0</default_value>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>foundation_wall_assembly_r</name>
@@ -782,6 +797,16 @@
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
+    <argument>
+      <name>rim_joist_assembly_r</name>
+      <display_name>Rim Joist: Assembly R-value</display_name>
+      <description>Assembly R-value for the rim joists. Only applies to basements/crawlspaces.</description>
+      <type>Double</type>
+      <units>h-ft^2-R/Btu</units>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>23</default_value>
+    </argument>
     <argument>
       <name>slab_perimeter_insulation_r</name>
       <display_name>Slab: Perimeter Insulation Nominal R-value</display_name>
@@ -902,12 +927,8 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
+      <default_value>medium</default_value>
       <choices>
-        <choice>
-          <value>auto</value>
-          <display_name>auto</display_name>
-        </choice>
         <choice>
           <value>dark</value>
           <display_name>dark</display_name>
@@ -940,32 +961,24 @@
       <model_dependent>false</model_dependent>
       <default_value>2.3</default_value>
     </argument>
-    <argument>
-      <name>roof_solar_absorptance</name>
-      <display_name>Roof: Solar Absorptance</display_name>
-      <description>The solar absorptance of the roof.</description>
-      <type>String</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-    </argument>
-    <argument>
-      <name>roof_emittance</name>
-      <display_name>Roof: Emittance</display_name>
-      <description>The emittance of the roof.</description>
-      <type>String</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <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>String</type>
+      <type>Boolean</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
+      <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>roof_radiant_barrier_grade</name>
@@ -993,7 +1006,7 @@
     <argument>
       <name>neighbor_front_distance</name>
       <display_name>Neighbor: Front Distance</display_name>
-      <description>The minimum distance between the simulated house and the neighboring house to the front (not including eaves). A value of zero indicates no neighbors.</description>
+      <description>The minimum distance between the simulated unit and the neighboring building to the front (not including eaves). A value of zero indicates no neighbors.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -1003,7 +1016,7 @@
     <argument>
       <name>neighbor_back_distance</name>
       <display_name>Neighbor: Back Distance</display_name>
-      <description>The minimum distance between the simulated house and the neighboring house to the back (not including eaves). A value of zero indicates no neighbors.</description>
+      <description>The minimum distance between the simulated unit and the neighboring building to the back (not including eaves). A value of zero indicates no neighbors.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -1013,7 +1026,7 @@
     <argument>
       <name>neighbor_left_distance</name>
       <display_name>Neighbor: Left Distance</display_name>
-      <description>The minimum distance between the simulated house and the neighboring house to the left (not including eaves). A value of zero indicates no neighbors.</description>
+      <description>The minimum distance between the simulated unit and the neighboring building to the left (not including eaves). A value of zero indicates no neighbors.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -1023,7 +1036,7 @@
     <argument>
       <name>neighbor_right_distance</name>
       <display_name>Neighbor: Right Distance</display_name>
-      <description>The minimum distance between the simulated house and the neighboring house to the right (not including eaves). A value of zero indicates no neighbors.</description>
+      <description>The minimum distance between the simulated unit and the neighboring building to the right (not including eaves). A value of zero indicates no neighbors.</description>
       <type>Double</type>
       <units>ft</units>
       <required>true</required>
@@ -1128,7 +1141,7 @@
     <argument>
       <name>wall_siding_type</name>
       <display_name>Wall: Siding Type</display_name>
-      <description>The siding type of the exterior walls.</description>
+      <description>The siding type of the exterior walls. Also applies to rim joists.</description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -1162,16 +1175,12 @@
     <argument>
       <name>wall_color</name>
       <display_name>Wall: Color</display_name>
-      <description>The color of the exterior walls.</description>
+      <description>The color of the exterior walls. Also applies to rim joists.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
+      <default_value>medium</default_value>
       <choices>
-        <choice>
-          <value>auto</value>
-          <display_name>auto</display_name>
-        </choice>
         <choice>
           <value>dark</value>
           <display_name>dark</display_name>
@@ -1204,28 +1213,10 @@
       <model_dependent>false</model_dependent>
       <default_value>13</default_value>
     </argument>
-    <argument>
-      <name>wall_solar_absorptance</name>
-      <display_name>Wall: Solar Absorptance</display_name>
-      <description>The solar absorptance of the exterior walls.</description>
-      <type>String</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-    </argument>
-    <argument>
-      <name>wall_emittance</name>
-      <display_name>Wall: Emittance</display_name>
-      <description>The emittance of the exterior walls.</description>
-      <type>String</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-    </argument>
     <argument>
       <name>window_front_wwr</name>
       <display_name>Windows: Front Window-to-Wall Ratio</display_name>
-      <description>The ratio of window area to wall area for the building's front facade. Enter 0 if specifying Front Window Area instead.</description>
+      <description>The ratio of window area to wall area for the unit's front facade. Enter 0 if specifying Front Window Area instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1234,7 +1225,7 @@
     <argument>
       <name>window_back_wwr</name>
       <display_name>Windows: Back Window-to-Wall Ratio</display_name>
-      <description>The ratio of window area to wall area for the building's back facade. Enter 0 if specifying Back Window Area instead.</description>
+      <description>The ratio of window area to wall area for the unit's back facade. Enter 0 if specifying Back Window Area instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1243,7 +1234,7 @@
     <argument>
       <name>window_left_wwr</name>
       <display_name>Windows: Left Window-to-Wall Ratio</display_name>
-      <description>The ratio of window area to wall area for the building's left facade. Enter 0 if specifying Left Window Area instead.</description>
+      <description>The ratio of window area to wall area for the unit's left facade (when viewed from the front). Enter 0 if specifying Left Window Area instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1252,7 +1243,7 @@
     <argument>
       <name>window_right_wwr</name>
       <display_name>Windows: Right Window-to-Wall Ratio</display_name>
-      <description>The ratio of window area to wall area for the building's right facade. Enter 0 if specifying Right Window Area instead.</description>
+      <description>The ratio of window area to wall area for the unit's right facade (when viewed from the front). Enter 0 if specifying Right Window Area instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1261,7 +1252,7 @@
     <argument>
       <name>window_area_front</name>
       <display_name>Windows: Front Window Area</display_name>
-      <description>The amount of window area on the building's front facade. Enter 0 if specifying Front Window-to-Wall Ratio instead.</description>
+      <description>The amount of window area on the unit's front facade. Enter 0 if specifying Front Window-to-Wall Ratio instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1270,7 +1261,7 @@
     <argument>
       <name>window_area_back</name>
       <display_name>Windows: Back Window Area</display_name>
-      <description>The amount of window area on the building's back facade. Enter 0 if specifying Back Window-to-Wall Ratio instead.</description>
+      <description>The amount of window area on the unit's back facade. Enter 0 if specifying Back Window-to-Wall Ratio instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1279,7 +1270,7 @@
     <argument>
       <name>window_area_left</name>
       <display_name>Windows: Left Window Area</display_name>
-      <description>The amount of window area on the building's left facade. Enter 0 if specifying Left Window-to-Wall Ratio instead.</description>
+      <description>The amount of window area on the unit's left facade (when viewed from the front). Enter 0 if specifying Left Window-to-Wall Ratio instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1288,7 +1279,7 @@
     <argument>
       <name>window_area_right</name>
       <display_name>Windows: Right Window Area</display_name>
-      <description>The amount of window area on the building's right facade. Enter 0 if specifying Right Window-to-Wall Ratio instead.</description>
+      <description>The amount of window area on the unit's right facade (when viewed from the front). Enter 0 if specifying Right Window-to-Wall Ratio instead.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1346,6 +1337,22 @@
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <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.</description>
+      <type>Double</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <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.</description>
+      <type>Double</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>overhangs_front_depth</name>
       <display_name>Overhangs: Front Facade Depth</display_name>
@@ -1421,7 +1428,7 @@
     <argument>
       <name>skylight_area_front</name>
       <display_name>Skylights: Front Roof Area</display_name>
-      <description>The amount of skylight area on the building's front conditioned roof facade.</description>
+      <description>The amount of skylight area on the unit's front conditioned roof facade.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1430,7 +1437,7 @@
     <argument>
       <name>skylight_area_back</name>
       <display_name>Skylights: Back Roof Area</display_name>
-      <description>The amount of skylight area on the building's back conditioned roof facade.</description>
+      <description>The amount of skylight area on the unit's back conditioned roof facade.</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1439,7 +1446,7 @@
     <argument>
       <name>skylight_area_left</name>
       <display_name>Skylights: Left Roof Area</display_name>
-      <description>The amount of skylight area on the building's left conditioned roof facade.</description>
+      <description>The amount of skylight area on the unit's left conditioned roof facade (when viewed from the front).</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1448,7 +1455,7 @@
     <argument>
       <name>skylight_area_right</name>
       <display_name>Skylights: Right Roof Area</display_name>
-      <description>The amount of skylight area on the building's right conditioned roof facade.</description>
+      <description>The amount of skylight area on the unit's right conditioned roof facade (when viewed from the front).</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1536,14 +1543,31 @@
       <default_value>3</default_value>
     </argument>
     <argument>
-      <name>air_leakage_shelter_coefficient</name>
-      <display_name>Air Leakage: Shelter Coefficient</display_name>
-      <description>The local shelter coefficient (AIM-2 infiltration model) accounts for nearby buildings, trees, and obstructions.</description>
-      <type>String</type>
-      <units>Frac</units>
+      <name>air_leakage_shielding_of_home</name>
+      <display_name>Air Leakage: Shielding of Home</display_name>
+      <description>Presence of nearby buildings, trees, obstructions for infiltration model.</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>exposed</value>
+          <display_name>exposed</display_name>
+        </choice>
+        <choice>
+          <value>normal</value>
+          <display_name>normal</display_name>
+        </choice>
+        <choice>
+          <value>well-shielded</value>
+          <display_name>well-shielded</display_name>
+        </choice>
+      </choices>
     </argument>
     <argument>
       <name>heating_system_type</name>
@@ -1594,6 +1618,14 @@
           <value>FixedHeater</value>
           <display_name>FixedHeater</display_name>
         </choice>
+        <choice>
+          <value>Shared Boiler w/ Baseboard</value>
+          <display_name>Shared Boiler w/ Baseboard</display_name>
+        </choice>
+        <choice>
+          <value>Shared Boiler w/ Ductless Fan Coil</value>
+          <display_name>Shared Boiler w/ Ductless Fan Coil</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -1666,51 +1698,14 @@
       <default_value>1</default_value>
     </argument>
     <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. 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>
+      <name>heating_system_airflow_defect_ratio</name>
+      <display_name>Heating System: Airflow Defect Ratio</display_name>
+      <description>The airflow defect ratio, defined as (InstalledAirflow - DesignAirflow) / DesignAirflow, of the heating system per ANSI/RESNET/ACCA Standard 310. A value of zero means no airflow defect. Applies only to Furnace.</description>
       <type>Double</type>
-      <units>W</units>
+      <units>Frac</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>
-      <description>Whether the heating system has a flue or chimney.</description>
-      <type>Boolean</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>
-    </argument>
     <argument>
       <name>cooling_system_type</name>
       <display_name>Cooling System: Type</display_name>
@@ -1743,24 +1738,33 @@
       </choices>
     </argument>
     <argument>
-      <name>cooling_system_cooling_efficiency_seer</name>
-      <display_name>Cooling System: Rated SEER</display_name>
-      <description>The rated efficiency value of the central air conditioner cooling system.</description>
-      <type>Double</type>
-      <units>SEER</units>
+      <name>cooling_system_cooling_efficiency_type</name>
+      <display_name>Cooling System: Efficiency Type</display_name>
+      <description>The efficiency type of the cooling system. System types central air conditioner and mini-split use SEER. System type room air conditioner uses EER. Ignored for system type evaporative cooler.</description>
+      <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>13</default_value>
+      <default_value>SEER</default_value>
+      <choices>
+        <choice>
+          <value>SEER</value>
+          <display_name>SEER</display_name>
+        </choice>
+        <choice>
+          <value>EER</value>
+          <display_name>EER</display_name>
+        </choice>
+      </choices>
     </argument>
     <argument>
-      <name>cooling_system_cooling_efficiency_eer</name>
-      <display_name>Cooling System: Rated EER</display_name>
-      <description>The rated efficiency value of the room air conditioner cooling system.</description>
+      <name>cooling_system_cooling_efficiency</name>
+      <display_name>Cooling System: Efficiency</display_name>
+      <description>The rated efficiency value of the cooling system. Ignored for evaporative cooler.</description>
       <type>Double</type>
-      <units>EER</units>
+      <units>SEER or EER</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>8.5</default_value>
+      <default_value>13</default_value>
     </argument>
     <argument>
       <name>cooling_system_cooling_compressor_type</name>
@@ -1796,7 +1800,7 @@
     <argument>
       <name>cooling_system_cooling_capacity</name>
       <display_name>Cooling System: Cooling Capacity</display_name>
-      <description>The output cooling capacity of the cooling system. If using 'auto', the autosizing algorithm will use ACCA Manual J/S to set the capacity to meet its load served. Ignored for evaporative cooler.</description>
+      <description>The output cooling capacity of the cooling system. If using 'auto', the autosizing algorithm will use ACCA Manual J/S to set the capacity to meet its load served.</description>
       <type>String</type>
       <units>tons</units>
       <required>true</required>
@@ -1816,7 +1820,7 @@
     <argument>
       <name>cooling_system_is_ducted</name>
       <display_name>Cooling System: Is Ducted</display_name>
-      <description>Whether the cooling system is ducted or not. Only used for evaporative cooler and mini-split.</description>
+      <description>Whether the cooling system is ducted or not. Only used for mini-split and evaporative cooler.</description>
       <type>Boolean</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -1833,11 +1837,20 @@
       </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>
+      <name>cooling_system_airflow_defect_ratio</name>
+      <display_name>Cooling System: Airflow Defect Ratio</display_name>
+      <description>The airflow defect ratio, defined as (InstalledAirflow - DesignAirflow) / DesignAirflow, of the cooling system per ANSI/RESNET/ACCA Standard 310. A value of zero means no airflow defect. Applies only to central air conditioner and ducted mini-split.</description>
+      <type>Double</type>
+      <units>Frac</units>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
+    <argument>
+      <name>cooling_system_charge_defect_ratio</name>
+      <display_name>Cooling System: Charge Defect Ratio</display_name>
+      <description>The refrigerant charge defect ratio, defined as (InstalledCharge - DesignCharge) / DesignCharge, of the cooling system per ANSI/RESNET/ACCA Standard 310. A value of zero means no refrigerant charge defect. Applies only to central air conditioner and mini-split.</description>
       <type>Double</type>
-      <units>W/CFM</units>
+      <units>Frac</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
@@ -1869,44 +1882,62 @@
       </choices>
     </argument>
     <argument>
-      <name>heat_pump_heating_efficiency_hspf</name>
-      <display_name>Heat Pump: Rated Heating HSPF</display_name>
-      <description>The rated heating efficiency value of the air-to-air/mini-split heat pump.</description>
-      <type>Double</type>
-      <units>HSPF</units>
+      <name>heat_pump_heating_efficiency_type</name>
+      <display_name>Heat Pump: Heating Efficiency Type</display_name>
+      <description>The heating efficiency type of heat pump. System types air-to-air and mini-split use HSPF. System type ground-to-air uses COP.</description>
+      <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>7.7</default_value>
+      <default_value>HSPF</default_value>
+      <choices>
+        <choice>
+          <value>HSPF</value>
+          <display_name>HSPF</display_name>
+        </choice>
+        <choice>
+          <value>COP</value>
+          <display_name>COP</display_name>
+        </choice>
+      </choices>
     </argument>
     <argument>
-      <name>heat_pump_heating_efficiency_cop</name>
-      <display_name>Heat Pump: Rated Heating COP</display_name>
-      <description>The rated heating efficiency value of the ground-to-air heat pump.</description>
+      <name>heat_pump_heating_efficiency</name>
+      <display_name>Heat Pump: Heating Efficiency</display_name>
+      <description>The rated heating efficiency value of the heat pump.</description>
       <type>Double</type>
-      <units>COP</units>
+      <units>HSPF or COP</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>3.6</default_value>
+      <default_value>7.7</default_value>
     </argument>
     <argument>
-      <name>heat_pump_cooling_efficiency_seer</name>
-      <display_name>Heat Pump: Rated Cooling SEER</display_name>
-      <description>The rated cooling efficiency value of the air-to-air/mini-split heat pump.</description>
-      <type>Double</type>
-      <units>SEER</units>
+      <name>heat_pump_cooling_efficiency_type</name>
+      <display_name>Heat Pump: Cooling Efficiency Type</display_name>
+      <description>The cooling efficiency type of heat pump. System types air-to-air and mini-split use SEER. System type ground-to-air uses EER.</description>
+      <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>13</default_value>
+      <default_value>SEER</default_value>
+      <choices>
+        <choice>
+          <value>SEER</value>
+          <display_name>SEER</display_name>
+        </choice>
+        <choice>
+          <value>EER</value>
+          <display_name>EER</display_name>
+        </choice>
+      </choices>
     </argument>
     <argument>
-      <name>heat_pump_cooling_efficiency_eer</name>
-      <display_name>Heat Pump: Rated Cooling EER</display_name>
-      <description>The rated cooling efficiency value of the ground-to-air heat pump.</description>
+      <name>heat_pump_cooling_efficiency</name>
+      <display_name>Heat Pump: Cooling Efficiency</display_name>
+      <description>The rated cooling efficiency value of the heat pump.</description>
       <type>Double</type>
-      <units>EER</units>
+      <units>SEER or EER</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>16.6</default_value>
+      <default_value>13</default_value>
     </argument>
     <argument>
       <name>heat_pump_cooling_compressor_type</name>
@@ -1950,7 +1981,7 @@
       <default_value>auto</default_value>
     </argument>
     <argument>
-      <name>heat_pump_heating_capacity_17F</name>
+      <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.</description>
       <type>String</type>
@@ -2042,16 +2073,16 @@
     <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.</description>
+      <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.</description>
       <type>Double</type>
       <units>deg-F</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>heat_pump_mini_split_is_ducted</name>
-      <display_name>Heat Pump: Mini-Split Is Ducted</display_name>
-      <description>Whether the mini-split heat pump is ducted or not.</description>
+      <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.</description>
       <type>Boolean</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -2067,134 +2098,174 @@
       </choices>
     </argument>
     <argument>
-      <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>
+      <name>heat_pump_airflow_defect_ratio</name>
+      <display_name>Heat Pump: Airflow Defect Ratio</display_name>
+      <description>The airflow defect ratio, defined as (InstalledAirflow - DesignAirflow) / DesignAirflow, of the heat pump per ANSI/RESNET/ACCA Standard 310. A value of zero means no airflow defect. Applies only to air-to-air, ducted mini-split, and ground-to-air.</description>
       <type>Double</type>
-      <units>W/ton</units>
+      <units>Frac</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>heat_pump_fan_power_watts_per_cfm</name>
-      <display_name>Heat Pump: Fan Power</display_name>
-      <description>Blower fan power.</description>
+      <name>heat_pump_charge_defect_ratio</name>
+      <display_name>Heat Pump: Charge Defect Ratio</display_name>
+      <description>The refrigerant charge defect ratio, defined as (InstalledCharge - DesignCharge) / DesignCharge, of the heat pump per ANSI/RESNET/ACCA Standard 310. A value of zero means no refrigerant charge defect. Applies to all heat pump types.</description>
       <type>Double</type>
-      <units>W/CFM</units>
+      <units>Frac</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <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>
+      <name>heating_system_type_2</name>
+      <display_name>Heating System 2: Type</display_name>
+      <description>The type of the second heating system.</description>
+      <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>71</default_value>
+      <default_value>none</default_value>
+      <choices>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
+        <choice>
+          <value>WallFurnace</value>
+          <display_name>WallFurnace</display_name>
+        </choice>
+        <choice>
+          <value>FloorFurnace</value>
+          <display_name>FloorFurnace</display_name>
+        </choice>
+        <choice>
+          <value>Boiler</value>
+          <display_name>Boiler</display_name>
+        </choice>
+        <choice>
+          <value>ElectricResistance</value>
+          <display_name>ElectricResistance</display_name>
+        </choice>
+        <choice>
+          <value>Stove</value>
+          <display_name>Stove</display_name>
+        </choice>
+        <choice>
+          <value>PortableHeater</value>
+          <display_name>PortableHeater</display_name>
+        </choice>
+        <choice>
+          <value>Fireplace</value>
+          <display_name>Fireplace</display_name>
+        </choice>
+      </choices>
     </argument>
     <argument>
-      <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>
+      <name>heating_system_fuel_2</name>
+      <display_name>Heating System 2: Fuel Type</display_name>
+      <description>The fuel type of the second heating system. Ignored for ElectricResistance.</description>
+      <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>71</default_value>
+      <default_value>electricity</default_value>
+      <choices>
+        <choice>
+          <value>electricity</value>
+          <display_name>electricity</display_name>
+        </choice>
+        <choice>
+          <value>natural gas</value>
+          <display_name>natural gas</display_name>
+        </choice>
+        <choice>
+          <value>fuel oil</value>
+          <display_name>fuel oil</display_name>
+        </choice>
+        <choice>
+          <value>propane</value>
+          <display_name>propane</display_name>
+        </choice>
+        <choice>
+          <value>wood</value>
+          <display_name>wood</display_name>
+        </choice>
+        <choice>
+          <value>wood pellets</value>
+          <display_name>wood pellets</display_name>
+        </choice>
+        <choice>
+          <value>coal</value>
+          <display_name>coal</display_name>
+        </choice>
+      </choices>
     </argument>
     <argument>
-      <name>setpoint_heating_weekday_offset_magnitude</name>
-      <display_name>Heating Setpoint: Weekday Offset Magnitude</display_name>
-      <description>Specify the weekday heating offset magnitude.</description>
+      <name>heating_system_heating_efficiency_2</name>
+      <display_name>Heating System 2: Rated AFUE or Percent</display_name>
+      <description>For Furnace/WallFurnace/FloorFurnace/Boiler second heating system, the rated AFUE value. For ElectricResistance/Stove/PortableHeater/Fireplace, the rated Percent value.</description>
       <type>Double</type>
-      <units>deg-F</units>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-    </argument>
-    <argument>
-      <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>
-      <units>deg-F</units>
-      <required>false</required>
-      <model_dependent>false</model_dependent>
-    </argument>
-    <argument>
-      <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>
+      <units>Frac</units>
+      <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>1</default_value>
     </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>
+      <name>heating_system_heating_capacity_2</name>
+      <display_name>Heating System 2: Heating Capacity</display_name>
+      <description>The output heating capacity of the second heating system. If using 'auto', the autosizing algorithm will use ACCA Manual J/S to set the capacity to meet its load served.</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>
+      <units>Btu/hr</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>76</default_value>
+      <default_value>auto</default_value>
     </argument>
     <argument>
-      <name>setpoint_cooling_weekend_temp</name>
-      <display_name>Cooling Setpoint: Weekend Temperature</display_name>
-      <description>Specify the weekend cooling setpoint temperature.</description>
+      <name>heating_system_fraction_heat_load_served_2</name>
+      <display_name>Heating System 2: Fraction Heat Load Served</display_name>
+      <description>The heat load served fraction of the second heating system.</description>
       <type>Double</type>
-      <units>deg-F</units>
+      <units>Frac</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>76</default_value>
+      <default_value>0.25</default_value>
     </argument>
     <argument>
-      <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>
+      <name>setpoint_heating_weekday</name>
+      <display_name>Heating Setpoint: Weekday Schedule</display_name>
+      <description>Specify the constant or 24-hour comma-separated weekday heating schedule.</description>
+      <type>String</type>
       <units>deg-F</units>
-      <required>false</required>
+      <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>71</default_value>
     </argument>
     <argument>
-      <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>
+      <name>setpoint_heating_weekend</name>
+      <display_name>Heating Setpoint: Weekend Schedule</display_name>
+      <description>Specify the constant or 24-hour comma-separated weekend heating schedule.</description>
+      <type>String</type>
       <units>deg-F</units>
-      <required>false</required>
+      <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>71</default_value>
     </argument>
     <argument>
-      <name>setpoint_cooling_weekday_schedule</name>
+      <name>setpoint_cooling_weekday</name>
       <display_name>Cooling Setpoint: Weekday Schedule</display_name>
-      <description>Specify the 24-hour comma-separated weekday cooling schedule of 0s and 1s.</description>
+      <description>Specify the constant or 24-hour comma-separated weekday cooling schedule.</description>
       <type>String</type>
       <units>deg-F</units>
-      <required>false</required>
+      <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>76</default_value>
     </argument>
     <argument>
-      <name>setpoint_cooling_weekend_schedule</name>
+      <name>setpoint_cooling_weekend</name>
       <display_name>Cooling Setpoint: Weekend Schedule</display_name>
-      <description>Specify the 24-hour comma-separated weekend cooling schedule of 0s and 1s.</description>
+      <description>Specify the constant or 24-hour comma-separated weekend cooling schedule.</description>
       <type>String</type>
       <units>deg-F</units>
-      <required>false</required>
+      <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>76</default_value>
     </argument>
     <argument>
       <name>ducts_supply_leakage_units</name>
@@ -2453,158 +2524,13 @@
     <argument>
       <name>ducts_number_of_return_registers</name>
       <display_name>Ducts: Number of Return Registers</display_name>
-      <description>The number of return registers of the ducts.</description>
+      <description>The number of return registers of the ducts. Ignored for ducted evaporative cooler.</description>
       <type>String</type>
       <units>#</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>heating_system_type_2</name>
-      <display_name>Heating System 2: Type</display_name>
-      <description>The type of the second heating system.</description>
-      <type>Choice</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>none</default_value>
-      <choices>
-        <choice>
-          <value>none</value>
-          <display_name>none</display_name>
-        </choice>
-        <choice>
-          <value>WallFurnace</value>
-          <display_name>WallFurnace</display_name>
-        </choice>
-        <choice>
-          <value>FloorFurnace</value>
-          <display_name>FloorFurnace</display_name>
-        </choice>
-        <choice>
-          <value>ElectricResistance</value>
-          <display_name>ElectricResistance</display_name>
-        </choice>
-        <choice>
-          <value>Stove</value>
-          <display_name>Stove</display_name>
-        </choice>
-        <choice>
-          <value>PortableHeater</value>
-          <display_name>PortableHeater</display_name>
-        </choice>
-        <choice>
-          <value>Fireplace</value>
-          <display_name>Fireplace</display_name>
-        </choice>
-      </choices>
-    </argument>
-    <argument>
-      <name>heating_system_fuel_2</name>
-      <display_name>Heating System 2: Fuel Type</display_name>
-      <description>The fuel type of the second heating system. Ignored for ElectricResistance.</description>
-      <type>Choice</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>electricity</default_value>
-      <choices>
-        <choice>
-          <value>electricity</value>
-          <display_name>electricity</display_name>
-        </choice>
-        <choice>
-          <value>natural gas</value>
-          <display_name>natural gas</display_name>
-        </choice>
-        <choice>
-          <value>fuel oil</value>
-          <display_name>fuel oil</display_name>
-        </choice>
-        <choice>
-          <value>propane</value>
-          <display_name>propane</display_name>
-        </choice>
-        <choice>
-          <value>wood</value>
-          <display_name>wood</display_name>
-        </choice>
-        <choice>
-          <value>wood pellets</value>
-          <display_name>wood pellets</display_name>
-        </choice>
-        <choice>
-          <value>coal</value>
-          <display_name>coal</display_name>
-        </choice>
-      </choices>
-    </argument>
-    <argument>
-      <name>heating_system_heating_efficiency_2</name>
-      <display_name>Heating System 2: Rated AFUE or Percent</display_name>
-      <description>For Furnace/WallFurnace/FloorFurnace/Boiler second heating system, the rated AFUE value. For ElectricResistance/Stove/PortableHeater/Fireplace, the rated Percent value.</description>
-      <type>Double</type>
-      <units>Frac</units>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
-    </argument>
-    <argument>
-      <name>heating_system_heating_capacity_2</name>
-      <display_name>Heating System 2: Heating Capacity</display_name>
-      <description>The output heating capacity of the second heating system. If using 'auto', the autosizing algorithm will use ACCA Manual J/S to set the capacity to meet its load served.</description>
-      <type>String</type>
-      <units>Btu/hr</units>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-    </argument>
-    <argument>
-      <name>heating_system_fraction_heat_load_served_2</name>
-      <display_name>Heating System 2: Fraction Heat Load Served</display_name>
-      <description>The heat load served fraction of the second heating system.</description>
-      <type>Double</type>
-      <units>Frac</units>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>0.25</default_value>
-    </argument>
-    <argument>
-      <name>heating_system_electric_auxiliary_energy_2</name>
-      <display_name>Heating System 2: Electric Auxiliary Energy</display_name>
-      <description>The electric auxiliary energy of the second heating system.</description>
-      <type>Double</type>
-      <units>kWh/yr</units>
-      <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>
-      <description>Whether the second heating system has a flue or chimney.</description>
-      <type>Boolean</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>
-    </argument>
     <argument>
       <name>mech_vent_fan_type</name>
       <display_name>Mechanical Ventilation: Fan Type</display_name>
@@ -2659,13 +2585,13 @@
       <display_name>Mechanical Ventilation: Hours In Operation</display_name>
       <description>The hours in operation of the mechanical ventilation.</description>
       <type>Double</type>
-      <units>hrs</units>
+      <units>hrs/day</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>24</default_value>
     </argument>
     <argument>
-      <name>mech_vent_total_recovery_efficiency_type</name>
+      <name>mech_vent_recovery_efficiency_type</name>
       <display_name>Mechanical Ventilation: Total Recovery Efficiency Type</display_name>
       <description>The total recovery efficiency type of the mechanical ventilation.</description>
       <type>Choice</type>
@@ -2686,36 +2612,17 @@
     <argument>
       <name>mech_vent_total_recovery_efficiency</name>
       <display_name>Mechanical Ventilation: Total Recovery Efficiency</display_name>
-      <description>The Unadjusted or Adjusted total recovery efficiency of the mechanical ventilation.</description>
+      <description>The Unadjusted or Adjusted total recovery efficiency of the mechanical ventilation. Applies to energy recovery ventilator.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>0.48</default_value>
     </argument>
-    <argument>
-      <name>mech_vent_sensible_recovery_efficiency_type</name>
-      <display_name>Mechanical Ventilation: Sensible Recovery Efficiency Type</display_name>
-      <description>The sensible recovery efficiency type of the mechanical ventilation.</description>
-      <type>Choice</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>Unadjusted</default_value>
-      <choices>
-        <choice>
-          <value>Unadjusted</value>
-          <display_name>Unadjusted</display_name>
-        </choice>
-        <choice>
-          <value>Adjusted</value>
-          <display_name>Adjusted</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>mech_vent_sensible_recovery_efficiency</name>
       <display_name>Mechanical Ventilation: Sensible Recovery Efficiency</display_name>
-      <description>The Unadjusted or Adjusted sensible recovery efficiency of the mechanical ventilation.</description>
+      <description>The Unadjusted or Adjusted sensible recovery efficiency of the mechanical ventilation. Applies to energy recovery ventilator and heat recovery ventilator.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>true</required>
@@ -2754,7 +2661,7 @@
     <argument>
       <name>shared_mech_vent_preheating_fuel</name>
       <display_name>Shared Mechanical Ventilation: Preheating Fuel</display_name>
-      <description>Fuel type of the preconditioning heating equipment.</description>
+      <description>Fuel type of the preconditioning heating equipment. Only used for a shared mechanical ventilation system.</description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -2792,7 +2699,7 @@
     <argument>
       <name>shared_mech_vent_preheating_efficiency</name>
       <display_name>Shared Mechanical Ventilation: Preheating Efficiency</display_name>
-      <description>Efficiency of the preconditioning heating equipment.</description>
+      <description>Efficiency of the preconditioning heating equipment. Only used for a shared mechanical ventilation system.</description>
       <type>Double</type>
       <units>COP</units>
       <required>false</required>
@@ -2810,7 +2717,7 @@
     <argument>
       <name>shared_mech_vent_precooling_fuel</name>
       <display_name>Shared Mechanical Ventilation: Precooling Fuel</display_name>
-      <description>Fuel type of the preconditioning cooling equipment.</description>
+      <description>Fuel type of the preconditioning cooling equipment. Only used for a shared mechanical ventilation system.</description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -2824,7 +2731,7 @@
     <argument>
       <name>shared_mech_vent_precooling_efficiency</name>
       <display_name>Shared Mechanical Ventilation: Precooling Efficiency</display_name>
-      <description>Efficiency of the preconditioning cooling equipment.</description>
+      <description>Efficiency of the preconditioning cooling equipment. Only used for a shared mechanical ventilation system.</description>
       <type>Double</type>
       <units>COP</units>
       <required>false</required>
@@ -2872,10 +2779,6 @@
           <value>balanced</value>
           <display_name>balanced</display_name>
         </choice>
-        <choice>
-          <value>central fan integrated supply</value>
-          <display_name>central fan integrated supply</display_name>
-        </choice>
       </choices>
     </argument>
     <argument>
@@ -2893,13 +2796,13 @@
       <display_name>Mechanical Ventilation 2: Hours In Operation</display_name>
       <description>The hours in operation of the second mechanical ventilation.</description>
       <type>Double</type>
-      <units>hrs</units>
+      <units>hrs/day</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>24</default_value>
     </argument>
     <argument>
-      <name>mech_vent_total_recovery_efficiency_type_2</name>
+      <name>mech_vent_recovery_efficiency_type_2</name>
       <display_name>Mechanical Ventilation 2: Total Recovery Efficiency Type</display_name>
       <description>The total recovery efficiency type of the second mechanical ventilation.</description>
       <type>Choice</type>
@@ -2920,36 +2823,17 @@
     <argument>
       <name>mech_vent_total_recovery_efficiency_2</name>
       <display_name>Mechanical Ventilation 2: Total Recovery Efficiency</display_name>
-      <description>The Unadjusted or Adjusted total recovery efficiency of the second mechanical ventilation.</description>
+      <description>The Unadjusted or Adjusted total recovery efficiency of the second mechanical ventilation. Applies to energy recovery ventilator.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>0.48</default_value>
     </argument>
-    <argument>
-      <name>mech_vent_sensible_recovery_efficiency_type_2</name>
-      <display_name>Mechanical Ventilation 2: Sensible Recovery Efficiency Type</display_name>
-      <description>The sensible recovery efficiency type of the second mechanical ventilation.</description>
-      <type>Choice</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>Unadjusted</default_value>
-      <choices>
-        <choice>
-          <value>Unadjusted</value>
-          <display_name>Unadjusted</display_name>
-        </choice>
-        <choice>
-          <value>Adjusted</value>
-          <display_name>Adjusted</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>mech_vent_sensible_recovery_efficiency_2</name>
       <display_name>Mechanical Ventilation 2: Sensible Recovery Efficiency</display_name>
-      <description>The Unadjusted or Adjusted sensible recovery efficiency of the second mechanical ventilation.</description>
+      <description>The Unadjusted or Adjusted sensible recovery efficiency of the second mechanical ventilation. Applies to energy recovery ventilator and heat recovery ventilator.</description>
       <type>Double</type>
       <units>Frac</units>
       <required>true</required>
@@ -2966,133 +2850,105 @@
       <model_dependent>false</model_dependent>
       <default_value>30</default_value>
     </argument>
-    <argument>
-      <name>kitchen_fans_present</name>
-      <display_name>Kitchen Fans: Present</display_name>
-      <description>Whether there are kitchen fans.</description>
-      <type>Boolean</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>
-    </argument>
     <argument>
       <name>kitchen_fans_quantity</name>
       <display_name>Kitchen Fans: Quantity</display_name>
       <description>The quantity of the kitchen fans.</description>
-      <type>Integer</type>
+      <type>String</type>
       <units>#</units>
-      <required>false</required>
+      <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>kitchen_fans_flow_rate</name>
       <display_name>Kitchen Fans: Flow Rate</display_name>
       <description>The flow rate of the kitchen fan.</description>
-      <type>Double</type>
+      <type>String</type>
       <units>CFM</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>kitchen_fans_hours_in_operation</name>
       <display_name>Kitchen Fans: Hours In Operation</display_name>
       <description>The hours in operation of the kitchen fan.</description>
-      <type>Double</type>
-      <units>hrs</units>
+      <type>String</type>
+      <units>hrs/day</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>kitchen_fans_power</name>
       <display_name>Kitchen Fans: Fan Power</display_name>
       <description>The fan power of the kitchen fan.</description>
-      <type>Double</type>
+      <type>String</type>
       <units>W</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>kitchen_fans_start_hour</name>
       <display_name>Kitchen Fans: Start Hour</display_name>
       <description>The start hour of the kitchen fan.</description>
-      <type>Integer</type>
+      <type>String</type>
       <units>hr</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
-    </argument>
-    <argument>
-      <name>bathroom_fans_present</name>
-      <display_name>Bathroom Fans: Present</display_name>
-      <description>Whether there are bathroom fans.</description>
-      <type>Boolean</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>bathroom_fans_quantity</name>
       <display_name>Bathroom Fans: Quantity</display_name>
       <description>The quantity of the bathroom fans.</description>
-      <type>Integer</type>
+      <type>String</type>
       <units>#</units>
-      <required>false</required>
+      <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>bathroom_fans_flow_rate</name>
       <display_name>Bathroom Fans: Flow Rate</display_name>
       <description>The flow rate of the bathroom fans.</description>
-      <type>Double</type>
+      <type>String</type>
       <units>CFM</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>bathroom_fans_hours_in_operation</name>
       <display_name>Bathroom Fans: Hours In Operation</display_name>
       <description>The hours in operation of the bathroom fans.</description>
-      <type>Double</type>
-      <units>hrs</units>
+      <type>String</type>
+      <units>hrs/day</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>bathroom_fans_power</name>
       <display_name>Bathroom Fans: Fan Power</display_name>
       <description>The fan power of the bathroom fans.</description>
-      <type>Double</type>
+      <type>String</type>
       <units>W</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>bathroom_fans_start_hour</name>
       <display_name>Bathroom Fans: Start Hour</display_name>
       <description>The start hour of the bathroom fans.</description>
-      <type>Integer</type>
+      <type>String</type>
       <units>hr</units>
       <required>false</required>
       <model_dependent>false</model_dependent>
+      <default_value>auto</default_value>
     </argument>
     <argument>
       <name>whole_house_fan_present</name>
@@ -3273,23 +3129,13 @@
     <argument>
       <name>water_heater_tank_volume</name>
       <display_name>Water Heater: Tank Volume</display_name>
-      <description>Nominal volume of water heater tank. Set to auto to have volume autosized. Only applies to storage water heater, heat pump water heater, and space-heating boiler with storage tank.</description>
+      <description>Nominal volume of water heater tank. Set to 'auto' to have volume autosized. Only applies to storage water heater, heat pump water heater, and space-heating boiler with storage tank.</description>
       <type>String</type>
       <units>gal</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>water_heater_heating_capacity</name>
-      <display_name>Water Heater: Input Capacity</display_name>
-      <description>The maximum energy input rating of water heater. Set to auto to have this field autosized. Only applies to storage water heater.</description>
-      <type>String</type>
-      <units>Btu/hr</units>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-    </argument>
     <argument>
       <name>water_heater_efficiency_type</name>
       <display_name>Water Heater: Efficiency Type</display_name>
@@ -3366,25 +3212,6 @@
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>water_heater_has_flue_or_chimney</name>
-      <display_name>Water Heater: Has Flue or Chimney</display_name>
-      <description>Whether the water heater has a flue or chimney.</description>
-      <type>Boolean</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>
-    </argument>
     <argument>
       <name>water_heater_num_units_served</name>
       <display_name>Water Heater: Number of Units Served</display_name>
@@ -4196,25 +4023,6 @@
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>dehumidifier_present</name>
-      <display_name>Dehumidifier: Present</display_name>
-      <description>Whether there is a dehumidifier.</description>
-      <type>Boolean</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>
-    </argument>
     <argument>
       <name>dehumidifier_type</name>
       <display_name>Dehumidifier: Type</display_name>
@@ -4222,8 +4030,12 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>portable</default_value>
+      <default_value>none</default_value>
       <choices>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
         <choice>
           <value>portable</value>
           <display_name>portable</display_name>
@@ -4241,7 +4053,7 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>EnergyFactor</default_value>
+      <default_value>IntegratedEnergyFactor</default_value>
       <choices>
         <choice>
           <value>EnergyFactor</value>
@@ -4254,19 +4066,9 @@
       </choices>
     </argument>
     <argument>
-      <name>dehumidifier_efficiency_ef</name>
-      <display_name>Dehumidifier: Energy Factor</display_name>
-      <description>The Energy Factor (EF) of the dehumidifier.</description>
-      <type>Double</type>
-      <units>liters/kWh</units>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>1.8</default_value>
-    </argument>
-    <argument>
-      <name>dehumidifier_efficiency_ief</name>
-      <display_name>Dehumidifier: Integrated Energy Factor</display_name>
-      <description>The Integrated Energy Factor (IEF) of the dehumidifier.</description>
+      <name>dehumidifier_efficiency</name>
+      <display_name>Dehumidifier: Efficiency</display_name>
+      <description>The efficiency of the dehumidifier.</description>
       <type>Double</type>
       <units>liters/kWh</units>
       <required>true</required>
@@ -4303,25 +4105,6 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
-    <argument>
-      <name>clothes_washer_present</name>
-      <display_name>Clothes Washer: Present</display_name>
-      <description>Whether there is a clothes washer.</description>
-      <type>Boolean</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>true</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>clothes_washer_location</name>
       <display_name>Clothes Washer: Location</display_name>
@@ -4335,6 +4118,10 @@
           <value>auto</value>
           <display_name>auto</display_name>
         </choice>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
         <choice>
           <value>living space</value>
           <display_name>living space</display_name>
@@ -4372,7 +4159,7 @@
     <argument>
       <name>clothes_washer_efficiency_type</name>
       <display_name>Clothes Washer: Efficiency Type</display_name>
-      <description>The efficiency type of clothes washer.</description>
+      <description>The efficiency type of the clothes washer.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -4389,19 +4176,9 @@
       </choices>
     </argument>
     <argument>
-      <name>clothes_washer_efficiency_mef</name>
-      <display_name>Clothes Washer: Modified Energy Factor</display_name>
-      <description>The Modified Energy Factor (MEF) is the capacity of the clothes container divided by the total clothes washer energy consumption per cycle, where the energy consumption is the sum of the machine electrical energy consumption, the hot water energy consumption, the energy required for removal of the remaining moisture in the wash load, standby energy, and off-mode energy consumption.</description>
-      <type>String</type>
-      <units>ft^3/kWh-cycle</units>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>auto</default_value>
-    </argument>
-    <argument>
-      <name>clothes_washer_efficiency_imef</name>
-      <display_name>Clothes Washer: Integrated Modified Energy Factor</display_name>
-      <description>The energy performance metric for ENERGY STAR certified residential clothes washers as of March 7, 2015.</description>
+      <name>clothes_washer_efficiency</name>
+      <display_name>Clothes Washer: Efficiency</display_name>
+      <description>The efficiency of the clothes washer.</description>
       <type>String</type>
       <units>ft^3/kWh-cyc</units>
       <required>true</required>
@@ -4477,25 +4254,6 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
-    <argument>
-      <name>clothes_dryer_present</name>
-      <display_name>Clothes Dryer: Present</display_name>
-      <description>Whether there is a clothes dryer.</description>
-      <type>Boolean</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>true</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>clothes_dryer_location</name>
       <display_name>Clothes Dryer: Location</display_name>
@@ -4509,6 +4267,10 @@
           <value>auto</value>
           <display_name>auto</display_name>
         </choice>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
         <choice>
           <value>living space</value>
           <display_name>living space</display_name>
@@ -4581,7 +4343,7 @@
     <argument>
       <name>clothes_dryer_efficiency_type</name>
       <display_name>Clothes Dryer: Efficiency Type</display_name>
-      <description>The efficiency type of clothes dryer.</description>
+      <description>The efficiency type of the clothes dryer.</description>
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -4598,48 +4360,15 @@
       </choices>
     </argument>
     <argument>
-      <name>clothes_dryer_efficiency_ef</name>
-      <display_name>Clothes Dryer: Energy Factor</display_name>
-      <description>The energy performance metric for ENERGY STAR certified residential clothes dryers prior to September 13, 2013. The new metric is Combined Energy Factor.</description>
-      <type>Double</type>
-      <units>lb/kWh</units>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>3.4615</default_value>
-    </argument>
-    <argument>
-      <name>clothes_dryer_efficiency_cef</name>
-      <display_name>Clothes Dryer: Combined Energy Factor</display_name>
-      <description>The Combined Energy Factor (CEF) measures the pounds of clothing that can be dried per kWh (Fuel equivalent) of electricity, including energy consumed during Stand-by and Off modes.</description>
+      <name>clothes_dryer_efficiency</name>
+      <display_name>Clothes Dryer: Efficiency</display_name>
+      <description>The efficiency of the clothes dryer.</description>
       <type>String</type>
       <units>lb/kWh</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>clothes_dryer_control_type</name>
-      <display_name>Clothes Dryer: Control Type</display_name>
-      <description>Type of control used by the clothes dryer.</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>timer</value>
-          <display_name>timer</display_name>
-        </choice>
-        <choice>
-          <value>moisture</value>
-          <display_name>moisture</display_name>
-        </choice>
-      </choices>
-    </argument>
     <argument>
       <name>clothes_dryer_vented_flow_rate</name>
       <display_name>Clothes Dryer: Vented Flow Rate</display_name>
@@ -4659,25 +4388,6 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
-    <argument>
-      <name>dishwasher_present</name>
-      <display_name>Dishwasher: Present</display_name>
-      <description>Whether there is a dishwasher.</description>
-      <type>Boolean</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>true</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>dishwasher_location</name>
       <display_name>Dishwasher: Location</display_name>
@@ -4691,6 +4401,10 @@
           <value>auto</value>
           <display_name>auto</display_name>
         </choice>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
         <choice>
           <value>living space</value>
           <display_name>living space</display_name>
@@ -4745,24 +4459,15 @@
       </choices>
     </argument>
     <argument>
-      <name>dishwasher_efficiency_kwh</name>
-      <display_name>Dishwasher: Rated Annual kWh</display_name>
-      <description>The rated annual kWh of the dishwasher.</description>
+      <name>dishwasher_efficiency</name>
+      <display_name>Dishwasher: Efficiency</display_name>
+      <description>The efficiency of the dishwasher.</description>
       <type>String</type>
-      <units>kWh/yr</units>
+      <units>RatedAnnualkWh or EnergyFactor</units>
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>auto</default_value>
     </argument>
-    <argument>
-      <name>dishwasher_efficiency_ef</name>
-      <display_name>Dishwasher: Energy Factor</display_name>
-      <description>The energy factor of the dishwasher.</description>
-      <type>Double</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>0.46</default_value>
-    </argument>
     <argument>
       <name>dishwasher_label_electric_rate</name>
       <display_name>Dishwasher: Label Electric Rate</display_name>
@@ -4822,25 +4527,6 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
-    <argument>
-      <name>refrigerator_present</name>
-      <display_name>Refrigerator: Present</display_name>
-      <description>Whether there is a refrigerator.</description>
-      <type>Boolean</type>
-      <required>true</required>
-      <model_dependent>false</model_dependent>
-      <default_value>true</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>refrigerator_location</name>
       <display_name>Refrigerator: Location</display_name>
@@ -4854,6 +4540,10 @@
           <value>auto</value>
           <display_name>auto</display_name>
         </choice>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
         <choice>
           <value>living space</value>
           <display_name>living space</display_name>
@@ -4907,25 +4597,6 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
-    <argument>
-      <name>extra_refrigerator_present</name>
-      <display_name>Extra Refrigerator: Present</display_name>
-      <description>Whether there is an extra refrigerator.</description>
-      <type>Boolean</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>
-    </argument>
     <argument>
       <name>extra_refrigerator_location</name>
       <display_name>Extra Refrigerator: Location</display_name>
@@ -4939,6 +4610,10 @@
           <value>auto</value>
           <display_name>auto</display_name>
         </choice>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
         <choice>
           <value>living space</value>
           <display_name>living space</display_name>
@@ -4992,25 +4667,6 @@
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
     </argument>
-    <argument>
-      <name>freezer_present</name>
-      <display_name>Freezer: Present</display_name>
-      <description>Whether there is a freezer.</description>
-      <type>Boolean</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>
-    </argument>
     <argument>
       <name>freezer_location</name>
       <display_name>Freezer: Location</display_name>
@@ -5024,6 +4680,10 @@
           <value>auto</value>
           <display_name>auto</display_name>
         </choice>
+        <choice>
+          <value>none</value>
+          <display_name>none</display_name>
+        </choice>
         <choice>
           <value>living space</value>
           <display_name>living space</display_name>
@@ -5078,36 +4738,21 @@
       <default_value>1</default_value>
     </argument>
     <argument>
-      <name>cooking_range_oven_present</name>
-      <display_name>Cooking Range/Oven: Present</display_name>
-      <description>Whether there is a cooking range/oven.</description>
-      <type>Boolean</type>
+      <name>cooking_range_oven_location</name>
+      <display_name>Cooking Range/Oven: Location</display_name>
+      <description>The space type for the cooking range/oven location.</description>
+      <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>true</default_value>
+      <default_value>auto</default_value>
       <choices>
         <choice>
-          <value>true</value>
-          <display_name>true</display_name>
+          <value>auto</value>
+          <display_name>auto</display_name>
         </choice>
         <choice>
-          <value>false</value>
-          <display_name>false</display_name>
-        </choice>
-      </choices>
-    </argument>
-    <argument>
-      <name>cooking_range_oven_location</name>
-      <display_name>Cooking Range/Oven: Location</display_name>
-      <description>The space type for the cooking range/oven location.</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>
+          <value>none</value>
+          <display_name>none</display_name>
         </choice>
         <choice>
           <value>living space</value>
@@ -5291,15 +4936,6 @@
       <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>
@@ -5339,15 +4975,6 @@
       <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>
@@ -5384,16 +5011,7 @@
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <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>
+      <default_value>1</default_value>
     </argument>
     <argument>
       <name>plug_loads_vehicle_present</name>
@@ -5431,16 +5049,7 @@
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <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>
+      <default_value>1</default_value>
     </argument>
     <argument>
       <name>fuel_loads_grill_present</name>
@@ -5871,18 +5480,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>location.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>2951BCAF</checksum>
-    </file>
-    <file>
-      <filename>constants.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>EB32709E</checksum>
-    </file>
     <file>
       <filename>schedules_clothes_dryer_power_consumption_dist.csv</filename>
       <filetype>csv</filetype>
@@ -6646,1143 +6243,1881 @@
       <checksum>F0F0F886</checksum>
     </file>
     <file>
-      <filename>schedules_config.yml</filename>
-      <filetype>yml</filetype>
+      <filename>constants.rb</filename>
+      <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>64DD9D54</checksum>
+      <checksum>24396BA2</checksum>
     </file>
     <file>
-      <filename>schedules.rb</filename>
+      <filename>schedules_weekday_state_and_monthly_schedule_shift.csv</filename>
+      <filetype>csv</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>FFDA057E</checksum>
+    </file>
+    <file>
+      <filename>schedules_weekend_state_and_monthly_schedule_shift.csv</filename>
+      <filetype>csv</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>5FC694CF</checksum>
+    </file>
+    <file>
+      <filename>geometry.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>9ED612C8</checksum>
+      <checksum>93F6AE8D</checksum>
     </file>
     <file>
-      <filename>test_rakefile.xml</filename>
-      <filetype>xml</filetype>
+      <filename>build_residential_hpxml_test.rb</filename>
+      <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>4D13CDAD</checksum>
+      <checksum>5DF19335</checksum>
     </file>
     <file>
-      <filename>test_measure.xml</filename>
-      <filetype>xml</filetype>
+      <filename>base-hvac-air-to-air-heat-pump-1-speed-heating-only.osw</filename>
+      <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5935D082</checksum>
+      <checksum>6A059010</checksum>
     </file>
     <file>
-      <filename>geometry.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>D8BA3AF2</checksum>
+      <filename>extra-second-heating-system-portable-heater-to-heat-pump.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>962A9AA0</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-air-to-air-heat-pump-1-speed-cooling-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>01C475F5</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-air-to-air-heat-pump-1-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>C5242994</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-install-quality-all-air-to-air-heat-pump-1-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7B63E1D8</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-air-to-air-heat-pump-2-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B9AEC9E3</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F09B80C3</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-install-quality-all-air-to-air-heat-pump-2-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>4BB27A93</checksum>
+    </file>
+    <file>
+      <filename>base-misc-defaults.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>768EF140</checksum>
+    </file>
+    <file>
+      <filename>base-atticroof-unvented-insulated-roof.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8D4EABD3</checksum>
+    </file>
+    <file>
+      <filename>base-atticroof-flat.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>29F930D1</checksum>
+    </file>
+    <file>
+      <filename>base-foundation-ambient.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>220A0BC6</checksum>
+    </file>
+    <file>
+      <filename>base.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B1821F3C</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-none.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6B32281A</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-cfis.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>2712816D</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-jacket-electric.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>37838833</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-low-flow-fixtures.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>69F6C461</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-recirc-demand.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9355EAC9</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-recirc-manual.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>ACA9EA0F</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-recirc-nocontrol.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>2415BA21</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-recirc-temperature.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>0847593E</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-recirc-timer.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>70DACA7F</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-solar-fraction.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F2532057</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-infil-cfm50.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6B08E2E3</checksum>
+    </file>
+    <file>
+      <filename>base-foundation-conditioned-basement-slab-insulation.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7FFD2C13</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-boiler-oil-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>742B2665</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-boiler-propane-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>318164DE</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-boiler-wood-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>67421CCF</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-ducts-leakage-percent.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>3D8B53F5</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-elec-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9757816E</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-oil-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>FA6D92E3</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-propane-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E6816323</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-wood-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>A0B95E88</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-none.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>CCDE3E8B</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-setpoints.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EC616481</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-balanced.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>73507DC8</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-erv.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>99021F85</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-exhaust.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B712624E</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-hrv.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>92416B37</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-supply.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>3F4FE6E0</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-erv-atre-asre.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>AC70B4BE</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-windows-none.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>106F9F3C</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-hrv-asre.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>DAD901AA</checksum>
+    </file>
+    <file>
+      <filename>base-atticroof-vented.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EF6FA449</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-dwhr.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>AF261A5B</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-beds-4.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BD2276F9</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-central-ac-only-2-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8FB871A8</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-air-to-air-heat-pump-var-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B2E3F6FF</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-gas-central-ac-2-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>4A166BDC</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-central-ac-only-var-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BCBC5840</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-evap-cooler-furnace-gas.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1A96FA05</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-gas-central-ac-var-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>0C2099DB</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-gas-room-ac.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B49AC650</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-room-ac-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B6E48FBE</checksum>
+    </file>
+    <file>
+      <filename>extra-dhw-solar-latitude.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9EA0DC0A</checksum>
+    </file>
+    <file>
+      <filename>extra-pv-roofpitch.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>84979EFA</checksum>
+    </file>
+    <file>
+      <filename>extra-auto.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9161A564</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-boiler-elec-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>C536975F</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-bath-kitchen-fans.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>CDBBFD5E</checksum>
+    </file>
+    <file>
+      <filename>base-misc-neighbor-shading.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>70D57B3E</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-heat-pump-outside.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F4AB1467</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-heat-pump-with-solar-fraction.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>3DFD018D</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-heat-pump.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>674A7BF0</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-jacket-hpwh.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>CD10CB4F</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-jacket-gas.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7E517491</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-solar-direct-evacuated-tube.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>346C2526</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-solar-direct-flat-plate.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B4D5AB64</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-solar-direct-ics.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>113E88D0</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-solar-indirect-flat-plate.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E4C72180</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-solar-thermosyphon-flat-plate.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>DC469A77</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-heat-pump-with-solar.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>DACC2B0A</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-gas-outside.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8358A2FA</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-gas.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8E3118E9</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-oil.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7D16586E</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-wood.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>65AC64A0</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-gas-with-solar.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E1BA88AC</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-electric.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B1F487B5</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-gas-with-solar-fraction.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BCA102D2</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-propane.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7A7C2DFC</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-gas.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>ACDDD90A</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-furnace-elec-central-ac-1-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7AAE1945</checksum>
+    </file>
+    <file>
+      <filename>extra-second-refrigerator.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>C5C33B08</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-garage.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>3C7F7CAF</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-coal.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1C9D8D69</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-boiler-coal-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>5D19F95C</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-elec-resistance-only.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E2DD27CB</checksum>
+    </file>
+    <file>
+      <filename>base-simcontrol-timestep-10-mins.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EF81241F</checksum>
+    </file>
+    <file>
+      <filename>base-simcontrol-daylight-saving-custom.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BB372548</checksum>
+    </file>
+    <file>
+      <filename>base-simcontrol-daylight-saving-disabled.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>2C18301F</checksum>
+    </file>
+    <file>
+      <filename>base-lighting-detailed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6B10CF2F</checksum>
+    </file>
+    <file>
+      <filename>base-mechvent-whole-house-fan.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9B60D48C</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-none.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>84C96067</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-infil-ach-house-pressure.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E639F33A</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-infil-cfm-house-pressure.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>97D298EC</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-electric-outside.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>238C630E</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-beds-5.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>5EB4459F</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-beds-1.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>36D2BD9A</checksum>
+    </file>
+    <file>
+      <filename>base-enclosure-beds-2.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>CCF007C8</checksum>
+    </file>
+    <file>
+      <filename>base-simcontrol-runperiod-1-month.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>577E6B49</checksum>
+    </file>
+    <file>
+      <filename>extra-enclosure-garage-partially-protruded.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>18F3F86B</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>2C9D9C52</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-coal.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>23841CE7</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-gas.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F8F72C0C</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-modified.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>34E072FC</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-oil.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>2512659E</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-propane.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B6EB70CB</checksum>
+    </file>
+    <file>
+      <filename>base-appliances-wood.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8842F0EC</checksum>
+    </file>
+    <file>
+      <filename>base-simcontrol-calendar-year-custom.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>237D4458</checksum>
+    </file>
+    <file>
+      <filename>base-location-AMY-2012.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>85160499</checksum>
+    </file>
+    <file>
+      <filename>base-schedules-stochastic.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>550DD00A</checksum>
+    </file>
+    <file>
+      <filename>base-schedules-user-specified.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>873FFA0C</checksum>
+    </file>
+    <file>
+      <filename>base-lighting-ceiling-fans.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>565AB3DC</checksum>
+    </file>
+    <file>
+      <filename>extra-schedules-random-seed.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6C4C8990</checksum>
+    </file>
+    <file>
+      <filename>base-misc-usage-multiplier.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>5CE0F0B4</checksum>
+    </file>
+    <file>
+      <filename>base-pv.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>0BC2F4A2</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-elec-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>28C8F827</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-gas-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>1BE4C190</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tank-heat-pump-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F1863A68</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-electric-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7849FDFF</checksum>
+    </file>
+    <file>
+      <filename>base-dhw-tankless-gas-uef.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>0AEDDBDB</checksum>
+    </file>
+    <file>
+      <filename>base-misc-loads-large-uncommon.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>72FED530</checksum>
+    </file>
+    <file>
+      <filename>base-misc-loads-large-uncommon2.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>763BEE6C</checksum>
     </file>
     <file>
       <filename>base-dhw-indirect-outside.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1E89A5A9</checksum>
+      <checksum>42C4A394</checksum>
     </file>
     <file>
       <filename>base-hvac-boiler-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>62888CD2</checksum>
+      <checksum>B2776364</checksum>
     </file>
     <file>
       <filename>base-dhw-indirect-standbyloss.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CE3941C6</checksum>
+      <checksum>2DA476D0</checksum>
     </file>
     <file>
       <filename>base-dhw-indirect.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9E6596C8</checksum>
+      <checksum>3655E6C3</checksum>
     </file>
     <file>
       <filename>base-dhw-jacket-indirect.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E260FE10</checksum>
+      <checksum>F8BF9585</checksum>
     </file>
     <file>
       <filename>base-hvac-wall-furnace-elec-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>012F12BD</checksum>
+      <checksum>485AF6EC</checksum>
     </file>
     <file>
       <filename>base-dhw-indirect-with-solar-fraction.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DBF9672B</checksum>
+      <checksum>B2D1000A</checksum>
     </file>
     <file>
       <filename>base-dhw-combi-tankless-outside.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9299285B</checksum>
+      <checksum>701FC8B9</checksum>
     </file>
     <file>
       <filename>base-dhw-combi-tankless.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E7FE15A0</checksum>
+      <checksum>ECEDA256</checksum>
     </file>
     <file>
-      <filename>base-hvac-floor-furnace-propane-only.osw</filename>
+      <filename>base-hvac-fireplace-wood-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6DBF6443</checksum>
+      <checksum>D41169E3</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-gas-central-ac-1-speed.osw</filename>
+      <filename>base-hvac-furnace-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>429E7B93</checksum>
+      <checksum>0BAC113D</checksum>
     </file>
     <file>
-      <filename>base-hvac-fireplace-wood-only.osw</filename>
+      <filename>base-hvac-evap-cooler-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>78AF74BA</checksum>
+      <checksum>38015BEE</checksum>
     </file>
     <file>
-      <filename>base-hvac-fixed-heater-gas-only.osw</filename>
+      <filename>base-hvac-mini-split-air-conditioner-only-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1C3264B9</checksum>
+      <checksum>B1188130</checksum>
     </file>
     <file>
-      <filename>base-hvac-portable-heater-gas-only.osw</filename>
+      <filename>base-hvac-mini-split-air-conditioner-only-ductless.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0E161630</checksum>
+      <checksum>3C3D48B1</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-mini-split-heat-pump-ducted.osw</filename>
+      <filename>base-hvac-central-ac-only-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F0AF579D</checksum>
+      <checksum>33192DB1</checksum>
     </file>
     <file>
-      <filename>base.osw</filename>
+      <filename>base-hvac-stove-oil-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>155524E4</checksum>
+      <checksum>BFF5D3C7</checksum>
     </file>
     <file>
-      <filename>base-appliances-none.osw</filename>
+      <filename>base-hvac-stove-wood-pellets-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DD39CD4B</checksum>
+      <checksum>F03D88AA</checksum>
     </file>
     <file>
-      <filename>base-mechvent-cfis.osw</filename>
+      <filename>base-hvac-floor-furnace-propane-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A3DC2DA0</checksum>
+      <checksum>37F04F1B</checksum>
     </file>
     <file>
-      <filename>base-dhw-jacket-electric.osw</filename>
+      <filename>base-hvac-mini-split-heat-pump-ducted-cooling-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>517D3FA7</checksum>
+      <checksum>1C35AB4E</checksum>
     </file>
     <file>
-      <filename>base-dhw-low-flow-fixtures.osw</filename>
+      <filename>base-enclosure-infil-flue.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6408603D</checksum>
+      <checksum>72D43875</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-demand.osw</filename>
+      <filename>extra-enclosure-windows-shading.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C97AB35B</checksum>
+      <checksum>C2F37627</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-manual.osw</filename>
+      <filename>base-enclosure-overhangs.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E6E11B85</checksum>
+      <checksum>6E7B2135</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-nocontrol.osw</filename>
+      <filename>base-hvac-install-quality-none-furnace-gas-central-ac-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DFFE00DC</checksum>
+      <checksum>E515FB04</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-temperature.osw</filename>
+      <filename>base-hvac-install-quality-airflow-defect-furnace-gas-central-ac-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A3F98C91</checksum>
+      <checksum>CD39CF46</checksum>
     </file>
     <file>
-      <filename>base-dhw-recirc-timer.osw</filename>
+      <filename>base-hvac-install-quality-charge-defect-furnace-gas-central-ac-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E19E92F5</checksum>
+      <checksum>9AB83B3E</checksum>
     </file>
     <file>
-      <filename>base-dhw-solar-fraction.osw</filename>
+      <filename>base-hvac-install-quality-all-air-to-air-heat-pump-var-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>46E0C710</checksum>
+      <checksum>4C1BBCAE</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-cfm50.osw</filename>
+      <filename>base-hvac-install-quality-all-furnace-gas-central-ac-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>097284B4</checksum>
+      <checksum>FEAD2432</checksum>
     </file>
     <file>
-      <filename>base-foundation-conditioned-basement-slab-insulation.osw</filename>
+      <filename>base-hvac-install-quality-all-furnace-gas-central-ac-2-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CABCFF4F</checksum>
+      <checksum>37BA8E53</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-oil-only.osw</filename>
+      <filename>base-hvac-install-quality-all-furnace-gas-central-ac-var-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>61FD6C00</checksum>
+      <checksum>75DB0990</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-propane-only.osw</filename>
+      <filename>base-hvac-install-quality-all-furnace-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>629B42C4</checksum>
+      <checksum>CA72F7C7</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-wood-only.osw</filename>
+      <filename>base-hvac-install-quality-all-mini-split-air-conditioner-only-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>49D1FC81</checksum>
+      <checksum>1011F3D9</checksum>
     </file>
     <file>
-      <filename>base-hvac-ducts-leakage-percent.osw</filename>
+      <filename>base-hvac-evap-cooler-only-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B2A4D026</checksum>
+      <checksum>CD8E4CDA</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-elec-only.osw</filename>
+      <filename>base-mechvent-cfis-evap-cooler-only-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>21A96F3C</checksum>
+      <checksum>14B22C66</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-gas-only.osw</filename>
+      <filename>extra-second-heating-system-portable-heater-to-heating-system.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3B19ECD9</checksum>
+      <checksum>D483E7B0</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-oil-only.osw</filename>
+      <filename>extra-second-heating-system-fireplace-to-heating-system.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1A3EEAFE</checksum>
+      <checksum>AFB9069C</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-propane-only.osw</filename>
+      <filename>base-hvac-furnace-coal-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>06D17BA2</checksum>
+      <checksum>2F86E668</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-wood-only.osw</filename>
+      <filename>base-mechvent-exhaust-rated-flow-rate.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B47E8EAA</checksum>
+      <checksum>AC958680</checksum>
     </file>
     <file>
-      <filename>base-hvac-none.osw</filename>
+      <filename>base-hvac-ground-to-air-heat-pump-cooling-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>FAEE9145</checksum>
+      <checksum>7B226689</checksum>
     </file>
     <file>
-      <filename>base-hvac-setpoints.osw</filename>
+      <filename>base-foundation-slab.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>89AC0A92</checksum>
+      <checksum>744E6229</checksum>
     </file>
     <file>
-      <filename>base-location-baltimore-md.osw</filename>
+      <filename>base-foundation-vented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3F92EE9D</checksum>
+      <checksum>24300405</checksum>
     </file>
     <file>
-      <filename>base-location-duluth-mn.osw</filename>
+      <filename>base-foundation-unvented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5192EF46</checksum>
+      <checksum>2119DCB8</checksum>
     </file>
     <file>
-      <filename>base-mechvent-balanced.osw</filename>
+      <filename>base-hvac-boiler-gas-central-ac-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BFF31E84</checksum>
+      <checksum>CA6FC143</checksum>
     </file>
     <file>
-      <filename>base-mechvent-erv.osw</filename>
+      <filename>extra-second-heating-system-boiler-to-heating-system.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>12964A12</checksum>
+      <checksum>52E61112</checksum>
     </file>
     <file>
-      <filename>base-mechvent-exhaust.osw</filename>
+      <filename>extra-enclosure-atticroof-conditioned-eaves-gable.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9AFFA4A4</checksum>
+      <checksum>03FA8D05</checksum>
     </file>
     <file>
-      <filename>base-mechvent-hrv.osw</filename>
+      <filename>extra-enclosure-atticroof-conditioned-eaves-hip.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>28F83581</checksum>
+      <checksum>58BCDEE8</checksum>
     </file>
     <file>
-      <filename>base-mechvent-supply.osw</filename>
+      <filename>extra-enclosure-garage-atticroof-conditioned.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>848FB91D</checksum>
+      <checksum>7D2B79DD</checksum>
     </file>
     <file>
-      <filename>base-mechvent-erv-atre-asre.osw</filename>
+      <filename>extra-zero-extra-refrigerator-kwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>20AB23EE</checksum>
+      <checksum>8A24483D</checksum>
     </file>
     <file>
-      <filename>base-enclosure-windows-none.osw</filename>
+      <filename>extra-zero-freezer-kwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>7153E1CF</checksum>
+      <checksum>459D645A</checksum>
     </file>
     <file>
-      <filename>base-hvac-undersized.osw</filename>
+      <filename>extra-zero-refrigerator-kwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>63FBCEA3</checksum>
+      <checksum>B5FE80E9</checksum>
     </file>
     <file>
-      <filename>base-atticroof-unvented-insulated-roof.osw</filename>
+      <filename>extra-zero-clothes-washer-kwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5B8B20A8</checksum>
+      <checksum>1E4B58EF</checksum>
     </file>
     <file>
-      <filename>base-mechvent-hrv-asre.osw</filename>
+      <filename>extra-zero-dishwasher-kwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2CBBA0AF</checksum>
+      <checksum>62ACDBF7</checksum>
     </file>
     <file>
-      <filename>base-enclosure-overhangs.osw</filename>
+      <filename>base-misc-shielding-of-home.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2A9495FF</checksum>
+      <checksum>0DBDCFA0</checksum>
     </file>
     <file>
-      <filename>base-atticroof-vented.osw</filename>
+      <filename>base-foundation-unconditioned-basement-assembly-r.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B5EC5A8A</checksum>
+      <checksum>581C7DBA</checksum>
     </file>
     <file>
-      <filename>base-dhw-dwhr.osw</filename>
+      <filename>base-foundation-unconditioned-basement.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>ED8177E7</checksum>
+      <checksum>1D2B5253</checksum>
     </file>
     <file>
-      <filename>base-enclosure-beds-4.osw</filename>
+      <filename>base-location-duluth-mn.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>ACED3C4D</checksum>
+      <checksum>6AD09EB2</checksum>
     </file>
     <file>
-      <filename>base-foundation-ambient.osw</filename>
+      <filename>base-foundation-unconditioned-basement-wall-insulation.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8B64CEE4</checksum>
+      <checksum>9278BDCA</checksum>
     </file>
     <file>
-      <filename>base-foundation-vented-crawlspace.osw</filename>
+      <filename>base-schedules-stochastic-vacant.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>50CAD2CC</checksum>
+      <checksum>A006BD32</checksum>
     </file>
     <file>
-      <filename>base-foundation-unvented-crawlspace.osw</filename>
+      <filename>extra-gas-hot-tub-heater-with-zero-kwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3813CB8A</checksum>
+      <checksum>90B8F235</checksum>
     </file>
     <file>
-      <filename>base-hvac-air-to-air-heat-pump-2-speed.osw</filename>
+      <filename>extra-gas-pool-heater-with-zero-kwh.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F5BB1A9A</checksum>
+      <checksum>CE1FE199</checksum>
     </file>
     <file>
-      <filename>base-hvac-central-ac-only-2-speed.osw</filename>
+      <filename>base-appliances-dehumidifier.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>42EAFB64</checksum>
+      <checksum>7FA3E708</checksum>
     </file>
     <file>
-      <filename>base-hvac-air-to-air-heat-pump-var-speed.osw</filename>
+      <filename>base-appliances-dehumidifier-ief-portable.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B02B6F2F</checksum>
+      <checksum>E3199D1E</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-gas-central-ac-2-speed.osw</filename>
+      <filename>base-appliances-dehumidifier-ief-whole-home.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5DBE5163</checksum>
+      <checksum>513E546B</checksum>
     </file>
     <file>
-      <filename>base-hvac-central-ac-only-var-speed.osw</filename>
+      <filename>base-atticroof-radiant-barrier.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5D5480CD</checksum>
+      <checksum>69BCA39C</checksum>
     </file>
     <file>
-      <filename>base-hvac-evap-cooler-furnace-gas.osw</filename>
+      <filename>base-location-dallas-tx.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C290A69D</checksum>
+      <checksum>4CBA9033</checksum>
     </file>
     <file>
-      <filename>base-hvac-evap-cooler-only-ducted.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-mechvent-preconditioning.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2F903986</checksum>
+      <checksum>C5FF3818</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-gas-central-ac-var-speed.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-mechvent.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5D709D01</checksum>
+      <checksum>64DE7729</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-gas-room-ac.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-pv.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0C4DDDB5</checksum>
+      <checksum>6FF23709</checksum>
     </file>
     <file>
-      <filename>base-hvac-room-ac-only.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-water-heater.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>56644CAF</checksum>
+      <checksum>327D9A2E</checksum>
     </file>
     <file>
-      <filename>base-mechvent-cfis-evap-cooler-only-ducted.osw</filename>
+      <filename>base-bldgtype-multifamily.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>49C7C8F6</checksum>
+      <checksum>C5806905</checksum>
     </file>
     <file>
-      <filename>base-atticroof-flat.osw</filename>
+      <filename>extra-bldgtype-multifamily-double-exterior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>15F4417C</checksum>
+      <checksum>625EAAE1</checksum>
     </file>
     <file>
-      <filename>extra-dhw-solar-latitude.osw</filename>
+      <filename>extra-bldgtype-multifamily-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>987C7988</checksum>
+      <checksum>6FFBDCE3</checksum>
     </file>
     <file>
-      <filename>extra-pv-roofpitch.osw</filename>
+      <filename>extra-bldgtype-multifamily-eaves.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>723366DA</checksum>
+      <checksum>33F54475</checksum>
     </file>
     <file>
-      <filename>extra-auto.osw</filename>
+      <filename>extra-bldgtype-multifamily-single-exterior-front.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E00056BD</checksum>
+      <checksum>FBC1705A</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-elec-only.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8B9DF47C</checksum>
+      <checksum>B1C587CA</checksum>
     </file>
     <file>
-      <filename>base-mechvent-bath-kitchen-fans.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-left-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>762E5163</checksum>
+      <checksum>7633B6B2</checksum>
     </file>
     <file>
-      <filename>base-misc-neighbor-shading.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-left-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>073B1191</checksum>
+      <checksum>B87B2187</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-heat-pump-outside.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-left-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6FB84D61</checksum>
+      <checksum>536ED64E</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-heat-pump-with-solar-fraction.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-left-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EA349FC1</checksum>
+      <checksum>410B29C5</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-heat-pump.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-left-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E6186F44</checksum>
+      <checksum>CB484700</checksum>
     </file>
     <file>
-      <filename>base-dhw-jacket-hpwh.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-left-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C3E8BEF8</checksum>
+      <checksum>BF52DE90</checksum>
     </file>
     <file>
-      <filename>base-dhw-jacket-gas.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-middle-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>33CB70F8</checksum>
+      <checksum>781E278D</checksum>
     </file>
     <file>
-      <filename>base-dhw-solar-direct-evacuated-tube.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-middle-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C296E83B</checksum>
+      <checksum>51A21567</checksum>
     </file>
     <file>
-      <filename>base-dhw-solar-direct-flat-plate.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-middle-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0035DE0D</checksum>
+      <checksum>1DBB4A64</checksum>
     </file>
     <file>
-      <filename>base-dhw-solar-direct-ics.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-middle-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>95B86CE5</checksum>
+      <checksum>76B5F73E</checksum>
     </file>
     <file>
-      <filename>base-dhw-solar-indirect-flat-plate.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-middle-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>61F374CE</checksum>
+      <checksum>DE9B0702</checksum>
     </file>
     <file>
-      <filename>base-dhw-solar-thermosyphon-flat-plate.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-middle-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C70E55C5</checksum>
+      <checksum>922BCA45</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-heat-pump-with-solar.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-right-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B7B7521E</checksum>
+      <checksum>09091601</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-gas-outside.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-right-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C285FBED</checksum>
+      <checksum>09BCFE4B</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-gas.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-right-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>39BAFF80</checksum>
+      <checksum>DC8C3B87</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-oil.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-right-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BC80CA32</checksum>
+      <checksum>36DA4DDE</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-wood.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-right-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E2CD5211</checksum>
+      <checksum>E80E877F</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-gas-with-solar.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab-right-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0E5344B1</checksum>
+      <checksum>A6CDC850</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-electric.osw</filename>
+      <filename>extra-bldgtype-multifamily-slab.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E132BC0E</checksum>
+      <checksum>C83E961A</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-gas-with-solar-fraction.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A98CD2D3</checksum>
+      <checksum>91E4C3A3</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-propane.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-left-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2FCD6B89</checksum>
+      <checksum>ECF1A3BE</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-gas.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-left-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C82641E0</checksum>
+      <checksum>4BAA629B</checksum>
     </file>
     <file>
-      <filename>base-hvac-room-ac-only-33percent.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-left-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8768C9F0</checksum>
+      <checksum>A26A00F7</checksum>
     </file>
     <file>
-      <filename>base-hvac-furnace-elec-central-ac-1-speed.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-left-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>137F9ECB</checksum>
+      <checksum>4F7409F2</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-natural-ach.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-left-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>63DF9CBF</checksum>
+      <checksum>20ABE775</checksum>
     </file>
     <file>
-      <filename>base-foundation-unconditioned-basement.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-left-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4828D346</checksum>
+      <checksum>B230D200</checksum>
     </file>
     <file>
-      <filename>base-enclosure-2stories-garage.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-middle-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D0A827BE</checksum>
+      <checksum>92CE319E</checksum>
     </file>
     <file>
-      <filename>base-enclosure-2stories.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-middle-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>20C4C9FE</checksum>
+      <checksum>A51C9D99</checksum>
     </file>
     <file>
-      <filename>base-foundation-slab.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-middle-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D6B28BA1</checksum>
+      <checksum>6CB4FE46</checksum>
     </file>
     <file>
-      <filename>extra-second-refrigerator.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-middle-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>7935F54F</checksum>
+      <checksum>20C04FE5</checksum>
     </file>
     <file>
-      <filename>base-enclosure-garage.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-middle-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>44D180C7</checksum>
+      <checksum>8087C30B</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-coal.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-middle-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6EE31FE3</checksum>
+      <checksum>F486A7DC</checksum>
     </file>
     <file>
-      <filename>base-hvac-boiler-coal-only.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-right-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>58216DA4</checksum>
+      <checksum>B1548136</checksum>
     </file>
     <file>
-      <filename>base-hvac-elec-resistance-only.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-right-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E4C2DDAB</checksum>
+      <checksum>EFA7863F</checksum>
     </file>
     <file>
-      <filename>base-simcontrol-timestep-10-mins.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-right-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2C23A8D2</checksum>
+      <checksum>DFB12D70</checksum>
     </file>
     <file>
-      <filename>base-simcontrol-daylight-saving-custom.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-right-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E065EA5D</checksum>
+      <checksum>7C806289</checksum>
     </file>
     <file>
-      <filename>base-simcontrol-daylight-saving-disabled.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-right-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>7EB96166</checksum>
+      <checksum>456D4764</checksum>
     </file>
     <file>
-      <filename>extra-second-heating-system-fireplace.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace-right-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BD3E8DF0</checksum>
+      <checksum>C42D7D6E</checksum>
     </file>
     <file>
-      <filename>extra-second-heating-system-portable-heater.osw</filename>
+      <filename>extra-bldgtype-multifamily-unvented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1AF86B14</checksum>
+      <checksum>AF20D654</checksum>
     </file>
     <file>
-      <filename>base-lighting-detailed.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A342EE4B</checksum>
+      <checksum>2EE34AF0</checksum>
     </file>
     <file>
-      <filename>base-mechvent-whole-house-fan.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-left-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DEE732DF</checksum>
+      <checksum>4484A1C3</checksum>
     </file>
     <file>
-      <filename>base-dhw-none.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-left-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EC0FAF91</checksum>
+      <checksum>3D51AAE6</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-flue.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-left-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>25992FCC</checksum>
+      <checksum>90229724</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-ach-house-pressure.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-left-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B484D508</checksum>
+      <checksum>F0D40F3E</checksum>
     </file>
     <file>
-      <filename>base-enclosure-infil-cfm-house-pressure.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-left-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C2238C5F</checksum>
+      <checksum>D98453E6</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-electric-outside.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-left-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E9BA3D56</checksum>
+      <checksum>19BF31E0</checksum>
     </file>
     <file>
-      <filename>base-enclosure-beds-5.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-middle-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>99C50F57</checksum>
+      <checksum>49C57E62</checksum>
     </file>
     <file>
-      <filename>base-enclosure-beds-1.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-middle-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>76DA310F</checksum>
+      <checksum>D312A91C</checksum>
     </file>
     <file>
-      <filename>base-enclosure-beds-2.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-middle-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B831A793</checksum>
+      <checksum>075EDD2B</checksum>
     </file>
     <file>
-      <filename>base-simcontrol-runperiod-1-month.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-middle-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DEE43FEB</checksum>
+      <checksum>D7CCC275</checksum>
     </file>
     <file>
-      <filename>extra-enclosure-garage-partially-protruded.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-middle-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CAA12DE0</checksum>
+      <checksum>482F376A</checksum>
     </file>
     <file>
-      <filename>base-atticroof-radiant-barrier.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-middle-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>72D99701</checksum>
+      <checksum>EF7DFB6F</checksum>
     </file>
     <file>
-      <filename>base-location-miami-fl.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-right-bottom-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3FF9CA9D</checksum>
+      <checksum>38BECB24</checksum>
     </file>
     <file>
-      <filename>base-appliances-dehumidifier.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-right-bottom.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>302D8CE2</checksum>
+      <checksum>82CF504F</checksum>
     </file>
     <file>
-      <filename>base-location-dallas-tx.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-right-middle-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C8A3E936</checksum>
+      <checksum>67AFD418</checksum>
     </file>
     <file>
-      <filename>base-appliances-dehumidifier-50percent.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-right-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CB76AD87</checksum>
+      <checksum>AD476C2D</checksum>
     </file>
     <file>
-      <filename>base-foundation-unconditioned-basement-assembly-r.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-right-top-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>493D6DBD</checksum>
+      <checksum>D6B7ADB7</checksum>
     </file>
     <file>
-      <filename>base-foundation-unconditioned-basement-wall-insulation.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace-right-top.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>03687155</checksum>
+      <checksum>6AABE62F</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.osw</filename>
+      <filename>extra-bldgtype-multifamily-vented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1965EA1F</checksum>
+      <checksum>8C0DA474</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-boiler-only-baseboard.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1206BCA0</checksum>
+      <checksum>9D06AB28</checksum>
     </file>
     <file>
-      <filename>base-appliances-coal.osw</filename>
+      <filename>base-bldgtype-multifamily-shared-boiler-only-fan-coil.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>29461AFF</checksum>
+      <checksum>89582951</checksum>
     </file>
     <file>
-      <filename>base-appliances-gas.osw</filename>
+      <filename>base-bldgtype-single-family-attached.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EB100678</checksum>
+      <checksum>CA6B4A0E</checksum>
     </file>
     <file>
-      <filename>base-appliances-modified.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-double-exterior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3ED546F1</checksum>
+      <checksum>17D1AD4B</checksum>
     </file>
     <file>
-      <filename>base-appliances-oil.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-double-loaded-interior.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5CF5A14B</checksum>
+      <checksum>48CFB3A9</checksum>
     </file>
     <file>
-      <filename>base-appliances-propane.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-single-exterior-front.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>CA2AFC29</checksum>
+      <checksum>FE657115</checksum>
     </file>
     <file>
-      <filename>base-appliances-wood.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-slab-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F6B45DAC</checksum>
+      <checksum>04757497</checksum>
     </file>
     <file>
-      <filename>base-simcontrol-calendar-year-custom.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-slab-right.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>B0D7ABE6</checksum>
+      <checksum>4E86F719</checksum>
     </file>
     <file>
-      <filename>base-location-AMY-2012.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-slab.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>31FADCAA</checksum>
+      <checksum>83488A3E</checksum>
     </file>
     <file>
-      <filename>base-schedules-stochastic.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-unconditioned-basement-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>DF17F238</checksum>
+      <checksum>5588C2C9</checksum>
     </file>
     <file>
-      <filename>base-schedules-user-specified.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-unconditioned-basement-right.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1B1FE4E1</checksum>
+      <checksum>D20EC476</checksum>
     </file>
     <file>
-      <filename>extra-vacancy-6-months.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-unconditioned-basement.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>63C3D539</checksum>
+      <checksum>597DC830</checksum>
     </file>
     <file>
-      <filename>base-lighting-ceiling-fans.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-unvented-crawlspace-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6DA267C2</checksum>
+      <checksum>B6ACD512</checksum>
     </file>
     <file>
-      <filename>base-hvac-evap-cooler-only.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-unvented-crawlspace-right.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>41B5D34C</checksum>
+      <checksum>2E4DDACE</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-air-conditioner-only-ducted.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-unvented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>533A2E15</checksum>
+      <checksum>B449F329</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-air-conditioner-only-ductless.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-vented-crawlspace-middle.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BC77F924</checksum>
+      <checksum>F8799E18</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-vented-crawlspace-right.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D938CFE5</checksum>
+      <checksum>971AF0F3</checksum>
     </file>
     <file>
-      <filename>base-hvac-air-to-air-heat-pump-1-speed.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-vented-crawlspace.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>28D9662C</checksum>
+      <checksum>DE65DC85</checksum>
     </file>
     <file>
-      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-electric.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-atticroof-conditioned-eaves-gable.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>38177272</checksum>
+      <checksum>A7CDF4B5</checksum>
     </file>
     <file>
-      <filename>base-hvac-central-ac-only-1-speed.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-atticroof-conditioned-eaves-hip.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>5D103DE7</checksum>
+      <checksum>236C3E5C</checksum>
     </file>
     <file>
-      <filename>base-hvac-central-ac-plus-air-to-air-heat-pump-heating.osw</filename>
+      <filename>extra-bldgtype-single-family-attached-atticroof-flat.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A948DD1C</checksum>
+      <checksum>FB20EDAD</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-heat-pump-ducted-cooling-only.osw</filename>
+      <filename>base-enclosure-2stories-garage.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>D19C01A6</checksum>
+      <checksum>053849BB</checksum>
     </file>
     <file>
-      <filename>base-hvac-ground-to-air-heat-pump.osw</filename>
+      <filename>base-enclosure-2stories.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>3A354092</checksum>
+      <checksum>AC7E487C</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-heat-pump-ducted-heating-only.osw</filename>
+      <filename>base-enclosure-infil-natural-ach.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>556939DA</checksum>
+      <checksum>CC2F9148</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-heat-pump-ducted.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>C131ACD3</checksum>
+      <checksum>D9B29747</checksum>
     </file>
     <file>
-      <filename>base-hvac-mini-split-heat-pump-ductless.osw</filename>
+      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8DBE3E53</checksum>
+      <checksum>6F135D63</checksum>
     </file>
     <file>
-      <filename>base-hvac-stove-oil-only.osw</filename>
+      <filename>base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-electric.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>02C8C1CD</checksum>
+      <checksum>38B759A2</checksum>
     </file>
     <file>
-      <filename>base-hvac-stove-wood-pellets-only.osw</filename>
+      <filename>base-hvac-dual-fuel-mini-split-heat-pump-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9684023E</checksum>
+      <checksum>7A3576BE</checksum>
     </file>
     <file>
-      <filename>extra-schedules-random-seed.osw</filename>
+      <filename>base-hvac-ground-to-air-heat-pump-heating-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4D67B18A</checksum>
+      <checksum>5D31B612</checksum>
     </file>
     <file>
-      <filename>extra-hvac-programmable-thermostat.osw</filename>
+      <filename>base-hvac-ground-to-air-heat-pump.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>AAE42D2C</checksum>
+      <checksum>0CF07A90</checksum>
     </file>
     <file>
-      <filename>extra-plug-loads-additional-multipliers.osw</filename>
+      <filename>base-hvac-install-quality-all-ground-to-air-heat-pump.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>6B2C62FA</checksum>
+      <checksum>01ECF3AE</checksum>
     </file>
     <file>
-      <filename>base-appliances-dehumidifier-ief-portable.osw</filename>
+      <filename>extra-second-heating-system-boiler-to-heat-pump.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>916B82AC</checksum>
+      <checksum>0B4BD098</checksum>
     </file>
     <file>
-      <filename>base-appliances-dehumidifier-ief-whole-home.osw</filename>
+      <filename>base-hvac-mini-split-heat-pump-ducted-heating-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>847D5567</checksum>
+      <checksum>CFCB2FDA</checksum>
     </file>
     <file>
-      <filename>base-misc-defaults.osw</filename>
+      <filename>base-hvac-mini-split-heat-pump-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>96EC0815</checksum>
+      <checksum>01658468</checksum>
     </file>
     <file>
-      <filename>base-misc-usage-multiplier.osw</filename>
+      <filename>base-hvac-mini-split-heat-pump-ductless.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>93BB5F73</checksum>
+      <checksum>0A8C0E0C</checksum>
     </file>
     <file>
-      <filename>base-pv.osw</filename>
+      <filename>base-hvac-install-quality-all-mini-split-heat-pump-ducted.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>11672F8C</checksum>
-    </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>2.9.0</identifier>
-        <min_compatible>2.9.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>2F7DF2BC</checksum>
+      <checksum>2D389CE4</checksum>
     </file>
     <file>
-      <filename>base-misc-loads-large-uncommon.osw</filename>
+      <filename>extra-second-heating-system-fireplace-to-heat-pump.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4616C7CB</checksum>
+      <checksum>CE8573A5</checksum>
     </file>
     <file>
-      <filename>base-misc-loads-large-uncommon2.osw</filename>
+      <filename>base-hvac-undersized.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E93C4A01</checksum>
+      <checksum>96827200</checksum>
     </file>
     <file>
-      <filename>build_residential_hpxml_test.rb</filename>
-      <filetype>rb</filetype>
+      <filename>base-hvac-room-ac-only-33percent.osw</filename>
+      <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E900963F</checksum>
+      <checksum>C61245AD</checksum>
     </file>
     <file>
-      <filename>base-bldgtype-multifamily-shared-mechvent-preconditioning.osw</filename>
+      <filename>base-location-miami-fl.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A061E175</checksum>
+      <checksum>15A0FD2C</checksum>
     </file>
     <file>
-      <filename>base-bldgtype-multifamily-shared-mechvent.osw</filename>
+      <filename>base-location-baltimore-md.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>01E627F9</checksum>
+      <checksum>D5D88FCB</checksum>
     </file>
     <file>
-      <filename>base-bldgtype-multifamily-shared-pv.osw</filename>
+      <filename>base-location-honolulu-hi.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>26B150D2</checksum>
+      <checksum>5B551241</checksum>
     </file>
     <file>
-      <filename>base-bldgtype-multifamily-shared-water-heater.osw</filename>
+      <filename>base-location-phoenix-az.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C6D8DB9C</checksum>
+      <checksum>B272B1B6</checksum>
     </file>
     <file>
-      <filename>base-bldgtype-multifamily.osw</filename>
+      <filename>base-location-portland-or.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>AA0852F0</checksum>
+      <checksum>4EAC5B84</checksum>
     </file>
     <file>
-      <filename>base-bldgtype-single-family-attached.osw</filename>
+      <filename>base-location-helena-mt.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>77081C8C</checksum>
+      <checksum>23D45C7A</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-elec-uef.osw</filename>
+      <filename>base-hvac-programmable-thermostat-detailed.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>1C39C5AE</checksum>
+      <checksum>F13D44EF</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-gas-uef.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>70CDC766</checksum>
+      <filename>schedules_config.md</filename>
+      <filetype>md</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>EC6567F6</checksum>
     </file>
     <file>
-      <filename>base-dhw-tank-heat-pump-uef.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>1E503FB5</checksum>
+      <filename>schedules_config.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>BC384EA9</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-electric-uef.osw</filename>
+      <filename>schedules.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>921F05FF</checksum>
+    </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>2.9.0</identifier>
+        <min_compatible>2.9.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>9AE98715</checksum>
+    </file>
+    <file>
+      <filename>base-hvac-fixed-heater-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8BDD0815</checksum>
+      <checksum>11CBC797</checksum>
     </file>
     <file>
-      <filename>base-dhw-tankless-gas-uef.osw</filename>
+      <filename>base-hvac-portable-heater-gas-only.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>063501DA</checksum>
+      <checksum>A71061DF</checksum>
     </file>
   </files>
 </measure>