RubyGems - urbanopt-cli - Versions diffs - 0.4.1 → 0.5.0 - Mend

urbanopt-cli 0.4.1 → 0.5.0

Files changed (691) hide show

data/example_files/resources/hpxml-measures/BuildResidentialHPXML/tests/base-mechvent-exhaust.osw CHANGED

@@ -57,7 +57,8 @@
         "dehumidifier_fraction_dehumidification_load_served": 1,
         "dehumidifier_present": false,
         "dehumidifier_rh_setpoint": 0.5,
-        "dhw_distribution_pipe_r": 0.0,
+        "dehumidifier_type": "portable",
+        "dhw_distribution_pipe_r": "0.0",
         "dhw_distribution_recirc_branch_piping_length": "50",
         "dhw_distribution_recirc_control_type": "no control",
         "dhw_distribution_recirc_piping_length": "50",
@@ -99,25 +100,25 @@
         "foundation_wall_insulation_distance_to_bottom": 8.0,
         "foundation_wall_insulation_distance_to_top": 0.0,
         "foundation_wall_insulation_r": 8.9,
+        "foundation_wall_thickness": "8.0",
         "freezer_location": "auto",
         "freezer_present": false,
         "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,
@@ -141,7 +142,6 @@
         "geometry_num_occupants": "3",
         "geometry_orientation": 180.0,
         "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,
@@ -160,8 +160,6 @@
         "heat_pump_heating_efficiency_cop": 3.6,
         "heat_pump_heating_efficiency_hspf": 7.7,
         "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",
@@ -209,7 +207,7 @@
         "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_sensible_recovery_efficiency": 0.72,
         "mech_vent_sensible_recovery_efficiency_2": 0.72,
         "mech_vent_sensible_recovery_efficiency_type": "Unadjusted",
@@ -238,14 +236,18 @@
         "plug_loads_other_frac_latent": "0.045",
         "plug_loads_other_frac_sensible": "0.855",
         "plug_loads_other_usage_multiplier": 1.0,
+        "plug_loads_other_usage_multiplier_2": 1.0,
         "plug_loads_television_annual_kwh": "620.0",
         "plug_loads_television_usage_multiplier": 1.0,
+        "plug_loads_television_usage_multiplier_2": 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_vehicle_usage_multiplier_2": 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,
+        "plug_loads_well_pump_usage_multiplier_2": 0.0,
         "pool_heater_annual_kwh": "auto",
         "pool_heater_annual_therm": "auto",
         "pool_heater_type": "electric resistance",
@@ -259,38 +261,34 @@
         "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,
         "roof_assembly_r": 2.3,
         "roof_color": "auto",
-        "roof_emittance": 0.92,
+        "roof_emittance": "0.92",
         "roof_material_type": "asphalt or fiberglass shingles",
-        "roof_radiant_barrier": false,
+        "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_temp": 78,
+        "setpoint_cooling_weekend_temp": 78,
+        "setpoint_heating_weekday_temp": 68,
+        "setpoint_heating_weekend_temp": 68,
         "simulation_control_timestep": "60",
         "site_type": "suburban",
         "skylight_area_back": 0,
@@ -299,10 +297,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,
@@ -317,22 +316,21 @@
         "solar_thermal_system_type": "none",
         "wall_assembly_r": 23,
         "wall_color": "auto",
-        "wall_emittance": 0.92,
+        "wall_emittance": "0.92",
         "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-mechvent-hrv-asre.osw CHANGED

@@ -57,7 +57,8 @@
         "dehumidifier_fraction_dehumidification_load_served": 1,
         "dehumidifier_present": false,
         "dehumidifier_rh_setpoint": 0.5,
-        "dhw_distribution_pipe_r": 0.0,
+        "dehumidifier_type": "portable",
+        "dhw_distribution_pipe_r": "0.0",
         "dhw_distribution_recirc_branch_piping_length": "50",
         "dhw_distribution_recirc_control_type": "no control",
         "dhw_distribution_recirc_piping_length": "50",
@@ -99,25 +100,25 @@
         "foundation_wall_insulation_distance_to_bottom": 8.0,
         "foundation_wall_insulation_distance_to_top": 0.0,
         "foundation_wall_insulation_r": 8.9,
+        "foundation_wall_thickness": "8.0",
         "freezer_location": "auto",
         "freezer_present": false,
         "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,
@@ -141,7 +142,6 @@
         "geometry_num_occupants": "3",
         "geometry_orientation": 180.0,
         "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,
@@ -160,8 +160,6 @@
         "heat_pump_heating_efficiency_cop": 3.6,
         "heat_pump_heating_efficiency_hspf": 7.7,
         "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",
@@ -209,7 +207,7 @@
         "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_sensible_recovery_efficiency": 0.79,
         "mech_vent_sensible_recovery_efficiency_2": 0.72,
         "mech_vent_sensible_recovery_efficiency_type": "Adjusted",
@@ -238,14 +236,18 @@
         "plug_loads_other_frac_latent": "0.045",
         "plug_loads_other_frac_sensible": "0.855",
         "plug_loads_other_usage_multiplier": 1.0,
+        "plug_loads_other_usage_multiplier_2": 1.0,
         "plug_loads_television_annual_kwh": "620.0",
         "plug_loads_television_usage_multiplier": 1.0,
+        "plug_loads_television_usage_multiplier_2": 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_vehicle_usage_multiplier_2": 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,
+        "plug_loads_well_pump_usage_multiplier_2": 0.0,
         "pool_heater_annual_kwh": "auto",
         "pool_heater_annual_therm": "auto",
         "pool_heater_type": "electric resistance",
@@ -259,38 +261,34 @@
         "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,
         "roof_assembly_r": 2.3,
         "roof_color": "auto",
-        "roof_emittance": 0.92,
+        "roof_emittance": "0.92",
         "roof_material_type": "asphalt or fiberglass shingles",
-        "roof_radiant_barrier": false,
+        "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_temp": 78,
+        "setpoint_cooling_weekend_temp": 78,
+        "setpoint_heating_weekday_temp": 68,
+        "setpoint_heating_weekend_temp": 68,
         "simulation_control_timestep": "60",
         "site_type": "suburban",
         "skylight_area_back": 0,
@@ -299,10 +297,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,
@@ -317,22 +316,21 @@
         "solar_thermal_system_type": "none",
         "wall_assembly_r": 23,
         "wall_color": "auto",
-        "wall_emittance": 0.92,
+        "wall_emittance": "0.92",
         "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-mechvent-hrv.osw CHANGED

@@ -57,7 +57,8 @@
         "dehumidifier_fraction_dehumidification_load_served": 1,
         "dehumidifier_present": false,
         "dehumidifier_rh_setpoint": 0.5,
-        "dhw_distribution_pipe_r": 0.0,
+        "dehumidifier_type": "portable",
+        "dhw_distribution_pipe_r": "0.0",
         "dhw_distribution_recirc_branch_piping_length": "50",
         "dhw_distribution_recirc_control_type": "no control",
         "dhw_distribution_recirc_piping_length": "50",
@@ -99,25 +100,25 @@
         "foundation_wall_insulation_distance_to_bottom": 8.0,
         "foundation_wall_insulation_distance_to_top": 0.0,
         "foundation_wall_insulation_r": 8.9,
+        "foundation_wall_thickness": "8.0",
         "freezer_location": "auto",
         "freezer_present": false,
         "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,
@@ -141,7 +142,6 @@
         "geometry_num_occupants": "3",
         "geometry_orientation": 180.0,
         "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,
@@ -160,8 +160,6 @@
         "heat_pump_heating_efficiency_cop": 3.6,
         "heat_pump_heating_efficiency_hspf": 7.7,
         "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",
@@ -209,7 +207,7 @@
         "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_sensible_recovery_efficiency": 0.72,
         "mech_vent_sensible_recovery_efficiency_2": 0.72,
         "mech_vent_sensible_recovery_efficiency_type": "Unadjusted",
@@ -238,14 +236,18 @@
         "plug_loads_other_frac_latent": "0.045",
         "plug_loads_other_frac_sensible": "0.855",
         "plug_loads_other_usage_multiplier": 1.0,
+        "plug_loads_other_usage_multiplier_2": 1.0,
         "plug_loads_television_annual_kwh": "620.0",
         "plug_loads_television_usage_multiplier": 1.0,
+        "plug_loads_television_usage_multiplier_2": 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_vehicle_usage_multiplier_2": 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,
+        "plug_loads_well_pump_usage_multiplier_2": 0.0,
         "pool_heater_annual_kwh": "auto",
         "pool_heater_annual_therm": "auto",
         "pool_heater_type": "electric resistance",
@@ -259,38 +261,34 @@
         "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,
         "roof_assembly_r": 2.3,
         "roof_color": "auto",
-        "roof_emittance": 0.92,
+        "roof_emittance": "0.92",
         "roof_material_type": "asphalt or fiberglass shingles",
-        "roof_radiant_barrier": false,
+        "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_temp": 78,
+        "setpoint_cooling_weekend_temp": 78,
+        "setpoint_heating_weekday_temp": 68,
+        "setpoint_heating_weekend_temp": 68,
         "simulation_control_timestep": "60",
         "site_type": "suburban",
         "skylight_area_back": 0,
@@ -299,10 +297,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,
@@ -317,22 +316,21 @@
         "solar_thermal_system_type": "none",
         "wall_assembly_r": 23,
         "wall_color": "auto",
-        "wall_emittance": 0.92,
+        "wall_emittance": "0.92",
         "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,