Hotifx: Merge pull request #939 from jnettels/issue938_fix_non_array_…

…modifications Add missing 'each' for compatibility with OpenModelica
RWTH-EBC · Jun 17, 2020 · c17dec3 · c17dec3
2 parents 9d9c8d5 + 422e0f0
commit c17dec3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/AixLib/FastHVAC/Components/HeatGenerators/CHP/CHP_PT1.mo b/AixLib/FastHVAC/Components/HeatGenerators/CHP/CHP_PT1.mo
@@ -79,7 +79,7 @@ public
     FastHVAC.Interfaces.EnthalpyPort_a enthalpyPort_a
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
 
-    Modelica.Blocks.Interfaces.RealOutput Energy[3](unit="J")
+    Modelica.Blocks.Interfaces.RealOutput Energy[3](each unit="J")
     "1=W_el 2=Q_th 3=E_fuel"
     annotation (Placement(transformation(extent={{92,8},{132,48}}),
         iconTransformation(
@@ -88,7 +88,7 @@ public
         origin={102,-48})));
     Modelica.Blocks.Continuous.Integrator integrator[3]
       annotation (Placement(transformation(extent={{54,16},{74,36}})));
-    Modelica.Blocks.Interfaces.RealOutput Capacity[3](unit="W")
+    Modelica.Blocks.Interfaces.RealOutput Capacity[3](each unit="W")
     "1=P_el 2=dotQ_th 3=dotE_fuel" annotation (Placement(transformation(
           extent={{92,40},{132,80}}), iconTransformation(
         extent={{-10,-10},{10,10}},

diff --git a/AixLib/FastHVAC/Components/Storage/HeatStorageVariablePorts.mo b/AixLib/FastHVAC/Components/Storage/HeatStorageVariablePorts.mo
@@ -161,7 +161,7 @@ public
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatingRod if use_heatingRod annotation (Placement(transformation(
           extent={{-110,90},{-90,110}}),iconTransformation(extent={{-70,70},{-50,
             90}})));
-  Modelica.Blocks.Interfaces.RealOutput T_layers[n](  unit="K") annotation (Placement(
+  Modelica.Blocks.Interfaces.RealOutput T_layers[n](each unit="K") annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,