Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Putting GHEs downstream of the buildings #677

Merged
merged 4 commits into from
Nov 25, 2024
Merged

Putting GHEs downstream of the buildings #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6c6c64
taking cop from sys_params placeholder
JingWang-CUB Nov 19, 2024
75cd039
change where to read the cop data from sys_params
JingWang-CUB Nov 20, 2024
7e62952
read 5G ETS design data from sys_params
JingWang-CUB Nov 20, 2024
3d1705d
change couplings to put GHE downstream of buildings
JingWang-CUB Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...l_connectors/couplings/5G_templates/UnidirectionalSeries_Borefield/ConnectStatements.mopt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Borefield and distribution coupling connections
{% if graph.get_ghe_id(coupling.id) == loop_order.data[0].list_ghe_ids_in_group[0] %}
connect(pumDis.port_b, TIn_{{ coupling.id }}.port_a)
connect(pumDis.port_b, TDisSup_{{ coupling.id }}.port_a)
{% raw %}annotation (Line(points={{-44,-50},{-44,10},{-40,10}}, color={0,127,255}));
{% endraw %}
{% endif %}
Expand All @@ -14,7 +14,7 @@ connect(TIn_{{ coupling.id }}.port_b, conSto_{{ coupling.plant.id }}.port_aDis)
{% raw %}annotation (Line(points={{-20,50},{-10,50}}, color={0,127,255}));
{% endraw %}connect({{ coupling.plant.id }}.port_b, conSto_{{ coupling.plant.id }}.port_aCon)
{% raw %}annotation (Line(points={{10,50},{20,50},{20,32},{-12,32},{-12,20}}, color={0,127,255}));
{% endraw %}connect(TOut_{{ coupling.id }}.port_b, TDisSup_{{ coupling.id }}.port_a)
{% endraw %}connect(TDisRet_{{ coupling.id }}.port_b, TIn_{{ coupling.id }}.port_a)
{% raw %}annotation (Line(points={{20,10},{24,10}}, color={0,127,255}));
{% endraw %}connect(TDisSup_{{ coupling.id }}.port_b, {{ coupling.network.id }}.port_aDisSup)
{% raw %}annotation (Line(points={{44,10},{50,10}}, color={0,127,255}));
Expand All @@ -24,14 +24,14 @@ connect(TIn_{{ coupling.id }}.port_b, conSto_{{ coupling.plant.id }}.port_aDis)
{% for group_num in range(loop_order.number_of_loops) %}
{% if graph.get_ghe_id(coupling.id) == loop_order.data[group_num].list_ghe_ids_in_group[0] %}
{% if group_num == loop_order.number_of_loops-1 %}
connect(TDisRet_{{ coupling.id }}.port_b, pumDis.port_a)
connect(TOut_{{ coupling.id }}.port_b, pumDis.port_a)
{% raw %}annotation (Line(points={{100,-40},{100,-74},{-72,-74},{-72,-70}}, color={0,127,255}));
{% endraw %}
{% else %}
{% set ground_id = graph.couplings_by_type(coupling.network.id).network_couplings[0].network.id %}
{% set next_borefield_id = graph.couplings_by_type(ground_id).plant_couplings[group_num+1].plant.id %}
{% set next_dis_id = graph.couplings_by_type(next_borefield_id).network_couplings[0].network.id %}
connect(TDisRet_{{ coupling.id }}.port_b, TIn_{{ graph.couplings_by_type(next_dis_id).plant_couplings[0].id }}.port_a)
connect(TOut_{{ coupling.id }}.port_b, TDisSup_{{ graph.couplings_by_type(next_dis_id).plant_couplings[0].id }}.port_a)
{% raw %}annotation (Line(points={{-44,-50},{-44,10},{-40,10}}, color={0,127,255}));
{% endraw %}
{% endif %}
Expand Down
126 changes: 65 additions & 61 deletions geojson_modelica_translator/model_connectors/load_connectors/load_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,67 +36,71 @@ def __init__(self, system_parameters, geojson_load):
# Second if statement is for cases of a sys-param file not including ets data
# TODO: Decide if we're requiring sys-param file, and if all loads have an ets.
# test_base.py and test_time_series.py test these cases
if (
system_parameters is not None
and self.system_parameters.get_param_by_id(self.building_id, "ets_indirect_parameters") is not None
):
self.ets_template_data = {
"heat_flow_nominal": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_flow_nominal"
),
"heat_exchanger_efficiency": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_exchanger_efficiency"
),
"nominal_mass_flow_district": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.nominal_mass_flow_district"
),
"nominal_mass_flow_building": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.nominal_mass_flow_building"
),
"valve_pressure_drop": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.valve_pressure_drop"
),
"heat_exchanger_secondary_pressure_drop": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_exchanger_secondary_pressure_drop"
),
"heat_exchanger_primary_pressure_drop": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_exchanger_primary_pressure_drop"
),
"cooling_supply_water_temperature_building": convert_c_to_k(
self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.cooling_supply_water_temperature_building"
)
),
"heating_supply_water_temperature_building": convert_c_to_k(
self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heating_supply_water_temperature_building"
)
),
"delta_temp_chw_building": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_chw_building"
),
"delta_temp_chw_district": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_chw_district"
),
"delta_temp_hw_building": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_hw_building"
),
"delta_temp_hw_district": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_hw_district"
),
"cooling_controller_y_max": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.cooling_controller_y_max"
),
"cooling_controller_y_min": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.cooling_controller_y_min"
),
"heating_controller_y_max": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heating_controller_y_max"
),
"heating_controller_y_min": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heating_controller_y_min"
),
}
if system_parameters is not None:
if self.system_parameters.get_param_by_id(self.building_id, "ets_indirect_parameters") is not None:
self.ets_template_data = {
"heat_flow_nominal": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_flow_nominal"
),
"heat_exchanger_efficiency": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_exchanger_efficiency"
),
"nominal_mass_flow_district": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.nominal_mass_flow_district"
),
"nominal_mass_flow_building": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.nominal_mass_flow_building"
),
"valve_pressure_drop": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.valve_pressure_drop"
),
"heat_exchanger_secondary_pressure_drop": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_exchanger_secondary_pressure_drop"
),
"heat_exchanger_primary_pressure_drop": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heat_exchanger_primary_pressure_drop"
),
"cooling_supply_water_temperature_building": convert_c_to_k(
self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.cooling_supply_water_temperature_building"
)
),
"heating_supply_water_temperature_building": convert_c_to_k(
self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heating_supply_water_temperature_building"
)
),
"delta_temp_chw_building": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_chw_building"
),
"delta_temp_chw_district": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_chw_district"
),
"delta_temp_hw_building": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_hw_building"
),
"delta_temp_hw_district": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.delta_temp_hw_district"
),
"cooling_controller_y_max": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.cooling_controller_y_max"
),
"cooling_controller_y_min": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.cooling_controller_y_min"
),
"heating_controller_y_max": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heating_controller_y_max"
),
"heating_controller_y_min": self.system_parameters.get_param_by_id(
self.building_id, "ets_indirect_parameters.heating_controller_y_min"
),
}
elif self.system_parameters.get_param_by_id(self.building_id, "fifth_gen_ets_parameters") is not None:
self.ets_template_data = {
"cop_heating": self.system_parameters.get_param_by_id(
self.building_id, "fifth_gen_ets_parameters.cop_heat_pump_heating"
),
}

def add_building(self, urbanopt_building, mapper=None):
"""Add building to the load to be translated. This is simply a helper method.
Expand Down
3 changes: 2 additions & 1 deletion ...elica_translator/model_connectors/load_connectors/templates/TimeSeriesBuildingWithETS.mot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ within {{ project_name }}.Loads.{{ model_name }};
"Model of a building with an internal ETS. Building loads provided as time series"
extends Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
final allowFlowReversalSer=true,
{% endraw %}redeclare {{ project_name }}.Loads.{{ model_name }}.TimeSeriesBuilding bui(
{% endraw %}COPHeaWat_nominal={{data['cop_heating']}},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this COPHeaWat_nominal get used in this model, or another model? Was it being automatically set and now we're explicitly setting it, and the usage is already written?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It gets used in every model with a 5G ETS model. We were using the MBL default values before and now we take the user-defined value from the sys_params file.

redeclare {{ project_name }}.Loads.{{ model_name }}.TimeSeriesBuilding bui(
{% raw %}have_hotWat=true,
T_aHeaWat_nominal=ets.THeaWatSup_nominal,
T_bHeaWat_nominal=ets.THeaWatRet_nominal,
Expand Down