Skip to content

Commit

Permalink
Use ETS heat pump COP from GMT sys-params (#32)
Browse files Browse the repository at this point in the history 
* WIP: read component data from sys-params, starting with HP COP

* add wahp data to demo sys-param files

* fix typos in test_network.py

* expand `wahp` name to `water_to_air_heat_pump` for clarity

* WIP: read ets data from a single building in sys-param, apply to all ETSs

* pass data to Network class when instantiating

* docstrings for all methods

* read user-provided values for heat pump cop in network

* provide variation in demo sys-param ETS COP values for verification

* remove mistaken sys-param fields

* update demo sys-param file to have 5G ETS instead of erroneous 4G. oops

* change the rest of the sys-param files to have fifth-gen ETSs

* remove commented code that had been moved to a function
  • Loading branch information
@vtnate
vtnate authored Aug 7, 2024
1 parent 29c9209 commit e4d6a16
Show file tree
Hide file tree
Showing 5 changed files with 300 additions and 168 deletions.
8 changes: 4 additions & 4 deletions ...s/sdk_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/sys_params_upstream.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"cop_heat_pump_heating": 2.6,
"cop_heat_pump_cooling": 3.4,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
Expand Down Expand Up @@ -104,8 +104,8 @@
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"hot_water_supply_temp": 50,
"cop_heat_pump_heating": 2.5,
"cop_heat_pump_cooling": 3.5,
"cop_heat_pump_heating": 3.0,
"cop_heat_pump_cooling": 3.0,
"pump_flow_rate": 0.01,
"pump_design_head": 150000,
"ets_pump_flow_rate": 0.0005,
Expand Down
69 changes: 30 additions & 39 deletions demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/sys_params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,23 @@
"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": 1.887,
"nominal_mass_flow_building": 0.0,
"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
}
"ets_model": "Fifth Gen Heat Pump",
"fifth_gen_ets_parameters": {
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"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,
"fan_design_head": 150
},
"photovoltaic_panels": [],
"diesel_generators": [],
"battery_banks": []
},
{
"geojson_id": "9",
Expand All @@ -63,25 +60,19 @@
"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": 1.887,
"nominal_mass_flow_building": 0.629,
"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
"ets_model": "Fifth Gen Heat Pump",
"fifth_gen_ets_parameters": {
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"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,
"fan_design_head": 150
}
}
],
Expand Down
74 changes: 34 additions & 40 deletions demos/sdk_output_skeleton_2_ghe_sequential/run/baseline_scenario/ghe_dir/sys_params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,23 @@
"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": 1.887,
"nominal_mass_flow_building": 0.0,
"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
}
"ets_model": "Fifth Gen Heat Pump",
"fifth_gen_ets_parameters": {
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"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,
"fan_design_head": 150
},
"photovoltaic_panels": [],
"diesel_generators": [],
"battery_banks": []
},
{
"geojson_id": "5",
Expand All @@ -63,26 +60,23 @@
"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": 1.887,
"nominal_mass_flow_building": 0.629,
"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
}
"ets_model": "Fifth Gen Heat Pump",
"fifth_gen_ets_parameters": {
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"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,
"fan_design_head": 150
},
"photovoltaic_panels": [],
"diesel_generators": [],
"battery_banks": []
}
],
"district_system": {
Expand Down
74 changes: 34 additions & 40 deletions demos/sdk_output_skeleton_2_ghe_staggered/run/baseline_scenario/ghe_dir/sys_params.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,23 @@
"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": 148.098,
"nominal_mass_flow_building": 41.982,
"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
}
"ets_model": "Fifth Gen Heat Pump",
"fifth_gen_ets_parameters": {
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"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,
"fan_design_head": 150
},
"photovoltaic_panels": [],
"diesel_generators": [],
"battery_banks": []
},
{
"geojson_id": "9",
Expand All @@ -63,26 +60,23 @@
"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": 148.098,
"nominal_mass_flow_building": 7.384,
"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
}
"ets_model": "Fifth Gen Heat Pump",
"fifth_gen_ets_parameters": {
"supply_water_temperature_building": 15,
"chilled_water_supply_temp": 5,
"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,
"fan_design_head": 150
},
"photovoltaic_panels": [],
"diesel_generators": [],
"battery_banks": []
}
],
"district_system": {
Expand Down
Loading

0 comments on commit e4d6a16

Please sign in to comment.