Add PluginSpawn

.gitlab-ci.yml

@@ -641,7 +641,7 @@ build:main-energyplus:py3.11:
     - export BIM2SIM_LOG_LEVEL=ERROR
     - |
       if [ "$COVERAGE" = "true" ]; then
-        coverage run -m unittest discover ~/bim2sim-coding/test
+        coverage run --omit="*/*_txt*" -m unittest discover ~/bim2sim-coding/test
         mkdir -p /builds/EBC/EBC_all/github_ci/bim2sim/$CI_COMMIT_REF_NAME/coverage
         coverage html -d /builds/EBC/EBC_all/github_ci/bim2sim/$CI_COMMIT_REF_NAME/coverage
         coverage-badge -o /builds/EBC/EBC_all/github_ci/bim2sim/$CI_COMMIT_REF_NAME/coverage/badge.svg
@@ -674,11 +674,11 @@ build:main-energyplus:py3.11:
       if [ -d "${plugin_test_dir}/unit" ] || [ -d "${plugin_test_dir}/integration" ]; then
         if [ -d "${plugin_test_dir}/unit" ]; then
           echo "Running unit tests..."
-          coverage run --source=~/bim2sim-coding/bim2sim/plugins/${plugin} -m unittest discover -v ${plugin_test_dir}/unit
+          coverage run --omit="*/*_txt*" --source=~/bim2sim-coding/bim2sim/plugins/${plugin} -m unittest discover -v ${plugin_test_dir}/unit
         fi
         if [ -d "${plugin_test_dir}/integration" ]; then
           echo "Running integration tests..."
-          coverage run --append --source=~/bim2sim-coding/bim2sim/plugins/${plugin} -m unittest discover -v ${plugin_test_dir}/integration
+          coverage run --omit="*/*_txt*" --append --source=~/bim2sim-coding/bim2sim/plugins/${plugin} -m unittest discover -v ${plugin_test_dir}/integration
         fi
       else
         echo "No unit or integration test directories found."
@@ -714,9 +714,9 @@ build:main-energyplus:py3.11:
     - |
       set +e
       if [[ "$CI_JOB_IMAGE" == *"dymola"* ]]; then
-        xvfb-run -n 77 coverage run -m unittest discover ~/bim2sim-coding/bim2sim/plugins/${plugin}/test/regression
+        xvfb-run -n 77 coverage run --omit="*/*_txt*" -m unittest discover ~/bim2sim-coding/bim2sim/plugins/${plugin}/test/regression
       else
-        coverage run -m unittest discover ~/bim2sim-coding/bim2sim/plugins/${plugin}/test/regression
+        coverage run --omit="*/*_txt*" -m unittest discover ~/bim2sim-coding/bim2sim/plugins/${plugin}/test/regression
       fi
       test_exit_code=$?
       set -e

bim2sim/assets/finder/template_LuArtX_Carf.json

@@ -15,8 +15,27 @@
   },
   "Boiler":  {
     "default_ps": {
-      "rated_power": ["CarF", "eff.Leistung"],
-      "nominal_efficiency":  ["CarF", "Wirkungsgrad"]
+      "rated_power" : [
+        ["CarF", "eff.Leistung"],
+        ["VDI 700-Wärmeerzeuger", "Nennleistung"]
+      ],
+      "nominal_efficiency":  ["CarF", "Wirkungsgrad"],
+      "flow_temperature":
+      ["VDI 710.01-Basisdaten", "Maximale Vorlauftemperatur"],
+      "water_volume": ["VDI 700-Wärmeerzeuger", "Wasserinhalt"],
+      "dry_mass": ["VDI 700-Wärmeerzeuger", "Netto-Gesamtmasse"],
+      "minimal_part_load_ratio":
+        ["VDI 700-Wärmeerzeuger", "untere Modulationsgrenze"]
+    }
+  },
+  "HeatPump": {
+    "default_ps": {
+      "rated_power": ["VDI 700-Produktelementdaten", "Heizleistung (kW)"],
+      "is_reversible": ["VDI 700-Produktelementdaten", "Kühlfunktion"],
+      "rated_cooling_power": ["VDI 700-Produktelementdaten", "Kühlleistung"],
+      "COP": ["VDI 700-Produktelementdaten", "Leistungszahl"],
+      "internal_pump": ["VDI 710.05-Luft-Wasser-Wärmepumpe", "Heizkreispumpe intern"],
+      "vdi_performance_data_table": ["VDI-Tables", "Leistungsdaten"]
     }
   }
 }

bim2sim/assets/templates/modelica/package.txt

@@ -0,0 +1,14 @@
+%if within is not None:
+within ${within};
+%endif
+package ${name}
+  extends Modelica.Icons.Package;
+
+  %if uses is not None:
+  annotation (uses(
+	%for use in uses:
+    ${use}${',' if not loop.last else '),'}\
+	%endfor
+    version="1");
+  %endif
+end ${name};

bim2sim/assets/templates/modelica/package_order.txt

@@ -0,0 +1,10 @@
+%if extra != None:
+${extra}
+%endif
+%for i in list:
+%if addition != None:
+${addition}${i.replace(" ", "")}
+%else:
+${i.replace(" ", "")}
+%endif
+%endfor

bim2sim/assets/templates/modelica/tmplModel.txt

@@ -1,5 +1,7 @@
 model ${model.name} "${model.comment}"
+% if not model.connections_heat_ports_conv or not model.connections_heat_ports_rad:
   extends Modelica.Icons.Example;
+% endif
   import SI = Modelica.Units.SI;\
 
 %if unknowns:
@@ -27,19 +29,36 @@ model ${model.name} "${model.comment}"
   {${instance.position[0]+10},${instance.position[1]+10}}})));
 </%def>\
 \
+// Only for SpawnOfEnergyPlus
+% if len(model.connections_heat_ports_conv) > 0:
+Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPortOuterCon[${len(model.connections_heat_ports_conv)}]
+    annotation (Placement(transformation(extent={{-110,10},{-90,30}})));
+% endif
+% if len(model.connections_heat_ports_rad) > 0:
+Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPortOuterRad[${len(model.connections_heat_ports_rad)}]
+    annotation (Placement(transformation(extent={{-110,-22},{-90,-2}})));
+% endif
+
 equation
 % for con1, con2, pos1, pos2 in model.connections:
   connect(${con1}, ${con2})
-    annotation (Line(points={{${pos1[0]},${pos1[1]}},{38,-6}}, color={0,0,127}));;
-% endfor\
+    annotation (Line(points={{${pos1[0]},${pos1[1]}},{38,-6}}, color={0,0,127}));
+% endfor
+
+// heatport connections
+% for cons in model.connections_heat_ports_conv:
+    connect${str(cons).replace("'","")} annotation (Line(points={{0,0},{0,0},{0,0},{0,0},{0,0}}, color={191,0,0}));
+% endfor
+% for cons in model.connections_heat_ports_rad:
+    connect${str(cons).replace("'","")} annotation (Line(points={{0,0},{0,0},{0,0},{0,0},{0,0}}, color={191,0,0}));
+% endfor
 
 annotation(
 %if unknowns:
   Diagram(graphics={Text(
     extent={{-100,100},{100,60}},
     lineColor={238,46,47},
-    textString="${len(unknowns)} unknown parameters!
-    see comments for details.")}),
+    textString="${len(unknowns)} unknown parameters! See comments for details.")}),
 %endif
 experiment(StopTime=36000));
 end ${model.name};

bim2sim/assets/templates/modelica/tmplSpawnBuilding.txt

@@ -0,0 +1,106 @@
+within ${within};
+model ${model_name} "${model_comment}"
+  import SI = Modelica.Units.SI;
+
+  // TODO
+  parameter Integer nPorts=2
+    "Number of fluid ports (equals to 2 for one inlet and one outlet)"
+    annotation (Evaluate=true,Dialog(connectorSizing=true,tab="General",group="Ports"));
+
+  parameter Integer nZones = ${n_zones};
+
+  final parameter Modelica.Units.SI.MassFlowRate mOut_flow[nZones]=0.3/3600 * fill(1, nZones) * 1.2
+    "Outside air infiltration for each exterior room";
+
+  parameter String zoneNames[nZones] = ${ep_zone_lists}
+    "Name of the thermal zone as specified in the EnergyPlus input";
+
+  inner Buildings.ThermalZones.EnergyPlus_9_6_0.Building building (
+    idfName = ${idf_path},
+    epwName = ${weather_path_ep},
+    weaName = ${weather_path_mos},
+    printUnits = true)
+ "" annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
+
+
+  Buildings.Fluid.Sources.MassFlowSource_WeatherData freshairsource[nZones](
+      redeclare package Medium = Buildings.Media.Air,
+    m_flow=mOut_flow,
+    each nPorts=1) ""
+    annotation (Placement(transformation(extent={{-43.1111,58},{-23.1111,78}})));
+
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zon[nZones](
+    zoneName=zoneNames,
+    redeclare package Medium = Buildings.Media.Air,
+    each use_C_flow=false,
+    each nPorts=nPorts)
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}})));
+
+// Infiltration
+  Buildings.Fluid.Sources.Outside out[nZones](
+  redeclare package Medium = Buildings.Media.Air,
+    each nPorts=1)      "Outside condition"
+    annotation (Placement(transformation(extent={{-44,32},{-24,52}})));
+
+  Buildings.Fluid.FixedResistances.PressureDrop resOut[nZones](
+    redeclare each package Medium = Buildings.Media.Air,
+    each m_flow_nominal=sum(mOut_flow),
+    each dp_nominal=10,
+    each linearized=true) "Small flow resistance for inlet"
+    annotation (Placement(transformation(extent={{-6,58},{14,78}})));
+
+  Buildings.Fluid.FixedResistances.PressureDrop resIn[nZones](
+    redeclare package Medium = Buildings.Media.Air,
+    each m_flow_nominal=sum(mOut_flow),
+    each dp_nominal=10,
+    each linearized=true) "Small flow resistance for outlet"
+    annotation (Placement(transformation(extent={{-6,32},{14,52}})));
+
+// Interfaces
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heaPorCon[nZones]
+    "Convective heat port to air volume for each zone"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heaPorRad[nZones]
+    "Radiative heat port to air volume for each zone"
+    annotation (Placement(transformation(extent={{-110,-28},{-90,-8}})));
+
+  Modelica.Blocks.Sources.Constant const[nZones,3](each k=0) "TODO"
+    annotation (Placement(transformation(extent={{-100,16},{-80,36}})));
+equation
+
+  for i in 1:nZones loop
+    connect(building.weaBus, freshairsource[i].weaBus) annotation (Line(
+      points={{-80,68},{-52,68},{-52,68.2},{-43.1111,68.2}},
+      color={255,204,51},
+      thickness=0.5));
+    connect(building.weaBus, out[i].weaBus) annotation (Line(
+      points={{-80,68},{-52,68},{-52,42.2},{-44,42.2}},
+      color={255,204,51},
+      thickness=0.5));
+    connect(resOut[i].port_b, zon[i].ports[1]) annotation (Line(points={{14,68},
+            {98,68},{98,-28},{-1,-28},{-1,-19.1}}, color={0,127,255}));
+    connect(out[i].ports[1], resIn[i].port_a) annotation (Line(points={{-24,42},
+            {-6,42}},                              color={0,127,255}));
+    connect(resIn[i].port_b, zon[i].ports[2]) annotation (Line(points={{14,42},{
+            98,42},{98,-28},{1,-28},{1,-19.1}},    color={0,127,255}));
+  end for;
+
+
+  connect(freshairsource[:].ports[1], resOut[:].port_a)
+    annotation (Line(points={{-23.1111,68},{-14,68},{-14,68},{-6,68}},
+                                                     color={0,127,255}));
+
+  connect(heaPorCon, zon.heaPorAir) annotation (Line(points={{-100,0},{0,0}},
+                             color={191,0,0}));
+  connect(zon.heaPorRad, heaPorRad) annotation (Line(points={{0,-6},{-82,-6},{-82,
+          -18},{-100,-18}}, color={191,0,0}));
+
+  connect(const.y, zon.qGai_flow) annotation (Line(points={{-79,26},{-32,26},{-32,
+          10},{-22,10}}, color={0,0,127}));
+  annotation (
+    experiment(StopTime=36000), uses(
+      Modelica(version="4.0.0"),
+      Buildings(version="10.0.0"),
+      AixLib(version="1.3.2")));
+
+end ${model_name};

bim2sim/assets/templates/modelica/tmplSpawnTotalModel.txt

@@ -0,0 +1,22 @@
+within ${within};
+model ${model_name} "${model_comment}"
+  import SI = Modelica.Units.SI;
+  ${model_name_building} ${model_name_building.lower()}
+    annotation (Placement(transformation(extent={{-14,28},{6,48}})));
+  ${model_name_hydraulic} ${model_name_hydraulic.lower()}
+    annotation (Placement(transformation(extent={{-14,-62},{6,-42}})));
+equation
+
+  // heatport connections
+    % for cons in cons_heat_ports_conv_building_hvac:
+        connect${str(cons).replace("'","")} annotation (Line(points={{0,0},{0,0},{0,0},{0,0},{0,0}}, color={191,0,0}));
+    % endfor
+    % for cons in cons_heat_ports_rad_building_hvac:
+        connect${str(cons).replace("'","")} annotation (Line(points={{0,0},{0,0},{0,0},{0,0},{0,0}}, color={191,0,0}));
+    % endfor
+
+
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end ${model_name};
+