From 1cde731c5e537d325706a0c926c2b92fcd230a98 Mon Sep 17 00:00:00 2001 From: Nathan Moore Date: Tue, 28 Nov 2023 16:06:03 -0700 Subject: [PATCH] fix regular 5G model to work with MBLv10 --- .../TimeSeries_NetworkAmbientWaterStub/ConnectStatements.mopt | 2 -- .../networks/templates/NetworkAmbientWaterStub_Instance.mopt | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/geojson_modelica_translator/model_connectors/couplings/5G_templates/TimeSeries_NetworkAmbientWaterStub/ConnectStatements.mopt b/geojson_modelica_translator/model_connectors/couplings/5G_templates/TimeSeries_NetworkAmbientWaterStub/ConnectStatements.mopt index b054c300b..65b76e74c 100644 --- a/geojson_modelica_translator/model_connectors/couplings/5G_templates/TimeSeries_NetworkAmbientWaterStub/ConnectStatements.mopt +++ b/geojson_modelica_translator/model_connectors/couplings/5G_templates/TimeSeries_NetworkAmbientWaterStub/ConnectStatements.mopt @@ -9,8 +9,6 @@ connect({{ coupling.load.id }}.TChiWatSupSet, THeaWatSet_{{ coupling.id }}.y) annotation ({{ diagram.line.ts_load.t_chi_wat_set.t_hea_wat_set.y }}); connect(TCooWatSet_{{ coupling.id }}.y, {{ coupling.load.id }}.TColWat) annotation ({{ diagram.line.t_coo_wat_set.y.ts_load.t_col_wat }}); -connect(secMasFloRat_{{ coupling.id }}.y, supHeaWat_{{ sys_params.load_num }}.m_flow_in) - annotation ({{ diagram.line.sec_mas_flo_rat.y.sup_hea_wat.m_flow_in }}); connect(supHeaWat_{{ sys_params.load_num }}.ports[1], {{ coupling.load.id }}.port_aSerAmb) annotation ({{ diagram.line.sup_hea_wat.ports.ts_load.port_a_amb }}); connect({{ coupling.load.id }}.port_bSerAmb, sinHeaWat.ports[{{ sys_params.load_num }}]) diff --git a/geojson_modelica_translator/model_connectors/networks/templates/NetworkAmbientWaterStub_Instance.mopt b/geojson_modelica_translator/model_connectors/networks/templates/NetworkAmbientWaterStub_Instance.mopt index c56033470..7221360d0 100644 --- a/geojson_modelica_translator/model_connectors/networks/templates/NetworkAmbientWaterStub_Instance.mopt +++ b/geojson_modelica_translator/model_connectors/networks/templates/NetworkAmbientWaterStub_Instance.mopt @@ -1,9 +1,8 @@ // heated water stub // TODO: move these components into a single component {% for building in range( sys_params.num_buildings ) %} - Buildings.Fluid.Sources.MassFlowSource_T supHeaWat_{{ building + 1 }}( + Buildings.Fluid.Sources.Boundary_pT supHeaWat_{{ building + 1 }}( redeclare package Medium={{ globals.medium_w }}, - use_m_flow_in=true, use_T_in=false, {% if 'ghe_parameters' in sys_params.district_system['fifth_generation'] %} T={{ sys_params.district_system.fifth_generation.ghe_parameters.soil.undisturbed_temp }}+273.15,