urbanopt-cli 0.10.0 → 0.11.1

data/example_files/resources/hpxml-measures/workflow/hpxml_inputs.json

@@ -205,8 +205,8 @@
     "misc_fuel_loads_fireplace_fuel_type": "natural gas",
     "pool_present": false,
     "pool_heater_type": "none",
-    "hot_tub_present": false,
-    "hot_tub_heater_type": "none",
+    "permanent_spa_present": false,
+    "permanent_spa_heater_type": "none",
     "combine_like_surfaces": false
   },
   "tests/ASHRAE_Standard_140/L110AC.xml": {
@@ -507,7 +507,7 @@
     "whole_house_fan_present": false,
     "water_heater_type": "storage water heater",
     "water_heater_fuel_type": "electricity",
-    "water_heater_location": "living space",
+    "water_heater_location": "conditioned space",
     "water_heater_tank_volume": 40,
     "water_heater_efficiency_type": "EnergyFactor",
     "water_heater_efficiency": 0.95,
@@ -557,7 +557,7 @@
     "dehumidifier_rh_setpoint": 0,
     "dehumidifier_fraction_dehumidification_load_served": 0,
     "clothes_washer_present": true,
-    "clothes_washer_location": "living space",
+    "clothes_washer_location": "conditioned space",
     "clothes_washer_efficiency_type": "IntegratedModifiedEnergyFactor",
     "clothes_washer_efficiency": 1.21,
     "clothes_washer_rated_annual_kwh": 380,
@@ -567,13 +567,13 @@
     "clothes_washer_label_usage": 6,
     "clothes_washer_capacity": 3.2,
     "clothes_dryer_present": true,
-    "clothes_dryer_location": "living space",
+    "clothes_dryer_location": "conditioned space",
     "clothes_dryer_fuel_type": "electricity",
     "clothes_dryer_efficiency_type": "CombinedEnergyFactor",
     "clothes_dryer_efficiency": 3.73,
     "clothes_dryer_vented_flow_rate": 150,
     "dishwasher_present": true,
-    "dishwasher_location": "living space",
+    "dishwasher_location": "conditioned space",
     "dishwasher_efficiency_type": "RatedAnnualkWh",
     "dishwasher_efficiency": 307,
     "dishwasher_label_electric_rate": 0.12,
@@ -582,12 +582,12 @@
     "dishwasher_label_usage": 4,
     "dishwasher_place_setting_capacity": 12,
     "refrigerator_present": true,
-    "refrigerator_location": "living space",
+    "refrigerator_location": "conditioned space",
     "refrigerator_rated_annual_kwh": 650,
     "extra_refrigerator_present": false,
     "freezer_present": false,
     "cooking_range_oven_present": true,
-    "cooking_range_oven_location": "living space",
+    "cooking_range_oven_location": "conditioned space",
     "cooking_range_oven_fuel_type": "electricity",
     "cooking_range_oven_is_induction": false,
     "cooking_range_oven_is_convection": false,
@@ -607,8 +607,8 @@
     "misc_fuel_loads_fireplace_fuel_type": "natural gas",
     "pool_present": false,
     "pool_heater_type": "none",
-    "hot_tub_present": false,
-    "hot_tub_heater_type": "none",
+    "permanent_spa_present": false,
+    "permanent_spa_heater_type": "none",
     "utility_bill_scenario_names": "Bills",
     "combine_like_surfaces": true
   },
@@ -649,25 +649,11 @@
     "clothes_dryer_fuel_type": "fuel oil",
     "cooking_range_oven_fuel_type": "fuel oil"
   },
-  "sample_files/base-appliances-oil-location-miami-fl.xml": {
-    "parent_hpxml": "sample_files/base-appliances-oil.xml",
-    "site_iecc_zone": "1A",
-    "site_state_code": "FL",
-    "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw",
-    "heating_system_heating_capacity": 12000
-  },
   "sample_files/base-appliances-propane.xml": {
     "parent_hpxml": "sample_files/base-appliances-gas.xml",
     "clothes_dryer_fuel_type": "propane",
     "cooking_range_oven_fuel_type": "propane"
   },
-  "sample_files/base-appliances-propane-location-portland-or.xml": {
-    "parent_hpxml": "sample_files/base-appliances-propane.xml",
-    "site_iecc_zone": "4C",
-    "site_state_code": "OR",
-    "weather_station_epw_filepath": "USA_OR_Portland.Intl.AP.726980_TMY3.epw",
-    "heating_system_heating_capacity": 24000
-  },
   "sample_files/base-appliances-wood.xml": {
     "parent_hpxml": "sample_files/base-appliances-gas.xml",
     "clothes_dryer_fuel_type": "wood",
@@ -703,18 +689,18 @@
     "window_aspect_ratio": 2,
     "ducts_supply_leakage_to_outside_value": 0,
     "ducts_return_leakage_to_outside_value": 0,
-    "ducts_supply_location": "living space",
-    "ducts_return_location": "living space"
+    "ducts_supply_location": "conditioned space",
+    "ducts_return_location": "conditioned space"
   },
   "sample_files/base-atticroof-conditioned.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "geometry_unit_num_floors_above_grade": 2,
     "geometry_unit_cfa": 3600,
     "geometry_attic_type": "ConditionedAttic",
-    "ducts_supply_leakage_to_outside_value": 50,
-    "ducts_return_leakage_to_outside_value": 100,
-    "ducts_supply_location": "living space",
-    "ducts_return_location": "living space",
+    "ducts_supply_leakage_to_outside_value": 5,
+    "ducts_return_leakage_to_outside_value": 10,
+    "ducts_supply_location": "conditioned space",
+    "ducts_return_location": "conditioned space",
     "water_heater_location": "basement - conditioned",
     "clothes_washer_location": "basement - conditioned",
     "clothes_dryer_location": "basement - conditioned",
@@ -762,7 +748,7 @@
     "parent_hpxml": "sample_files/base-battery.xml",
     "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/battery.csv"
   },
-  "sample_files/base-bldgtype-attached.xml": {
+  "sample_files/base-bldgtype-sfa-unit.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "geometry_unit_type": "single-family attached",
     "geometry_unit_right_wall_is_adiabatic": true,
@@ -781,8 +767,8 @@
     "heating_system_heating_capacity": 24000,
     "misc_plug_loads_other_annual_kwh": 1638
   },
-  "sample_files/base-bldgtype-attached-2stories.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-attached.xml",
+  "sample_files/base-bldgtype-sfa-unit-2stories.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-sfa-unit.xml",
     "geometry_unit_num_floors_above_grade": 2,
     "geometry_unit_cfa": 2700,
     "heating_system_heating_capacity": 48000,
@@ -791,20 +777,20 @@
     "ducts_return_surface_area": 37.5,
     "misc_plug_loads_other_annual_kwh": 2457
   },
-  "sample_files/base-bldgtype-attached-atticroof-cathedral.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-attached-2stories.xml",
+  "sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-sfa-unit-2stories.xml",
     "geometry_attic_type": "ConditionedAttic",
     "ducts_supply_leakage_to_outside_value": 0,
     "ducts_return_leakage_to_outside_value": 0,
-    "ducts_supply_location": "living space",
-    "ducts_return_location": "living space"
+    "ducts_supply_location": "conditioned space",
+    "ducts_return_location": "conditioned space"
   },
-  "sample_files/base-bldgtype-attached-infil-compartmentalization-test.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-attached.xml",
+  "sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-sfa-unit.xml",
     "air_leakage_value": 3.57,
     "air_leakage_type": "unit total"
   },
-  "sample_files/base-bldgtype-multifamily.xml": {
+  "sample_files/base-bldgtype-mf-unit.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "geometry_unit_type": "apartment unit",
     "geometry_unit_right_wall_is_adiabatic": true,
@@ -827,79 +813,86 @@
     "cooling_system_cooling_capacity": 12000,
     "ducts_supply_leakage_to_outside_value": 0,
     "ducts_return_leakage_to_outside_value": 0,
-    "ducts_supply_location": "living space",
+    "ducts_supply_location": "conditioned space",
     "ducts_supply_insulation_r": 0,
-    "ducts_return_location": "living space",
+    "ducts_return_location": "conditioned space",
     "misc_plug_loads_other_annual_kwh": 819
   },
-  "sample_files/base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-adjacent-to-multiple.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-adjacent-to-non-freezing-space.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-adjacent-to-other-heated-space.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-infil-compartmentalization-test.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "air_leakage_value": 12.16,
     "air_leakage_type": "unit total"
   },
-  "sample_files/base-bldgtype-multifamily-residents-1.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-residents-1.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "geometry_unit_num_occupants": 1,
     "misc_plug_loads_television_annual_kwh": null,
     "misc_plug_loads_other_annual_kwh": null
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "heating_system_type": "Shared Boiler w/ Baseboard",
     "cooling_system_type": "none",
     "cooling_system_cooling_efficiency": 0,
     "cooling_system_fraction_cool_load_served": 0
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml",
     "heating_system_type": "Shared Boiler w/ Ductless Fan Coil"
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil-ducted.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-water-loop-heat-pump.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-cooling-tower-water-loop-heat-pump.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-water-loop-heat-pump.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "heating_system_type": "Shared Boiler w/ Baseboard",
     "cooling_system_type": "none",
     "cooling_system_cooling_efficiency": 0,
     "cooling_system_fraction_cool_load_served": 0
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml",
     "heating_system_type": "Shared Boiler w/ Ductless Fan Coil"
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-ducted.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml",
+    "heating_system_fraction_heat_load_served": 0.75,
+    "heating_system_2_type": "Fireplace",
+    "heating_system_2_heating_efficiency": 1.0,
+    "heating_system_2_fraction_heat_load_served": 0.25
+  },
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-eae.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-boiler-only-water-loop-heat-pump.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "heating_system_type": "none",
     "heating_system_heating_efficiency": 0,
     "heating_system_fraction_heat_load_served": 0,
@@ -907,32 +900,32 @@
     "cooling_system_cooling_efficiency": 0,
     "cooling_system_fraction_cool_load_served": 0
   },
-  "sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil-ducted.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-cooling-tower-only-water-loop-heat-pump.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-generator.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-generator.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-ground-loop-ground-to-air-heat-pump.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-laundry-room.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-laundry-room.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-mechvent.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-mechvent.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "mech_vent_fan_type": "supply only",
     "mech_vent_flow_rate": 800,
     "mech_vent_hours_in_operation": 24,
@@ -948,11 +941,11 @@
     "mech_vent_2_sensible_recovery_efficiency": 0.72,
     "mech_vent_2_fan_power": 26
   },
-  "sample_files/base-bldgtype-multifamily-shared-mechvent-multiple.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
   },
-  "sample_files/base-bldgtype-multifamily-shared-mechvent-preconditioning.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-mechvent.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-mechvent.xml",
     "mech_vent_shared_preheating_fuel": "natural gas",
     "mech_vent_shared_preheating_efficiency": 0.92,
     "mech_vent_shared_preheating_fraction_heat_load_served": 0.7,
@@ -960,8 +953,8 @@
     "mech_vent_shared_precooling_efficiency": 4,
     "mech_vent_shared_precooling_fraction_cool_load_served": 0.8
   },
-  "sample_files/base-bldgtype-multifamily-shared-pv.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-pv.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "pv_system_present": true,
     "pv_system_module_type": "standard",
     "pv_system_location": "ground",
@@ -973,8 +966,8 @@
     "pv_system_system_losses_fraction": 0.14,
     "pv_system_num_bedrooms_served": 18
   },
-  "sample_files/base-bldgtype-multifamily-shared-water-heater.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+  "sample_files/base-bldgtype-mf-unit-shared-water-heater.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "water_heater_fuel_type": "natural gas",
     "water_heater_tank_volume": 120,
     "water_heater_efficiency": 0.59,
@@ -982,8 +975,8 @@
     "water_heater_heating_capacity": 40000,
     "water_heater_num_units_served": 6
   },
-  "sample_files/base-bldgtype-multifamily-shared-water-heater-recirc.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-water-heater.xml"
+  "sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml": {
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-water-heater.xml"
   },
   "sample_files/base-dhw-combi-tankless.xml": {
     "parent_hpxml": "sample_files/base-dhw-indirect.xml",
@@ -1464,6 +1457,26 @@
     "parent_hpxml": "sample_files/base.xml",
     "misc_plug_loads_other_annual_kwh": 1729
   },
+  "sample_files/base-foundation-belly-wing-skirt.xml": {
+    "parent_hpxml": "sample_files/base-foundation-ambient.xml",
+    "geometry_unit_type": "manufactured home",
+    "geometry_unit_aspect_ratio": 4.0,
+    "geometry_foundation_type": "BellyAndWingWithSkirt",
+    "geometry_foundation_height": 2,
+    "geometry_foundation_height_above_grade": 2,
+    "geometry_roof_pitch": "3:12",
+    "window_area_front": 140,
+    "window_area_back": 140,
+    "window_area_left": 20,
+    "window_area_right": 20,
+    "ducts_supply_location": "manufactured home belly",
+    "ducts_supply_insulation_r": 0,
+    "ducts_return_location": "manufactured home belly"
+  },
+  "sample_files/base-foundation-belly-wing-no-skirt.xml": {
+    "parent_hpxml": "sample_files/base-foundation-belly-wing-skirt.xml",
+    "geometry_foundation_type": "BellyAndWingNoSkirt"
+  },
   "sample_files/base-foundation-complex.xml": {
     "parent_hpxml": "sample_files/base.xml"
   },
@@ -1472,6 +1485,11 @@
     "slab_under_insulation_r": 10,
     "slab_under_width": 4
   },
+  "sample_files/base-foundation-conditioned-basement-slab-insulation-full.xml": {
+    "parent_hpxml": "sample_files/base.xml",
+    "slab_under_insulation_r": 10,
+    "slab_under_width": 999
+  },
   "sample_files/base-foundation-conditioned-basement-wall-insulation.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "foundation_wall_type": "concrete block foam core",
@@ -1568,6 +1586,10 @@
     "water_heater_location": "crawlspace - vented",
     "misc_plug_loads_other_annual_kwh": 1228.5
   },
+  "sample_files/base-foundation-vented-crawlspace-above-grade.xml": {
+    "parent_hpxml": "sample_files/base-foundation-vented-crawlspace.xml",
+    "geometry_foundation_height_above_grade": 4
+  },
   "sample_files/base-foundation-walkout-basement.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "geometry_foundation_height_above_grade": 5,
@@ -1599,10 +1621,6 @@
   "sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml": {
     "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml"
   },
-  "sample_files/base-hvac-air-to-air-heat-pump-1-speed-autosized-backup.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml",
-    "heat_pump_backup_heating_capacity": null
-  },
   "sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml": {
     "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml",
     "heat_pump_heating_capacity": 0,
@@ -1652,8 +1670,7 @@
     "heating_system_2_type": "Boiler",
     "heating_system_2_fuel": "natural gas",
     "heating_system_2_heating_efficiency": 0.8,
-    "heating_system_2_heating_capacity": 60000,
-    "heating_system_2_fraction_heat_load_served": 0.25
+    "heating_system_2_heating_capacity": 60000
   },
   "sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-hvac-seasons.xml": {
     "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml",
@@ -1668,408 +1685,22 @@
   "sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml": {
     "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml"
   },
-  "sample_files/base-hvac-autosize.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "heating_system_heating_capacity": null,
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-1-speed-cooling-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-acca.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-maxload-miami-fl.xml": {
-    "parent_hpxml": "sample_files/base-hvac-autosize-air-to-air-heat-pump-1-speed-sizing-methodology-maxload.xml",
-    "site_iecc_zone": "1A",
-    "site_state_code": "FL",
-    "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-2-speed-sizing-methodology-acca.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-2-speed-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-2-speed-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-var-speed-sizing-methodology-acca.xml": {
+  "sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml": {
     "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-var-speed-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-var-speed-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-var-speed-backup-boiler.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS",
-    "heating_system_2_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-air-to-air-heat-pump-var-speed-backup-furnace.xml": {
-    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS",
-    "heating_system_2_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-boiler-elec-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-boiler-elec-only.xml",
-    "heating_system_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-boiler-gas-central-ac-1-speed.xml": {
-    "parent_hpxml": "sample_files/base-hvac-boiler-gas-central-ac-1-speed.xml",
-    "heating_system_heating_capacity": null,
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-boiler-gas-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-boiler-gas-only.xml",
-    "heating_system_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-central-ac-only-1-speed.xml": {
-    "parent_hpxml": "sample_files/base-hvac-central-ac-only-1-speed.xml",
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-central-ac-only-2-speed.xml": {
-    "parent_hpxml": "sample_files/base-hvac-central-ac-only-2-speed.xml",
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-central-ac-only-var-speed.xml": {
-    "parent_hpxml": "sample_files/base-hvac-central-ac-only-var-speed.xml",
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-central-ac-plus-air-to-air-heat-pump-heating.xml": {
-    "parent_hpxml": "sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml",
-    "cooling_system_cooling_capacity": null,
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-dual-fuel-air-to-air-heat-pump-1-speed-sizing-methodology-acca.xml": {
-    "parent_hpxml": "sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-dual-fuel-air-to-air-heat-pump-1-speed-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-dual-fuel-air-to-air-heat-pump-1-speed-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-dual-fuel-mini-split-heat-pump-ducted.xml": {
-    "parent_hpxml": "sample_files/base-hvac-dual-fuel-mini-split-heat-pump-ducted.xml",
-    "heat_pump_heating_capacity": null,
+    "heat_pump_cooling_compressor_type": "variable speed",
     "heat_pump_heating_capacity_retention_fraction": null,
     "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-dual-fuel-mini-split-heat-pump-ducted-backup-hardsized.xml": {
-    "parent_hpxml": "sample_files/base-hvac-autosize-dual-fuel-mini-split-heat-pump-ducted.xml",
-    "heat_pump_backup_heating_capacity": 36000
-  },
-  "sample_files/base-hvac-autosize-elec-resistance-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-elec-resistance-only.xml",
-    "heating_system_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-evap-cooler-furnace-gas.xml": {
-    "parent_hpxml": "sample_files/base-hvac-evap-cooler-furnace-gas.xml",
-    "heating_system_heating_capacity": null,
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-floor-furnace-propane-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-floor-furnace-propane-only.xml",
-    "heating_system_heating_capacity": null
+    "heat_pump_cooling_efficiency": 17.25,
+    "heat_pump_heating_efficiency": 10.0
   },
-  "sample_files/base-hvac-autosize-furnace-elec-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-furnace-elec-only.xml",
-    "heating_system_heating_capacity": null
+  "sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures.xml": {
+    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml"
   },
-  "sample_files/base-hvac-autosize-furnace-gas-central-ac-2-speed.xml": {
-    "parent_hpxml": "sample_files/base-hvac-furnace-gas-central-ac-2-speed.xml",
-    "heating_system_heating_capacity": null,
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-furnace-gas-central-ac-var-speed.xml": {
-    "parent_hpxml": "sample_files/base-hvac-furnace-gas-central-ac-var-speed.xml",
-    "heating_system_heating_capacity": null,
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-furnace-gas-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-furnace-gas-only.xml",
-    "heating_system_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-furnace-gas-room-ac.xml": {
-    "parent_hpxml": "sample_files/base-hvac-furnace-gas-room-ac.xml",
+  "sample_files/base-hvac-autosize.xml": {
+    "parent_hpxml": "sample_files/base.xml",
     "heating_system_heating_capacity": null,
     "cooling_system_cooling_capacity": null
   },
-  "sample_files/base-hvac-autosize-ground-to-air-heat-pump-cooling-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-ground-to-air-heat-pump-heating-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-ground-to-air-heat-pump-sizing-methodology-acca.xml": {
-    "parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-ground-to-air-heat-pump-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-ground-to-air-heat-pump-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-mini-split-air-conditioner-only-ducted.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml",
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-mini-split-heat-pump-ducted-cooling-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-mini-split-heat-pump-ducted-heating-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-mini-split-heat-pump-ducted-sizing-methodology-acca.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-mini-split-heat-pump-ducted-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-mini-split-heat-pump-ducted-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-mini-split-heat-pump-ductless-backup-stove.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless-backup-stove.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS",
-    "heating_system_2_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-mini-split-heat-pump-ductless-backup-baseboard.xml": {
-    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless-backup-baseboard.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_heating_capacity_retention_fraction": null,
-    "heat_pump_heating_capacity_retention_temp": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS",
-    "heating_system_2_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-ptac.xml": {
-    "parent_hpxml": "sample_files/base-hvac-ptac.xml",
-    "cooling_system_cooling_capacity": null
-  },
-  "sample_files/base-hvac-autosize-ptac-with-heating.xml": {
-    "parent_hpxml": "sample_files/base-hvac-ptac-with-heating-electricity.xml",
-    "cooling_system_cooling_capacity": null,
-    "cooling_system_integrated_heating_system_capacity": null
-  },
-  "sample_files/base-hvac-autosize-pthp-sizing-methodology-acca.xml": {
-    "parent_hpxml": "sample_files/base-hvac-pthp.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-pthp-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-pthp.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-pthp-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-pthp.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-room-ac-with-reverse-cycle-sizing-methodology-acca.xml": {
-    "parent_hpxml": "sample_files/base-hvac-room-ac-with-reverse-cycle.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "ACCA"
-  },
-  "sample_files/base-hvac-autosize-room-ac-with-reverse-cycle-sizing-methodology-hers.xml": {
-    "parent_hpxml": "sample_files/base-hvac-room-ac-with-reverse-cycle.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "HERS"
-  },
-  "sample_files/base-hvac-autosize-room-ac-with-reverse-cycle-sizing-methodology-maxload.xml": {
-    "parent_hpxml": "sample_files/base-hvac-room-ac-with-reverse-cycle.xml",
-    "heat_pump_heating_capacity": null,
-    "heat_pump_cooling_capacity": null,
-    "heat_pump_backup_heating_capacity": null,
-    "heat_pump_sizing_methodology": "MaxLoad"
-  },
-  "sample_files/base-hvac-autosize-room-ac-with-heating.xml": {
-    "parent_hpxml": "sample_files/base-hvac-room-ac-with-heating.xml",
-    "cooling_system_cooling_capacity": null,
-    "cooling_system_integrated_heating_system_capacity": null
-  },
-  "sample_files/base-hvac-autosize-room-ac-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-room-ac-only.xml",
-    "cooling_system_cooling_capacity": null
-  },
   "sample_files/base-hvac-autosize-sizing-controls.xml": {
     "parent_hpxml": "sample_files/base-hvac-autosize.xml",
     "geometry_unit_num_occupants": 5,
@@ -2078,14 +1709,6 @@
     "hvac_control_cooling_weekday_setpoint": 80,
     "hvac_control_cooling_weekend_setpoint": 80
   },
-  "sample_files/base-hvac-autosize-stove-oil-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-stove-oil-only.xml",
-    "heating_system_heating_capacity": null
-  },
-  "sample_files/base-hvac-autosize-wall-furnace-elec-only.xml": {
-    "parent_hpxml": "sample_files/base-hvac-wall-furnace-elec-only.xml",
-    "heating_system_heating_capacity": null
-  },
   "sample_files/base-hvac-boiler-coal-only.xml": {
     "parent_hpxml": "sample_files/base-hvac-boiler-gas-only.xml",
     "heating_system_fuel": "coal"
@@ -2148,6 +1771,12 @@
     "cooling_system_cooling_compressor_type": "variable speed",
     "cooling_system_cooling_sensible_heat_fraction": 0.78
   },
+  "sample_files/base-hvac-central-ac-only-var-speed-detailed-performance.xml": {
+    "parent_hpxml": "sample_files/base-hvac-central-ac-only-var-speed.xml",
+    "cooling_system_cooling_compressor_type": "variable speed",
+    "cooling_system_cooling_efficiency": 17.25,
+    "cooling_system_cooling_capacity": 36000
+  },
   "sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml": {
     "parent_hpxml": "sample_files/base-hvac-central-ac-only-1-speed.xml",
     "heat_pump_type": "air-to-air",
@@ -2164,10 +1793,6 @@
     "heat_pump_backup_heating_efficiency": 1,
     "heat_pump_backup_heating_capacity": 36000
   },
-  "sample_files/base-hvac-crankcase-heater-40w.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "cooling_system_crankcase_heater_watts": 40
-  },
   "sample_files/base-hvac-dse.xml": {
     "parent_hpxml": "sample_files/base.xml"
   },
@@ -2217,7 +1842,11 @@
     "ducts_return_leakage_to_outside_value": 0.05
   },
   "sample_files/base-hvac-ducts-area-fractions.xml": {
-    "parent_hpxml": "sample_files/base-enclosure-2stories.xml"
+    "parent_hpxml": "sample_files/base-enclosure-2stories.xml",
+    "ducts_supply_surface_area": null,
+    "ducts_supply_surface_area_fraction": 0.75,
+    "ducts_return_surface_area": null,
+    "ducts_return_surface_area_fraction": 0.75
   },
   "sample_files/base-hvac-ducts-area-multipliers.xml": {
     "parent_hpxml": "sample_files/base.xml"
@@ -2228,6 +1857,17 @@
     "ducts_return_buried_insulation_level": "deeply buried",
     "ducts_return_insulation_r": 4
   },
+  "sample_files/base-hvac-ducts-defaults.xml": {
+    "parent_hpxml": "sample_files/base-hvac-furnace-gas-room-ac.xml",
+    "heating_system_fraction_heat_load_served": 0.75,
+    "heating_system_2_type": "Fireplace",
+    "heating_system_2_heating_efficiency": 1.0,
+    "heating_system_2_fraction_heat_load_served": 0.25,
+    "ducts_supply_location": null,
+    "ducts_supply_surface_area": null,
+    "ducts_return_location": null,
+    "ducts_return_surface_area": null
+  },
   "sample_files/base-hvac-ducts-effective-rvalue.xml": {
     "parent_hpxml": "sample_files/base.xml"
   },
@@ -2261,21 +1901,10 @@
     "heating_system_type": "Fireplace",
     "heating_system_fuel": "wood"
   },
-  "sample_files/base-hvac-fixed-heater-gas-only.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "heating_system_type": "FixedHeater",
-    "heating_system_heating_efficiency": 1,
-    "cooling_system_type": "none",
-    "cooling_system_cooling_efficiency": 0,
-    "cooling_system_fraction_cool_load_served": 0
-  },
   "sample_files/base-hvac-floor-furnace-propane-only.xml": {
     "parent_hpxml": "sample_files/base-hvac-stove-oil-only.xml",
     "heating_system_type": "FloorFurnace",
-    "heating_system_fuel": "propane"
-  },
-  "sample_files/base-hvac-floor-furnace-propane-only-pilot-light.xml": {
-    "parent_hpxml": "sample_files/base-hvac-floor-furnace-propane-only.xml",
+    "heating_system_fuel": "propane",
     "heating_system_pilot_light": 600
   },
   "sample_files/base-hvac-furnace-coal-only.xml": {
@@ -2393,6 +2022,9 @@
     "heat_pump_airflow_defect_ratio": -0.25,
     "heat_pump_charge_defect_ratio": -0.25
   },
+  "sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml": {
+    "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml"
+  },
   "sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "heating_system_airflow_defect_ratio": -0.25,
@@ -2436,6 +2068,7 @@
     "heating_system_heating_efficiency": 0,
     "heating_system_fraction_heat_load_served": 0,
     "cooling_system_type": "mini-split",
+    "cooling_system_cooling_compressor_type": null,
     "cooling_system_cooling_efficiency": 19,
     "cooling_system_is_ducted": true,
     "ducts_supply_leakage_to_outside_value": 15,
@@ -2448,6 +2081,12 @@
     "parent_hpxml": "sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml",
     "cooling_system_is_ducted": false
   },
+  "sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance.xml": {
+    "parent_hpxml": "sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml",
+    "cooling_system_cooling_compressor_type": "variable speed",
+    "cooling_system_cooling_efficiency": 21.5,
+    "cooling_system_cooling_capacity": 36000
+  },
   "sample_files/base-hvac-mini-split-heat-pump-ducted.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "heating_system_type": "none",
@@ -2476,6 +2115,14 @@
     "ducts_supply_surface_area": 30,
     "ducts_return_surface_area": 10
   },
+  "sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance.xml": {
+    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted.xml",
+    "heat_pump_cooling_compressor_type": "variable speed",
+    "heat_pump_heating_capacity_retention_fraction": null,
+    "heat_pump_heating_capacity_retention_temp": null,
+    "heat_pump_cooling_efficiency": 16.7,
+    "heat_pump_heating_efficiency": 11.3
+  },
   "sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml": {
     "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted.xml",
     "heat_pump_heating_capacity": 0,
@@ -2494,6 +2141,14 @@
     "heat_pump_backup_heating_efficiency": 0,
     "heat_pump_is_ducted": false
   },
+  "sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml": {
+    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless.xml",
+    "heat_pump_cooling_compressor_type": "variable speed",
+    "heat_pump_heating_capacity_retention_fraction": null,
+    "heat_pump_heating_capacity_retention_temp": null,
+    "heat_pump_cooling_efficiency": 21.5,
+    "heat_pump_heating_efficiency": 10.5
+  },
   "sample_files/base-hvac-mini-split-heat-pump-ductless-heating-capacity-17f.xml": {
     "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless.xml"
   },
@@ -2509,8 +2164,7 @@
     "heating_system_2_type": "Stove",
     "heating_system_2_fuel": "fuel oil",
     "heating_system_2_heating_efficiency": 0.6,
-    "heating_system_2_heating_capacity": 60000,
-    "heating_system_2_fraction_heat_load_served": 0.25
+    "heating_system_2_heating_capacity": 60000
   },
   "sample_files/base-hvac-mini-split-heat-pump-ductless-backup-baseboard.xml": {
     "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless-backup-stove.xml",
@@ -2524,6 +2178,13 @@
     "heating_system_2_fuel": "natural gas",
     "heating_system_2_heating_efficiency": 0.8
   },
+  "sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace-ducts-defaults.xml": {
+    "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace.xml",
+    "ducts_supply_location": null,
+    "ducts_supply_surface_area": null,
+    "ducts_return_location": null,
+    "ducts_return_surface_area": null
+  },
   "sample_files/base-hvac-multiple.xml": {
     "parent_hpxml": "sample_files/base.xml"
   },
@@ -2536,14 +2197,6 @@
     "cooling_system_cooling_efficiency": 0,
     "cooling_system_fraction_cool_load_served": 0
   },
-  "sample_files/base-hvac-portable-heater-gas-only.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "heating_system_type": "PortableHeater",
-    "heating_system_heating_efficiency": 1,
-    "cooling_system_type": "none",
-    "cooling_system_cooling_efficiency": 0,
-    "cooling_system_fraction_cool_load_served": 0
-  },
   "sample_files/base-hvac-ptac.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "heating_system_type": "none",
@@ -2640,6 +2293,14 @@
   "sample_files/base-hvac-setpoints-daily-setbacks.xml": {
     "parent_hpxml": "sample_files/base.xml"
   },
+  "sample_files/base-hvac-space-heater-gas-only.xml": {
+    "parent_hpxml": "sample_files/base.xml",
+    "heating_system_type": "SpaceHeater",
+    "heating_system_heating_efficiency": 1,
+    "cooling_system_type": "none",
+    "cooling_system_cooling_efficiency": 0,
+    "cooling_system_fraction_cool_load_served": 0
+  },
   "sample_files/base-hvac-stove-oil-only.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "heating_system_type": "Stove",
@@ -2660,9 +2321,6 @@
     "ducts_supply_leakage_to_outside_value": 7.5,
     "ducts_return_leakage_to_outside_value": 2.5
   },
-  "sample_files/base-hvac-undersized-allow-increased-fixed-capacities.xml": {
-    "parent_hpxml": "sample_files/base-hvac-undersized.xml"
-  },
   "sample_files/base-hvac-wall-furnace-elec-only.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "heating_system_type": "WallFurnace",
@@ -2686,7 +2344,8 @@
     "holiday_lighting_period": "Nov 24 - Jan 6"
   },
   "sample_files/base-lighting-kwh-per-year.xml": {
-    "parent_hpxml": "sample_files/base.xml"
+    "parent_hpxml": "sample_files/base.xml",
+    "lighting_interior_usage_multiplier": 1.5
   },
   "sample_files/base-lighting-mixed.xml": {
     "parent_hpxml": "sample_files/base.xml"
@@ -2901,10 +2560,6 @@
     "utility_bill_electricity_marginal_rates": 0.12,
     "utility_bill_natural_gas_marginal_rates": 1.1
   },
-  "sample_files/base-misc-bills-none.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "utility_bill_scenario_names": null
-  },
   "sample_files/base-misc-bills-pv.xml": {
     "parent_hpxml": "sample_files/base-pv.xml",
     "pv_system_max_power_output": 10000,
@@ -3045,7 +2700,7 @@
     "extra_refrigerator_present": true,
     "extra_refrigerator_rated_annual_kwh": 700,
     "freezer_present": true,
-    "freezer_location": "living space",
+    "freezer_location": "conditioned space",
     "freezer_rated_annual_kwh": 300,
     "misc_plug_loads_well_pump_present": true,
     "misc_plug_loads_well_pump_annual_kwh": 475,
@@ -3065,18 +2720,18 @@
     "pool_pump_annual_kwh": 2700,
     "pool_heater_type": "gas fired",
     "pool_heater_annual_therm": 500,
-    "hot_tub_present": true,
-    "hot_tub_pump_annual_kwh": 1000,
-    "hot_tub_heater_type": "electric resistance",
-    "hot_tub_heater_annual_kwh": 1300
+    "permanent_spa_present": true,
+    "permanent_spa_pump_annual_kwh": 1000,
+    "permanent_spa_heater_type": "electric resistance",
+    "permanent_spa_heater_annual_kwh": 1300
   },
   "sample_files/base-misc-loads-large-uncommon2.xml": {
     "parent_hpxml": "sample_files/base-misc-loads-large-uncommon.xml",
     "misc_fuel_loads_grill_fuel_type": "fuel oil",
     "misc_fuel_loads_fireplace_fuel_type": "wood pellets",
     "pool_heater_type": "none",
-    "hot_tub_heater_type": "heat pump",
-    "hot_tub_heater_annual_kwh": 260
+    "permanent_spa_heater_type": "heat pump",
+    "permanent_spa_heater_annual_kwh": 260
   },
   "sample_files/base-misc-loads-none.xml": {
     "parent_hpxml": "sample_files/base.xml",
@@ -3092,7 +2747,7 @@
     "neighbor_front_height": 12
   },
   "sample_files/base-misc-neighbor-shading-bldgtype-multifamily.xml": {
-    "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+    "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
     "neighbor_right_distance": 15,
     "combine_like_surfaces": false
   },
@@ -3100,6 +2755,10 @@
     "parent_hpxml": "sample_files/base.xml",
     "site_shielding_of_home": "well-shielded"
   },
+  "sample_files/base-misc-unit-multiplier.xml": {
+    "parent_hpxml": "sample_files/base.xml",
+    "unit_multiplier": "10"
+  },
   "sample_files/base-misc-usage-multiplier.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "water_fixtures_usage_multiplier": 0.9,
@@ -3111,7 +2770,7 @@
     "dishwasher_usage_multiplier": 0.9,
     "refrigerator_usage_multiplier": 0.9,
     "freezer_present": true,
-    "freezer_location": "living space",
+    "freezer_location": "conditioned space",
     "freezer_rated_annual_kwh": 300,
     "freezer_usage_multiplier": 0.9,
     "cooking_range_oven_usage_multiplier": 0.9,
@@ -3136,17 +2795,46 @@
     "pool_heater_type": "gas fired",
     "pool_heater_annual_therm": 500,
     "pool_heater_usage_multiplier": 0.9,
-    "hot_tub_present": true,
-    "hot_tub_pump_annual_kwh": 1000,
-    "hot_tub_pump_usage_multiplier": 0.9,
-    "hot_tub_heater_type": "electric resistance",
-    "hot_tub_heater_annual_kwh": 1300,
-    "hot_tub_heater_usage_multiplier": 0.9
+    "permanent_spa_present": true,
+    "permanent_spa_pump_annual_kwh": 1000,
+    "permanent_spa_pump_usage_multiplier": 0.9,
+    "permanent_spa_heater_type": "electric resistance",
+    "permanent_spa_heater_annual_kwh": 1300,
+    "permanent_spa_heater_usage_multiplier": 0.9
   },
-  "sample_files/base-multiple-buildings.xml": {
+  "sample_files/base-multiple-sfd-buildings.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "clothes_dryer_present": false
   },
+  "sample_files/base-multiple-mf-units.xml": {
+    "parent_hpxml": "sample_files/base.xml",
+    "geometry_unit_type": "apartment unit",
+    "geometry_unit_right_wall_is_adiabatic": true,
+    "geometry_unit_cfa": 1200,
+    "geometry_unit_aspect_ratio": 0.75,
+    "geometry_building_num_units": 6,
+    "floor_over_foundation_assembly_r": 22.84,
+    "air_leakage_type": "unit exterior only",
+    "air_leakage_units": "ACHnatural",
+    "air_leakage_value": 0.375,
+    "window_front_wwr": 0.18,
+    "window_back_wwr": 0.18,
+    "window_left_wwr": 0.18,
+    "window_right_wwr": 0.18,
+    "window_area_front": 0,
+    "window_area_back": 0,
+    "window_area_left": 0,
+    "window_area_right": 0,
+    "door_area": 20,
+    "cooling_system_type": "room air conditioner",
+    "cooling_system_cooling_efficiency_type": "EER",
+    "cooling_system_cooling_efficiency": 8.5,
+    "cooling_system_cooling_capacity": 12000,
+    "heating_system_type": "ElectricResistance",
+    "heating_system_fuel": "electricity",
+    "heating_system_heating_efficiency": 1,
+    "heating_system_heating_capacity": 12000
+  },
   "sample_files/base-pv.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "pv_system_present": true,
@@ -3261,8 +2949,8 @@
     "misc_fuel_loads_fireplace_annual_therm": null,
     "pool_pump_annual_kwh": null,
     "pool_heater_annual_therm": null,
-    "hot_tub_pump_annual_kwh": null,
-    "hot_tub_heater_annual_kwh": null
+    "permanent_spa_pump_annual_kwh": null,
+    "permanent_spa_heater_annual_kwh": null
   },
   "sample_files/base-residents-1-misc-loads-large-uncommon2.xml": {
     "parent_hpxml": "sample_files/base-misc-loads-large-uncommon2.xml",
@@ -3276,8 +2964,8 @@
     "misc_fuel_loads_fireplace_annual_therm": null,
     "pool_pump_annual_kwh": null,
     "pool_heater_annual_therm": null,
-    "hot_tub_pump_annual_kwh": null,
-    "hot_tub_heater_annual_kwh": null
+    "permanent_spa_pump_annual_kwh": null,
+    "permanent_spa_heater_annual_kwh": null
   },
   "sample_files/base-residents-5.xml": {
     "parent_hpxml": "sample_files/base-misc-defaults.xml",
@@ -3290,24 +2978,10 @@
     "parent_hpxml": "sample_files/base.xml",
     "schedules_vacancy_period": "Dec 1 - Jan 31"
   },
-  "sample_files/base-schedules-simple-vacancy-year-round.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "schedules_vacancy_period": "Jan 1 - Dec 31"
-  },
   "sample_files/base-schedules-simple-power-outage.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "schedules_power_outage_period": "Jul 1 5 - Jul 31 14"
   },
-  "sample_files/base-schedules-simple-power-outage-natvent-available.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "schedules_power_outage_period": "Jul 1 5 - Jul 31 14",
-    "schedules_power_outage_window_natvent_availability": "always available"
-  },
-  "sample_files/base-schedules-simple-power-outage-natvent-unavailable.xml": {
-    "parent_hpxml": "sample_files/base.xml",
-    "schedules_power_outage_period": "Jul 1 5 - Jul 31 14",
-    "schedules_power_outage_window_natvent_availability": "always unavailable"
-  },
   "sample_files/base-schedules-detailed-all-10-mins.xml": {
     "parent_hpxml": "sample_files/base-simcontrol-timestep-10-mins.xml",
     "hvac_control_heating_weekday_setpoint": null,
@@ -3317,6 +2991,19 @@
     "water_heater_setpoint_temperature": null,
     "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-10-mins.csv, ../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints-10-mins.csv, ../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic-10-mins.csv"
   },
+  "sample_files/base-schedules-detailed-mixed-timesteps.xml": {
+    "parent_hpxml": "sample_files/base-simcontrol-timestep-10-mins.xml",
+    "hvac_control_heating_weekday_setpoint": null,
+    "hvac_control_heating_weekend_setpoint": null,
+    "hvac_control_cooling_weekday_setpoint": null,
+    "hvac_control_cooling_weekend_setpoint": null,
+    "water_heater_setpoint_temperature": null,
+    "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/setpoints.csv, ../../HPXMLtoOpenStudio/resources/schedule_files/water-heater-setpoints-10-mins.csv, ../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic-30-mins.csv"
+  },
+  "sample_files/base-schedules-detailed-mixed-timesteps-power-outage.xml": {
+    "parent_hpxml": "sample_files/base-schedules-detailed-mixed-timesteps.xml",
+    "schedules_power_outage_period": "Dec 1 5 - Jan 31 14"
+  },
   "sample_files/base-schedules-detailed-occupancy-stochastic.xml": {
     "parent_hpxml": "sample_files/base.xml",
     "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic.csv"
@@ -3325,10 +3012,6 @@
     "parent_hpxml": "sample_files/base-schedules-detailed-occupancy-stochastic.xml",
     "schedules_vacancy_period": "Dec 1 - Jan 31"
   },
-  "sample_files/base-schedules-detailed-occupancy-stochastic-vacancy-year-round.xml": {
-    "parent_hpxml": "sample_files/base-schedules-detailed-occupancy-stochastic.xml",
-    "schedules_vacancy_period": "Jan 1 - Dec 31"
-  },
   "sample_files/base-schedules-detailed-occupancy-stochastic-power-outage.xml": {
     "parent_hpxml": "sample_files/base-schedules-detailed-occupancy-stochastic.xml",
     "schedules_power_outage_period": "Dec 1 5 - Jan 31 14"