Skip to content

Commit

Permalink
update test sys-param files to conform to newly tightened schema requ…
Browse files Browse the repository at this point in the history 
…irements
  • Loading branch information
@vtnate
vtnate committed Sep 26, 2024
1 parent d065442 commit f9db43a
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 27 deletions.
27 changes: 1 addition & 26 deletions ...k_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/sys_params_proportional.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -67,8 +65,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -106,8 +102,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -145,8 +139,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -184,8 +176,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -223,8 +213,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -262,8 +250,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -301,8 +287,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -340,8 +324,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -379,8 +361,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -418,8 +398,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -457,8 +435,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -496,8 +472,6 @@
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
"ets_pump_head": 10000,
"fan_design_flow_rate": 0.25,
Expand Down Expand Up @@ -606,6 +580,7 @@
]
},
"central_pump_parameters": {
"pump_flow_rate": 0.01,
"pump_design_head": 10000000
}
}
Expand Down
40 changes: 39 additions & 1 deletion tests/system_parameters/data/system_params_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,45 @@
"buildings": [
{
"geojson_id": "abcd1234",
"ets_model": "None"
"load_model": "time_series",
"load_model_parameters": {
"time_series": {
"filepath": "To be populated",
"delta_temp_air_cooling": 10,
"delta_temp_air_heating": 18,
"has_liquid_cooling": true,
"has_liquid_heating": true,
"has_electric_cooling": false,
"has_electric_heating": false,
"max_electrical_load": 0,
"temp_chw_return": 12,
"temp_chw_supply": 7,
"temp_hw_return": 35,
"temp_hw_supply": 40,
"temp_setpoint_cooling": 24,
"temp_setpoint_heating": 20
}
},
"ets_model": "Indirect Heating and Cooling",
"ets_indirect_parameters": {
"heat_flow_nominal": 8000,
"heat_exchanger_efficiency": 0.8,
"nominal_mass_flow_district": 0.5,
"nominal_mass_flow_building": 0.5,
"valve_pressure_drop": 6000,
"heat_exchanger_secondary_pressure_drop": 500,
"heat_exchanger_primary_pressure_drop": 500,
"cooling_supply_water_temperature_building": 7,
"heating_supply_water_temperature_building": 50,
"delta_temp_chw_building": 5,
"delta_temp_chw_district": 8,
"delta_temp_hw_building": 15,
"delta_temp_hw_district": 20,
"cooling_controller_y_max": 1,
"cooling_controller_y_min": 0,
"heating_controller_y_max": 1,
"heating_controller_y_min": 0
}
},
{
"geojson_id": "defgh2345",
Expand Down
19 changes: 19 additions & 0 deletions tests/system_parameters/data/system_params_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
"buildings": [
{
"geojson_id": "abcd1234",
"load_model": "time_series",
"load_model_parameters": {
"time_series": {
"filepath": "To be populated",
"delta_temp_air_cooling": 10,
"delta_temp_air_heating": 18,
"has_liquid_cooling": true,
"has_liquid_heating": true,
"has_electric_cooling": false,
"has_electric_heating": false,
"max_electrical_load": 0,
"temp_chw_return": 12,
"temp_chw_supply": 7,
"temp_hw_return": 35,
"temp_hw_supply": 40,
"temp_setpoint_cooling": 24,
"temp_setpoint_heating": 20
}
},
"ets_model": "Indirect Heating and Cooling",
"ets_indirect_parameters": {
"heat_flow_nominal": 8000,
Expand Down

0 comments on commit f9db43a

Please sign in to comment.