urbanopt-cli 0.4.1 → 0.6.1

data/example_files/resources/hpxml-measures/BuildResidentialHPXML/tests/base-dhw-recirc-temperature.osw

@@ -6,66 +6,58 @@
     {
       "arguments": {
         "air_leakage_house_pressure": 50,
-        "air_leakage_shelter_coefficient": "auto",
+        "air_leakage_shielding_of_home": "auto",
         "air_leakage_units": "ACH",
         "air_leakage_value": 3,
-        "bathroom_fans_present": false,
+        "bathroom_fans_quantity": "0",
         "ceiling_assembly_r": 39.3,
         "ceiling_fan_cooling_setpoint_temp_offset": 0,
         "ceiling_fan_efficiency": "auto",
         "ceiling_fan_present": false,
         "ceiling_fan_quantity": "auto",
-        "clothes_dryer_control_type": "timer",
-        "clothes_dryer_efficiency_cef": "3.73",
-        "clothes_dryer_efficiency_ef": 3.4615,
+        "clothes_dryer_efficiency": "3.73",
         "clothes_dryer_efficiency_type": "CombinedEnergyFactor",
         "clothes_dryer_fuel_type": "electricity",
         "clothes_dryer_location": "living space",
-        "clothes_dryer_present": true,
         "clothes_dryer_usage_multiplier": 1.0,
         "clothes_dryer_vented_flow_rate": "150.0",
         "clothes_washer_capacity": "3.2",
-        "clothes_washer_efficiency_imef": "1.21",
-        "clothes_washer_efficiency_mef": "1.453",
+        "clothes_washer_efficiency": "1.21",
         "clothes_washer_efficiency_type": "IntegratedModifiedEnergyFactor",
         "clothes_washer_label_annual_gas_cost": "27.0",
         "clothes_washer_label_electric_rate": "0.12",
         "clothes_washer_label_gas_rate": "1.09",
         "clothes_washer_label_usage": "6.0",
         "clothes_washer_location": "living space",
-        "clothes_washer_present": true,
         "clothes_washer_rated_annual_kwh": "380.0",
         "clothes_washer_usage_multiplier": 1.0,
         "cooking_range_oven_fuel_type": "electricity",
         "cooking_range_oven_is_convection": false,
         "cooking_range_oven_is_induction": false,
         "cooking_range_oven_location": "living space",
-        "cooking_range_oven_present": true,
         "cooking_range_oven_usage_multiplier": 1.0,
-        "cooling_system_cooling_capacity": "48000.0",
+        "cooling_system_cooling_capacity": "24000.0",
         "cooling_system_cooling_compressor_type": "single stage",
-        "cooling_system_cooling_efficiency_eer": 8.5,
-        "cooling_system_cooling_efficiency_seer": 13.0,
+        "cooling_system_cooling_efficiency": 13.0,
+        "cooling_system_cooling_efficiency_type": "SEER",
         "cooling_system_cooling_sensible_heat_fraction": 0.73,
         "cooling_system_fraction_cool_load_served": 1,
         "cooling_system_is_ducted": false,
         "cooling_system_type": "central air conditioner",
         "dehumidifier_capacity": 40,
-        "dehumidifier_efficiency_ef": 1.8,
-        "dehumidifier_efficiency_ief": 1.5,
+        "dehumidifier_efficiency": 1.8,
         "dehumidifier_efficiency_type": "EnergyFactor",
         "dehumidifier_fraction_dehumidification_load_served": 1,
-        "dehumidifier_present": false,
         "dehumidifier_rh_setpoint": 0.5,
-        "dhw_distribution_pipe_r": 0.0,
+        "dehumidifier_type": "none",
+        "dhw_distribution_pipe_r": "0.0",
         "dhw_distribution_recirc_branch_piping_length": "50",
         "dhw_distribution_recirc_control_type": "temperature",
         "dhw_distribution_recirc_piping_length": "50",
         "dhw_distribution_recirc_pump_power": "50",
         "dhw_distribution_standard_piping_length": "50",
         "dhw_distribution_system_type": "Recirculation",
-        "dishwasher_efficiency_ef": 0.46,
-        "dishwasher_efficiency_kwh": "307",
+        "dishwasher_efficiency": "307",
         "dishwasher_efficiency_type": "RatedAnnualkWh",
         "dishwasher_label_annual_gas_cost": "22.32",
         "dishwasher_label_electric_rate": "0.12",
@@ -73,11 +65,10 @@
         "dishwasher_label_usage": "4.0",
         "dishwasher_location": "living space",
         "dishwasher_place_setting_capacity": "12",
-        "dishwasher_present": true,
         "dishwasher_usage_multiplier": 1.0,
         "door_area": 80.0,
         "door_rvalue": 4.4,
-        "ducts_number_of_return_registers": "auto",
+        "ducts_number_of_return_registers": "2",
         "ducts_return_insulation_r": 0.0,
         "ducts_return_leakage_units": "CFM25",
         "ducts_return_leakage_value": 25.0,
@@ -91,33 +82,31 @@
         "dwhr_efficiency": 0.55,
         "dwhr_equal_flow": true,
         "dwhr_facilities_connected": "none",
-        "extra_refrigerator_location": "auto",
-        "extra_refrigerator_present": false,
+        "extra_refrigerator_location": "none",
         "extra_refrigerator_rated_annual_kwh": "auto",
         "extra_refrigerator_usage_multiplier": 1.0,
         "floor_assembly_r": 0,
-        "foundation_wall_insulation_distance_to_bottom": 8.0,
+        "foundation_wall_insulation_distance_to_bottom": "auto",
         "foundation_wall_insulation_distance_to_top": 0.0,
         "foundation_wall_insulation_r": 8.9,
-        "freezer_location": "auto",
-        "freezer_present": false,
+        "foundation_wall_thickness": "8.0",
+        "freezer_location": "none",
         "freezer_rated_annual_kwh": "auto",
         "freezer_usage_multiplier": 1.0,
         "fuel_loads_fireplace_annual_therm": "auto",
+        "fuel_loads_fireplace_frac_latent": "auto",
+        "fuel_loads_fireplace_frac_sensible": "auto",
         "fuel_loads_fireplace_fuel_type": "natural gas",
-        "fuel_loads_fireplace_location": "auto",
         "fuel_loads_fireplace_present": false,
-        "fuel_loads_fireplace_usage_multiplier": 1.0,
+        "fuel_loads_fireplace_usage_multiplier": 0.0,
         "fuel_loads_grill_annual_therm": "auto",
         "fuel_loads_grill_fuel_type": "natural gas",
-        "fuel_loads_grill_location": "auto",
         "fuel_loads_grill_present": false,
-        "fuel_loads_grill_usage_multiplier": 1.0,
+        "fuel_loads_grill_usage_multiplier": 0.0,
         "fuel_loads_lighting_annual_therm": "auto",
         "fuel_loads_lighting_fuel_type": "natural gas",
-        "fuel_loads_lighting_location": "auto",
         "fuel_loads_lighting_present": false,
-        "fuel_loads_lighting_usage_multiplier": 1.0,
+        "fuel_loads_lighting_usage_multiplier": 0.0,
         "geometry_aspect_ratio": 1.5,
         "geometry_attic_type": "UnventedAttic",
         "geometry_balcony_depth": 0.0,
@@ -132,6 +121,7 @@
         "geometry_garage_position": "Right",
         "geometry_garage_protrusion": 0.0,
         "geometry_garage_width": 0.0,
+        "geometry_has_flue_or_chimney": "auto",
         "geometry_inset_depth": 0.0,
         "geometry_inset_position": "Right",
         "geometry_inset_width": 0.0,
@@ -140,35 +130,31 @@
         "geometry_num_floors_above_grade": 1,
         "geometry_num_occupants": "3",
         "geometry_orientation": 180.0,
+        "geometry_rim_joist_height": 9.25,
         "geometry_roof_pitch": "6:12",
-        "geometry_roof_structure": "truss, cantilever",
         "geometry_roof_type": "gable",
         "geometry_unit_type": "single-family detached",
         "geometry_wall_height": 8.0,
         "heat_pump_backup_fuel": "none",
-        "heat_pump_backup_heating_capacity": "34121.0",
+        "heat_pump_backup_heating_capacity": "36000.0",
         "heat_pump_backup_heating_efficiency": 1,
-        "heat_pump_cooling_capacity": "48000.0",
+        "heat_pump_cooling_capacity": "36000.0",
         "heat_pump_cooling_compressor_type": "single stage",
-        "heat_pump_cooling_efficiency_eer": 16.6,
-        "heat_pump_cooling_efficiency_seer": 13.0,
+        "heat_pump_cooling_efficiency": 13.0,
+        "heat_pump_cooling_efficiency_type": "SEER",
         "heat_pump_cooling_sensible_heat_fraction": 0.73,
         "heat_pump_fraction_cool_load_served": 1,
         "heat_pump_fraction_heat_load_served": 1,
-        "heat_pump_heating_capacity": "64000.0",
-        "heat_pump_heating_capacity_17F": "auto",
-        "heat_pump_heating_efficiency_cop": 3.6,
-        "heat_pump_heating_efficiency_hspf": 7.7,
+        "heat_pump_heating_capacity": "36000.0",
+        "heat_pump_heating_capacity_17_f": "auto",
+        "heat_pump_heating_efficiency": 7.7,
+        "heat_pump_heating_efficiency_type": "HSPF",
         "heat_pump_type": "none",
-        "heating_system_electric_auxiliary_energy": 0,
-        "heating_system_electric_auxiliary_energy_2": 0,
         "heating_system_fraction_heat_load_served": 1,
         "heating_system_fraction_heat_load_served_2": 0.25,
         "heating_system_fuel": "natural gas",
         "heating_system_fuel_2": "electricity",
-        "heating_system_has_flue_or_chimney": false,
-        "heating_system_has_flue_or_chimney_2": false,
-        "heating_system_heating_capacity": "64000.0",
+        "heating_system_heating_capacity": "36000.0",
         "heating_system_heating_capacity_2": "auto",
         "heating_system_heating_efficiency": 0.92,
         "heating_system_heating_efficiency_2": 1.0,
@@ -188,7 +174,7 @@
         "hot_tub_pump_annual_kwh": "auto",
         "hot_tub_pump_usage_multiplier": 1.0,
         "hpxml_path": "../BuildResidentialHPXML/tests/built_residential_hpxml/base-dhw-recirc-temperature.xml",
-        "kitchen_fans_present": false,
+        "kitchen_fans_quantity": "0",
         "lighting_fraction_cfl_exterior": 0.4,
         "lighting_fraction_cfl_garage": 0.4,
         "lighting_fraction_cfl_interior": 0.4,
@@ -209,15 +195,13 @@
         "mech_vent_flow_rate_2": 110,
         "mech_vent_hours_in_operation": 24,
         "mech_vent_hours_in_operation_2": 24,
-        "mech_vent_is_shared_system": false,
+        "mech_vent_num_units_served": 1,
+        "mech_vent_recovery_efficiency_type": "Unadjusted",
+        "mech_vent_recovery_efficiency_type_2": "Unadjusted",
         "mech_vent_sensible_recovery_efficiency": 0.72,
         "mech_vent_sensible_recovery_efficiency_2": 0.72,
-        "mech_vent_sensible_recovery_efficiency_type": "Unadjusted",
-        "mech_vent_sensible_recovery_efficiency_type_2": "Unadjusted",
         "mech_vent_total_recovery_efficiency": 0.48,
         "mech_vent_total_recovery_efficiency_2": 0.48,
-        "mech_vent_total_recovery_efficiency_type": "Unadjusted",
-        "mech_vent_total_recovery_efficiency_type_2": "Unadjusted",
         "neighbor_back_distance": 0,
         "neighbor_back_height": "auto",
         "neighbor_front_distance": 0,
@@ -242,10 +226,10 @@
         "plug_loads_television_usage_multiplier": 1.0,
         "plug_loads_vehicle_annual_kwh": "auto",
         "plug_loads_vehicle_present": false,
-        "plug_loads_vehicle_usage_multiplier": 1.0,
+        "plug_loads_vehicle_usage_multiplier": 0.0,
         "plug_loads_well_pump_annual_kwh": "auto",
         "plug_loads_well_pump_present": false,
-        "plug_loads_well_pump_usage_multiplier": 1.0,
+        "plug_loads_well_pump_usage_multiplier": 0.0,
         "pool_heater_annual_kwh": "auto",
         "pool_heater_annual_therm": "auto",
         "pool_heater_type": "electric resistance",
@@ -259,38 +243,32 @@
         "pv_system_array_tilt_2": "20",
         "pv_system_inverter_efficiency_1": 0.96,
         "pv_system_inverter_efficiency_2": 0.96,
-        "pv_system_is_shared_1": false,
-        "pv_system_is_shared_2": false,
-        "pv_system_location_1": "roof",
-        "pv_system_location_2": "roof",
+        "pv_system_location_1": "auto",
+        "pv_system_location_2": "auto",
         "pv_system_max_power_output_1": 4000,
         "pv_system_max_power_output_2": 4000,
         "pv_system_module_type_1": "none",
         "pv_system_module_type_2": "none",
+        "pv_system_num_units_served_1": 1,
+        "pv_system_num_units_served_2": 1,
         "pv_system_system_losses_fraction_1": 0.14,
         "pv_system_system_losses_fraction_2": 0.14,
-        "pv_system_tracking_1": "fixed",
-        "pv_system_tracking_2": "fixed",
+        "pv_system_tracking_1": "auto",
+        "pv_system_tracking_2": "auto",
         "refrigerator_location": "living space",
-        "refrigerator_present": true,
         "refrigerator_rated_annual_kwh": "650.0",
         "refrigerator_usage_multiplier": 1.0,
+        "rim_joist_assembly_r": 23.0,
         "roof_assembly_r": 2.3,
-        "roof_color": "auto",
-        "roof_emittance": 0.92,
+        "roof_color": "medium",
         "roof_material_type": "asphalt or fiberglass shingles",
         "roof_radiant_barrier": false,
         "roof_radiant_barrier_grade": "1",
-        "roof_solar_absorptance": "auto",
         "schedules_type": "default",
-        "setpoint_cooling_setup_hours_per_week": 0,
-        "setpoint_cooling_setup_start_hour": 0,
-        "setpoint_cooling_setup_temp": 78,
-        "setpoint_cooling_temp": 78,
-        "setpoint_heating_setback_hours_per_week": 0,
-        "setpoint_heating_setback_start_hour": 0,
-        "setpoint_heating_setback_temp": 68,
-        "setpoint_heating_temp": 68,
+        "setpoint_cooling_weekday": "78",
+        "setpoint_cooling_weekend": "78",
+        "setpoint_heating_weekday": "68",
+        "setpoint_heating_weekend": "68",
         "simulation_control_timestep": "60",
         "site_type": "suburban",
         "skylight_area_back": 0,
@@ -299,10 +277,11 @@
         "skylight_area_right": 0,
         "skylight_shgc": 0.45,
         "skylight_ufactor": 0.33,
-        "slab_carpet_fraction": 0.0,
-        "slab_carpet_r": 0.0,
+        "slab_carpet_fraction": "0.0",
+        "slab_carpet_r": "0.0",
         "slab_perimeter_depth": 0,
         "slab_perimeter_insulation_r": 0,
+        "slab_thickness": "4.0",
         "slab_under_insulation_r": 0,
         "slab_under_width": 0,
         "solar_thermal_collector_area": 40.0,
@@ -316,23 +295,18 @@
         "solar_thermal_storage_volume": "auto",
         "solar_thermal_system_type": "none",
         "wall_assembly_r": 23,
-        "wall_color": "auto",
-        "wall_emittance": 0.92,
+        "wall_color": "medium",
         "wall_siding_type": "wood siding",
-        "wall_solar_absorptance": "auto",
         "wall_type": "WoodStud",
         "water_fixtures_shower_low_flow": true,
         "water_fixtures_sink_low_flow": false,
         "water_fixtures_usage_multiplier": 1.0,
-        "water_heater_efficiency_ef": 0.95,
+        "water_heater_efficiency": 0.95,
         "water_heater_efficiency_type": "EnergyFactor",
-        "water_heater_efficiency_uef": 0.93,
         "water_heater_fuel_type": "electricity",
-        "water_heater_has_flue_or_chimney": false,
-        "water_heater_heating_capacity": "18767",
-        "water_heater_is_shared_system": false,
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "living space",
+        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": "0.76",
         "water_heater_setpoint_temperature": "125",
         "water_heater_standby_loss": 0,

data/example_files/resources/hpxml-measures/BuildResidentialHPXML/tests/base-dhw-recirc-timer.osw

@@ -6,66 +6,58 @@
     {
       "arguments": {
         "air_leakage_house_pressure": 50,
-        "air_leakage_shelter_coefficient": "auto",
+        "air_leakage_shielding_of_home": "auto",
         "air_leakage_units": "ACH",
         "air_leakage_value": 3,
-        "bathroom_fans_present": false,
+        "bathroom_fans_quantity": "0",
         "ceiling_assembly_r": 39.3,
         "ceiling_fan_cooling_setpoint_temp_offset": 0,
         "ceiling_fan_efficiency": "auto",
         "ceiling_fan_present": false,
         "ceiling_fan_quantity": "auto",
-        "clothes_dryer_control_type": "timer",
-        "clothes_dryer_efficiency_cef": "3.73",
-        "clothes_dryer_efficiency_ef": 3.4615,
+        "clothes_dryer_efficiency": "3.73",
         "clothes_dryer_efficiency_type": "CombinedEnergyFactor",
         "clothes_dryer_fuel_type": "electricity",
         "clothes_dryer_location": "living space",
-        "clothes_dryer_present": true,
         "clothes_dryer_usage_multiplier": 1.0,
         "clothes_dryer_vented_flow_rate": "150.0",
         "clothes_washer_capacity": "3.2",
-        "clothes_washer_efficiency_imef": "1.21",
-        "clothes_washer_efficiency_mef": "1.453",
+        "clothes_washer_efficiency": "1.21",
         "clothes_washer_efficiency_type": "IntegratedModifiedEnergyFactor",
         "clothes_washer_label_annual_gas_cost": "27.0",
         "clothes_washer_label_electric_rate": "0.12",
         "clothes_washer_label_gas_rate": "1.09",
         "clothes_washer_label_usage": "6.0",
         "clothes_washer_location": "living space",
-        "clothes_washer_present": true,
         "clothes_washer_rated_annual_kwh": "380.0",
         "clothes_washer_usage_multiplier": 1.0,
         "cooking_range_oven_fuel_type": "electricity",
         "cooking_range_oven_is_convection": false,
         "cooking_range_oven_is_induction": false,
         "cooking_range_oven_location": "living space",
-        "cooking_range_oven_present": true,
         "cooking_range_oven_usage_multiplier": 1.0,
-        "cooling_system_cooling_capacity": "48000.0",
+        "cooling_system_cooling_capacity": "24000.0",
         "cooling_system_cooling_compressor_type": "single stage",
-        "cooling_system_cooling_efficiency_eer": 8.5,
-        "cooling_system_cooling_efficiency_seer": 13.0,
+        "cooling_system_cooling_efficiency": 13.0,
+        "cooling_system_cooling_efficiency_type": "SEER",
         "cooling_system_cooling_sensible_heat_fraction": 0.73,
         "cooling_system_fraction_cool_load_served": 1,
         "cooling_system_is_ducted": false,
         "cooling_system_type": "central air conditioner",
         "dehumidifier_capacity": 40,
-        "dehumidifier_efficiency_ef": 1.8,
-        "dehumidifier_efficiency_ief": 1.5,
+        "dehumidifier_efficiency": 1.8,
         "dehumidifier_efficiency_type": "EnergyFactor",
         "dehumidifier_fraction_dehumidification_load_served": 1,
-        "dehumidifier_present": false,
         "dehumidifier_rh_setpoint": 0.5,
-        "dhw_distribution_pipe_r": 0.0,
+        "dehumidifier_type": "none",
+        "dhw_distribution_pipe_r": "0.0",
         "dhw_distribution_recirc_branch_piping_length": "50",
         "dhw_distribution_recirc_control_type": "timer",
         "dhw_distribution_recirc_piping_length": "50",
         "dhw_distribution_recirc_pump_power": "50",
         "dhw_distribution_standard_piping_length": "50",
         "dhw_distribution_system_type": "Recirculation",
-        "dishwasher_efficiency_ef": 0.46,
-        "dishwasher_efficiency_kwh": "307",
+        "dishwasher_efficiency": "307",
         "dishwasher_efficiency_type": "RatedAnnualkWh",
         "dishwasher_label_annual_gas_cost": "22.32",
         "dishwasher_label_electric_rate": "0.12",
@@ -73,11 +65,10 @@
         "dishwasher_label_usage": "4.0",
         "dishwasher_location": "living space",
         "dishwasher_place_setting_capacity": "12",
-        "dishwasher_present": true,
         "dishwasher_usage_multiplier": 1.0,
         "door_area": 80.0,
         "door_rvalue": 4.4,
-        "ducts_number_of_return_registers": "auto",
+        "ducts_number_of_return_registers": "2",
         "ducts_return_insulation_r": 0.0,
         "ducts_return_leakage_units": "CFM25",
         "ducts_return_leakage_value": 25.0,
@@ -91,33 +82,31 @@
         "dwhr_efficiency": 0.55,
         "dwhr_equal_flow": true,
         "dwhr_facilities_connected": "none",
-        "extra_refrigerator_location": "auto",
-        "extra_refrigerator_present": false,
+        "extra_refrigerator_location": "none",
         "extra_refrigerator_rated_annual_kwh": "auto",
         "extra_refrigerator_usage_multiplier": 1.0,
         "floor_assembly_r": 0,
-        "foundation_wall_insulation_distance_to_bottom": 8.0,
+        "foundation_wall_insulation_distance_to_bottom": "auto",
         "foundation_wall_insulation_distance_to_top": 0.0,
         "foundation_wall_insulation_r": 8.9,
-        "freezer_location": "auto",
-        "freezer_present": false,
+        "foundation_wall_thickness": "8.0",
+        "freezer_location": "none",
         "freezer_rated_annual_kwh": "auto",
         "freezer_usage_multiplier": 1.0,
         "fuel_loads_fireplace_annual_therm": "auto",
+        "fuel_loads_fireplace_frac_latent": "auto",
+        "fuel_loads_fireplace_frac_sensible": "auto",
         "fuel_loads_fireplace_fuel_type": "natural gas",
-        "fuel_loads_fireplace_location": "auto",
         "fuel_loads_fireplace_present": false,
-        "fuel_loads_fireplace_usage_multiplier": 1.0,
+        "fuel_loads_fireplace_usage_multiplier": 0.0,
         "fuel_loads_grill_annual_therm": "auto",
         "fuel_loads_grill_fuel_type": "natural gas",
-        "fuel_loads_grill_location": "auto",
         "fuel_loads_grill_present": false,
-        "fuel_loads_grill_usage_multiplier": 1.0,
+        "fuel_loads_grill_usage_multiplier": 0.0,
         "fuel_loads_lighting_annual_therm": "auto",
         "fuel_loads_lighting_fuel_type": "natural gas",
-        "fuel_loads_lighting_location": "auto",
         "fuel_loads_lighting_present": false,
-        "fuel_loads_lighting_usage_multiplier": 1.0,
+        "fuel_loads_lighting_usage_multiplier": 0.0,
         "geometry_aspect_ratio": 1.5,
         "geometry_attic_type": "UnventedAttic",
         "geometry_balcony_depth": 0.0,
@@ -132,6 +121,7 @@
         "geometry_garage_position": "Right",
         "geometry_garage_protrusion": 0.0,
         "geometry_garage_width": 0.0,
+        "geometry_has_flue_or_chimney": "auto",
         "geometry_inset_depth": 0.0,
         "geometry_inset_position": "Right",
         "geometry_inset_width": 0.0,
@@ -140,35 +130,31 @@
         "geometry_num_floors_above_grade": 1,
         "geometry_num_occupants": "3",
         "geometry_orientation": 180.0,
+        "geometry_rim_joist_height": 9.25,
         "geometry_roof_pitch": "6:12",
-        "geometry_roof_structure": "truss, cantilever",
         "geometry_roof_type": "gable",
         "geometry_unit_type": "single-family detached",
         "geometry_wall_height": 8.0,
         "heat_pump_backup_fuel": "none",
-        "heat_pump_backup_heating_capacity": "34121.0",
+        "heat_pump_backup_heating_capacity": "36000.0",
         "heat_pump_backup_heating_efficiency": 1,
-        "heat_pump_cooling_capacity": "48000.0",
+        "heat_pump_cooling_capacity": "36000.0",
         "heat_pump_cooling_compressor_type": "single stage",
-        "heat_pump_cooling_efficiency_eer": 16.6,
-        "heat_pump_cooling_efficiency_seer": 13.0,
+        "heat_pump_cooling_efficiency": 13.0,
+        "heat_pump_cooling_efficiency_type": "SEER",
         "heat_pump_cooling_sensible_heat_fraction": 0.73,
         "heat_pump_fraction_cool_load_served": 1,
         "heat_pump_fraction_heat_load_served": 1,
-        "heat_pump_heating_capacity": "64000.0",
-        "heat_pump_heating_capacity_17F": "auto",
-        "heat_pump_heating_efficiency_cop": 3.6,
-        "heat_pump_heating_efficiency_hspf": 7.7,
+        "heat_pump_heating_capacity": "36000.0",
+        "heat_pump_heating_capacity_17_f": "auto",
+        "heat_pump_heating_efficiency": 7.7,
+        "heat_pump_heating_efficiency_type": "HSPF",
         "heat_pump_type": "none",
-        "heating_system_electric_auxiliary_energy": 0,
-        "heating_system_electric_auxiliary_energy_2": 0,
         "heating_system_fraction_heat_load_served": 1,
         "heating_system_fraction_heat_load_served_2": 0.25,
         "heating_system_fuel": "natural gas",
         "heating_system_fuel_2": "electricity",
-        "heating_system_has_flue_or_chimney": false,
-        "heating_system_has_flue_or_chimney_2": false,
-        "heating_system_heating_capacity": "64000.0",
+        "heating_system_heating_capacity": "36000.0",
         "heating_system_heating_capacity_2": "auto",
         "heating_system_heating_efficiency": 0.92,
         "heating_system_heating_efficiency_2": 1.0,
@@ -188,7 +174,7 @@
         "hot_tub_pump_annual_kwh": "auto",
         "hot_tub_pump_usage_multiplier": 1.0,
         "hpxml_path": "../BuildResidentialHPXML/tests/built_residential_hpxml/base-dhw-recirc-timer.xml",
-        "kitchen_fans_present": false,
+        "kitchen_fans_quantity": "0",
         "lighting_fraction_cfl_exterior": 0.4,
         "lighting_fraction_cfl_garage": 0.4,
         "lighting_fraction_cfl_interior": 0.4,
@@ -209,15 +195,13 @@
         "mech_vent_flow_rate_2": 110,
         "mech_vent_hours_in_operation": 24,
         "mech_vent_hours_in_operation_2": 24,
-        "mech_vent_is_shared_system": false,
+        "mech_vent_num_units_served": 1,
+        "mech_vent_recovery_efficiency_type": "Unadjusted",
+        "mech_vent_recovery_efficiency_type_2": "Unadjusted",
         "mech_vent_sensible_recovery_efficiency": 0.72,
         "mech_vent_sensible_recovery_efficiency_2": 0.72,
-        "mech_vent_sensible_recovery_efficiency_type": "Unadjusted",
-        "mech_vent_sensible_recovery_efficiency_type_2": "Unadjusted",
         "mech_vent_total_recovery_efficiency": 0.48,
         "mech_vent_total_recovery_efficiency_2": 0.48,
-        "mech_vent_total_recovery_efficiency_type": "Unadjusted",
-        "mech_vent_total_recovery_efficiency_type_2": "Unadjusted",
         "neighbor_back_distance": 0,
         "neighbor_back_height": "auto",
         "neighbor_front_distance": 0,
@@ -242,10 +226,10 @@
         "plug_loads_television_usage_multiplier": 1.0,
         "plug_loads_vehicle_annual_kwh": "auto",
         "plug_loads_vehicle_present": false,
-        "plug_loads_vehicle_usage_multiplier": 1.0,
+        "plug_loads_vehicle_usage_multiplier": 0.0,
         "plug_loads_well_pump_annual_kwh": "auto",
         "plug_loads_well_pump_present": false,
-        "plug_loads_well_pump_usage_multiplier": 1.0,
+        "plug_loads_well_pump_usage_multiplier": 0.0,
         "pool_heater_annual_kwh": "auto",
         "pool_heater_annual_therm": "auto",
         "pool_heater_type": "electric resistance",
@@ -259,38 +243,32 @@
         "pv_system_array_tilt_2": "20",
         "pv_system_inverter_efficiency_1": 0.96,
         "pv_system_inverter_efficiency_2": 0.96,
-        "pv_system_is_shared_1": false,
-        "pv_system_is_shared_2": false,
-        "pv_system_location_1": "roof",
-        "pv_system_location_2": "roof",
+        "pv_system_location_1": "auto",
+        "pv_system_location_2": "auto",
         "pv_system_max_power_output_1": 4000,
         "pv_system_max_power_output_2": 4000,
         "pv_system_module_type_1": "none",
         "pv_system_module_type_2": "none",
+        "pv_system_num_units_served_1": 1,
+        "pv_system_num_units_served_2": 1,
         "pv_system_system_losses_fraction_1": 0.14,
         "pv_system_system_losses_fraction_2": 0.14,
-        "pv_system_tracking_1": "fixed",
-        "pv_system_tracking_2": "fixed",
+        "pv_system_tracking_1": "auto",
+        "pv_system_tracking_2": "auto",
         "refrigerator_location": "living space",
-        "refrigerator_present": true,
         "refrigerator_rated_annual_kwh": "650.0",
         "refrigerator_usage_multiplier": 1.0,
+        "rim_joist_assembly_r": 23.0,
         "roof_assembly_r": 2.3,
-        "roof_color": "auto",
-        "roof_emittance": 0.92,
+        "roof_color": "medium",
         "roof_material_type": "asphalt or fiberglass shingles",
         "roof_radiant_barrier": false,
         "roof_radiant_barrier_grade": "1",
-        "roof_solar_absorptance": "auto",
         "schedules_type": "default",
-        "setpoint_cooling_setup_hours_per_week": 0,
-        "setpoint_cooling_setup_start_hour": 0,
-        "setpoint_cooling_setup_temp": 78,
-        "setpoint_cooling_temp": 78,
-        "setpoint_heating_setback_hours_per_week": 0,
-        "setpoint_heating_setback_start_hour": 0,
-        "setpoint_heating_setback_temp": 68,
-        "setpoint_heating_temp": 68,
+        "setpoint_cooling_weekday": "78",
+        "setpoint_cooling_weekend": "78",
+        "setpoint_heating_weekday": "68",
+        "setpoint_heating_weekend": "68",
         "simulation_control_timestep": "60",
         "site_type": "suburban",
         "skylight_area_back": 0,
@@ -299,10 +277,11 @@
         "skylight_area_right": 0,
         "skylight_shgc": 0.45,
         "skylight_ufactor": 0.33,
-        "slab_carpet_fraction": 0.0,
-        "slab_carpet_r": 0.0,
+        "slab_carpet_fraction": "0.0",
+        "slab_carpet_r": "0.0",
         "slab_perimeter_depth": 0,
         "slab_perimeter_insulation_r": 0,
+        "slab_thickness": "4.0",
         "slab_under_insulation_r": 0,
         "slab_under_width": 0,
         "solar_thermal_collector_area": 40.0,
@@ -316,23 +295,18 @@
         "solar_thermal_storage_volume": "auto",
         "solar_thermal_system_type": "none",
         "wall_assembly_r": 23,
-        "wall_color": "auto",
-        "wall_emittance": 0.92,
+        "wall_color": "medium",
         "wall_siding_type": "wood siding",
-        "wall_solar_absorptance": "auto",
         "wall_type": "WoodStud",
         "water_fixtures_shower_low_flow": true,
         "water_fixtures_sink_low_flow": false,
         "water_fixtures_usage_multiplier": 1.0,
-        "water_heater_efficiency_ef": 0.95,
+        "water_heater_efficiency": 0.95,
         "water_heater_efficiency_type": "EnergyFactor",
-        "water_heater_efficiency_uef": 0.93,
         "water_heater_fuel_type": "electricity",
-        "water_heater_has_flue_or_chimney": false,
-        "water_heater_heating_capacity": "18767",
-        "water_heater_is_shared_system": false,
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "living space",
+        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": "0.76",
         "water_heater_setpoint_temperature": "125",
         "water_heater_standby_loss": 0,