update instance templates for MBLv10 compatibility

urbanopt · Nov 27, 2023 · 304a35c · 304a35c
1 parent 40ab51f
commit 304a35c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...gs/5G_templates/NetworkDistributionPump_NetworkDistributionPump/ComponentDefinitions.mopt b/...gs/5G_templates/NetworkDistributionPump_NetworkDistributionPump/ComponentDefinitions.mopt
@@ -3,13 +3,13 @@
     datDes(
     nBui={{ sys_params.num_buildings }},
     {% if sys_params.district_system.fifth_generation.ghe_parameters.design.flow_type == 'borehole' %}
-    mPumDis_flow_nominal={{ 10*sys_params.district_system.fifth_generation.ghe_parameters.design.flow_rate*
+    mPumDis_flow_nominal={{ sys_params.district_system.fifth_generation.ghe_parameters.design.flow_rate*
     sys_params.district_system.fifth_generation.ghe_parameters.ghe_specific_params[0].borehole.number_of_boreholes }},
     {% else %}
-    mPumDis_flow_nominal={{ 10*sys_params.district_system.fifth_generation.ghe_parameters.design.flow_rate }},
+    mPumDis_flow_nominal={{ sys_params.district_system.fifth_generation.ghe_parameters.design.flow_rate }},
     {% endif %}
     mPipDis_flow_nominal=datDes.mPumDis_flow_nominal,
-    dp_length_nominal=10,
+    dp_length_nominal=1,
     final mCon_flow_nominal={
     {% for building in range( sys_params.num_buildings-1 ) %}
     {{ graph.couplings_by_type(coupling.network.id).load_couplings[building].load.id }}.ets.mSerWat_flow_nominal,

diff --git a/...n_modelica_translator/model_connectors/load_connectors/templates/TimeSeries_Instance.mopt b/...n_modelica_translator/model_connectors/load_connectors/templates/TimeSeries_Instance.mopt
@@ -2,7 +2,9 @@
   {{ model.modelica_type }} {{ model.id }}(
     {% if model.is_5g_district == 'bui' %}
     allowFlowReversalBui = true,
-    {{ model.is_5g_district }}(T_aHeaWat_nominal(displayUnit="K")=318.15,
+    {{ model.is_5g_district }}(
+    have_hotWat=true,
+    T_aHeaWat_nominal(displayUnit="K")=318.15,
     T_aChiWat_nominal(displayUnit="K")=291.15,
     delTAirCoo(displayUnit="degC")=10,
     delTAirHea(displayUnit="degC")=20,

diff --git a/...lica_translator/model_connectors/networks/templates/NetworkDistributionPump_Instance.mopt b/...lica_translator/model_connectors/networks/templates/NetworkDistributionPump_Instance.mopt
@@ -13,8 +13,13 @@
     "Distribution network"
     annotation (Placement(transformation(extent={{50,-20},{90,0}})));
   {% endraw %}// ambient loop pump
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDis(
+  Buildings.Fluid.Movers.FlowControlled_m_flow pumDis(
     redeclare final package Medium = {{ globals.medium_w }},
+    allowFlowReversal=true,
+    redeclare Buildings.Fluid.Movers.Data.Generic per,
+    inputType=Buildings.Fluid.Types.InputType.Constant,
+    use_inputFilter=true,
+    riseTime=20,
     m_flow_nominal=datDes.mPumDis_flow_nominal)
     "Distribution pump"
     {% raw %}annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=270,origin={-44,-60})));