Merge pull request #1383 from open-ideas/master_ibpsa_22Oct2024

Merge IBPSA into IDEAS

.github/workflows/github-actions.yml

@@ -34,12 +34,18 @@ jobs:
     steps:
       - name: Test IDEAS.Airflow
         run: make test-dymola PACKAGE=\"IDEAS.Airflow\" INTERACTIVE=false
+      - name: Test IDEAS.BoundaryConditions
+        run: make test-dymola PACKAGE=\"IDEAS.BoundaryConditions\" INTERACTIVE=false
       - name: Test IDEAS.Buildings.Components
         run: make test-dymola PACKAGE=\"IDEAS.Buildings.Components\" INTERACTIVE=false
       - name: Test IDEAS.Buildings.Examples
         run: make test-dymola PACKAGE=\"IDEAS.Buildings.Examples\" INTERACTIVE=false
       - name: Test IDEAS.Buildings.Validation
         run: make test-dymola PACKAGE=\"IDEAS.Buildings.Validation\" INTERACTIVE=false
+      - name: Test IDEAS.Controls
+        run: make test-dymola PACKAGE=\"IDEAS.Controls\" INTERACTIVE=false
+      - name: Test IDEAS.Electrical
+        run: make test-dymola PACKAGE=\"IDEAS.Electrical\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Actuators
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Actuators\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.BaseClasses
@@ -52,12 +58,18 @@ jobs:
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Examples\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.FixedResistances
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.FixedResistances\" INTERACTIVE=false
+      - name: Test IDEAS.Fluid.FMI
+        run: make test-dymola PACKAGE=\"IDEAS.Fluid.FMI.Adaptors\" INTERACTIVE=false 
+            && make test-dymola PACKAGE=\"IDEAS.Fluid.FMI.Conversion\" INTERACTIVE=false
+            && make test-dymola PACKAGE=\"IDEAS.Fluid.FMI.Validation\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Geothermal
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Geothermal\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.HeatExchangers
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.HeatExchangers\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.HeatPumps
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.HeatPumps\" INTERACTIVE=false
+      - name: Test IDEAS.Fluid.Humidifiers
+        run: make test-dymola PACKAGE=\"IDEAS.Fluid.Humidifiers\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Interfaces
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Interfaces\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.MassExchangers
@@ -68,24 +80,22 @@ jobs:
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Movers\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Sensors
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Sensors\" INTERACTIVE=false
+      - name: Test IDEAS.Fluid.SolarCollectors
+        run: make test-dymola PACKAGE=\"IDEAS.Fluid.SolarCollectors\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Sources
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Sources\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Storage
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Storage\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Taps
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Taps\" INTERACTIVE=false
-      - name: Test IDEAS.ThermalZones
-        run: make test-dymola PACKAGE=\"IDEAS.ThermalZones\" INTERACTIVE=false
-      - name: Test IDEAS.BoundaryConditions
-        run: make test-dymola PACKAGE=\"IDEAS.BoundaryConditions\" INTERACTIVE=false
-      - name: Test IDEAS.Controls
-        run: make test-dymola PACKAGE=\"IDEAS.Controls\" INTERACTIVE=false
       - name: Test IDEAS.Media
         run: make test-dymola PACKAGE=\"IDEAS.Media\" INTERACTIVE=false
-      - name: Test IDEAS.Utilities
-        run: make test-dymola PACKAGE=\"IDEAS.Utilities\" INTERACTIVE=false
       - name: Test IDEAS.Templates
         run: make test-dymola PACKAGE=\"IDEAS.Templates\" INTERACTIVE=false
+      - name: Test IDEAS.ThermalZones
+        run: make test-dymola PACKAGE=\"IDEAS.ThermalZones\" INTERACTIVE=false
+      - name: Test IDEAS.Utilities
+        run: make test-dymola PACKAGE=\"IDEAS.Utilities\" INTERACTIVE=false
       - name: Test IDEAS.Examples.PPD12
         run: make test-dymola PACKAGE=\"IDEAS.Examples.PPD12\" INTERACTIVE=false
       - name: Test IDEAS.Examples.IBPSA

.gitignore

@@ -36,5 +36,6 @@ systemScript.py
 # The files below are not ignored (hence the "!")
 !/Inputs/*.txt
 !/IDEAS/Inputs/*.txt
+!/IDEAS/Resources/Data/**/*.txt
 !/IDEAS/Resources/strobe/*.txt
 !/IDEAS/Resources/ReferenceResults/Dymola/*.txt

IDEAS/Airflow/AHU/Adsolair58.mo

@@ -183,16 +183,17 @@ model Adsolair58 "Menerga Adsolair type 58 air handling unit"
     C_nominal=C_nominal,
     addPowerToMedium=true,
     per(
-      speed_rpm_nominal=per.speed_rpm_nominal,
-      hydraulicEfficiency=per.hydraulicEfficiency,
+      etaHydMet=per.etaHydMet,
+      etaMotMet=per.etaMotMet,
+      efficiency=per.efficiency,
       motorEfficiency=per.motorEfficiency,
       power=per.power,
-      use_powerCharacteristic=per.use_powerCharacteristic,
+      powerOrEfficiencyIsHydraulic=per.powerOrEfficiencyIsHydraulic,
       pressure=per.pressure),
+    use_riseTime=false,
     init=Modelica.Blocks.Types.Init.NoInit,
     m_flow_small=m1_flow_nominal/50,
     riseTime=600,
-    use_inputFilter=false,
     final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     m_flow_nominal=m1_flow_nominal,
     prescribeSystemPressure=true)   "Top fan"
@@ -227,16 +228,17 @@ model Adsolair58 "Menerga Adsolair type 58 air handling unit"
     allowFlowReversal=allowFlowReversal,
     addPowerToMedium=true,
     per(
-      speed_rpm_nominal=per.speed_rpm_nominal,
+      etaHydMet=per.etaHydMet,
+      etaMotMet=per.etaMotMet,
+      efficiency=per.efficiency,
       motorEfficiency=per.motorEfficiency,
-      hydraulicEfficiency=per.hydraulicEfficiency,
       power=per.power,
-      use_powerCharacteristic=per.use_powerCharacteristic,
+      powerOrEfficiencyIsHydraulic=per.powerOrEfficiencyIsHydraulic,
       pressure=per.pressure),
+    use_riseTime=false,
     init=Modelica.Blocks.Types.Init.NoInit,
     m_flow_small=m2_flow_nominal/50,
     riseTime=600,
-    use_inputFilter=false,
     final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     m_flow_nominal=m2_flow_nominal,
     prescribeSystemPressure=true)   "Bottom fan"
@@ -295,7 +297,7 @@ model Adsolair58 "Menerga Adsolair type 58 air handling unit"
     redeclare package Medium = MediumAir,
     m_flow_nominal=m2_flow_nominal,
     allowFlowReversal=allowFlowReversal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     from_dp=true,
     l=0.001,
     dpAdd=1,
@@ -307,9 +309,9 @@ model Adsolair58 "Menerga Adsolair type 58 air handling unit"
   TwoWayEqualPercentageAdd                  valRecupBot(
     redeclare package Medium = MediumAir,
     m_flow_nominal=m2_flow_nominal,
+    use_strokeTime=false,
     dpFixed_nominal=per.dp_nominal_bottom_recup,
     allowFlowReversal=allowFlowReversal,
-    use_inputFilter=false,
     from_dp=true,
     l=0.001,
     dpAdd=1,
@@ -319,7 +321,7 @@ model Adsolair58 "Menerga Adsolair type 58 air handling unit"
   TwoWayEqualPercentageAdd                  valBypassTop(
     redeclare package Medium = MediumAir,
     allowFlowReversal=allowFlowReversal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     from_dp=true,
     l=0.001,
     m_flow_nominal=m1_flow_nominal,
@@ -332,9 +334,9 @@ model Adsolair58 "Menerga Adsolair type 58 air handling unit"
   TwoWayEqualPercentageAdd                  valRecupTop(
     redeclare package Medium = MediumAir,
     m_flow_nominal=m2_flow_nominal,
+    use_strokeTime=false,
     dpFixed_nominal=per.dp_nominal_top_recup,
     allowFlowReversal=allowFlowReversal,
-    use_inputFilter=false,
     from_dp=true,
     l=0.001,
     dpAdd=per.dp_adiabatic,
@@ -683,6 +685,15 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Lucas Verleyen and Jelger Jansen:<br/>
+Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
+See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
+(and <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>,
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, #1704</a>,
+<a href=\"https://github.com/lbl-srg/modelica-buildings/pull/3845\">Buildings, #3845</a>, and
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">Buildings, #2668</a>).
+</li>
+<li>
 April 26, 2022, by Filip Jorissen:<br/>
 Removed experiment annotation for #1254.
 </li>

IDEAS/Airflow/AHU/BaseClasses/Adsolair14200.mo

@@ -4,11 +4,12 @@ record Adsolair14200
   extends IDEAS.Airflow.AHU.BaseClasses.AdsolairData(
     pressure(V_flow={5423,7537,9958,12256,14857,17121,19042,20649}/3600, dp={
           1385,1350,1290,1195,1021,838,653,470}),
-    hydraulicEfficiency(V_flow={5341,6743,9230,11651,14412,17383,20235}/3600,
+    efficiency(V_flow={5341,6743,9230,11651,14412,17383,20235}/3600,
         eta={0.45,0.51,0.6,0.72,0.7,0.72,0.6}),
     motorEfficiency(V_flow={5341,20235}/3600, eta={0.887,0.887}),
-    use_powerCharacteristic=false,
-    speed_rpm_nominal=1800,
+    powerOrEfficiencyIsHydraulic = true,
+    etaHydMet=IDEAS.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Efficiency_VolumeFlowRate,
+    etaMotMet=IDEAS.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_VolumeFlowRate,
     m1_flow_nominal=4.69,
     m2_flow_nominal=4.69,
     dT_compressor=37.1 - 10.8,
@@ -55,6 +56,14 @@ record Adsolair14200
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Lucas Verleyen and Jelger Jansen:<br/>
+Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
+See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
+(and <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, #1704</a>,
+<a href=\"https://github.com/lbl-srg/modelica-buildings/pull/3845\">Buildings, #3845</a>, and
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">Buildings, #2668</a>).
+</li>
+<li>
 October 11, 2016, by Filip Jorissen:<br/>
 Added first implementation.
 </li>

IDEAS/Airflow/AHU/Examples/Adsolair58.mo

@@ -53,7 +53,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Supply VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Supply VAV" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={90,-50})));
@@ -63,7 +63,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Return VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Return VAV" annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         rotation=270,
         origin={70,-50})));
@@ -72,7 +72,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Return VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Return VAV" annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         rotation=270,
         origin={18,-70})));
@@ -81,7 +81,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Supply VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Supply VAV" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={38,-70})));
@@ -90,7 +90,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Return VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Return VAV" annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         rotation=270,
         origin={-40,-50})));
@@ -99,7 +99,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Supply VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Supply VAV" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-20,-50})));
@@ -108,7 +108,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Return VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Return VAV" annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         rotation=270,
         origin={-90,-70})));
@@ -117,7 +117,7 @@ model Adsolair58 "Adsolair58 example model"
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=dp_nominal,
     allowFlowReversal=false,
-    use_inputFilter=false) "Supply VAV" annotation (Placement(transformation(
+    use_strokeTime=false)  "Supply VAV" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-70,-70})));
@@ -157,7 +157,7 @@ model Adsolair58 "Adsolair58 example model"
   Fluid.Movers.FlowControlled_dp pum(
     redeclare package Medium = MediumWater,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     constantHead=1e4,
     m_flow_nominal=0.6,
     inputType=IDEAS.Fluid.Types.InputType.Stages,
@@ -167,10 +167,10 @@ model Adsolair58 "Adsolair58 example model"
         origin={-22,14})));
   Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear val(
     redeclare package Medium = MediumWater,
+    use_strokeTime=false,
     dpValve_nominal=1e4,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     tau=30,
-    use_inputFilter=false,
     m_flow_nominal=0.6,
     portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Entering,
     portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Leaving,
@@ -361,6 +361,12 @@ A PI controller is used to track the set point temperature.
 </html>", revisions="<html>
 <ul>
 <li>
+October 30, 2024, by Lucas Verleyen:<br/>
+Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
+See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
+(and <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>).
+</li>
+<li>
 January 26, 2018, by Filip Jorissen:<br/>
 Modified example such that it more clearly illustrates all
 operation modes.

IDEAS/Airflow/Multizone/BaseClasses/Examples/WindPressureProfile.mo

@@ -79,7 +79,7 @@ function.
 February 2, 2022, by Michael Wetter:<br/>
 Revised implementation.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IDEAS, #1436</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
 </li>
 <li>
 Apr 6, 2021, by Klaas De Jonge:<br/>

IDEAS/Airflow/Multizone/BaseClasses/PartialOneWayFlowElement.mo

@@ -113,7 +113,7 @@ revisions="<html>
 February 2, 2022, by Michael Wetter:<br/>
 Revised implementation.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IDEAS, #1436</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
 </li>
 <li>
 Apr 06, 2021, by Klaas De Jonge:<br/>

IDEAS/Airflow/Multizone/BaseClasses/powerLawFixedM.mo

@@ -88,7 +88,7 @@ This is for consistency with
 February 2, 2022, by Michael Wetter:<br/>
 Revised implementation.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IDEAS, #1436</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
 </li>
 <li>
 April 6, 2021, by Klaas De Jonge:<br/>

IDEAS/Airflow/Multizone/BaseClasses/windPressureProfile.mo

@@ -49,7 +49,7 @@ IDEAS.Airflow.Multizone.BaseClasses.windPressureLowRise</a>.
 February 2, 2022, by Michael Wetter:<br/>
 Revised implementation.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IDEAS, #1436</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
 </li>
 <li>
 April 6, 2021, by Klaas De Jonge:<br/>

IDEAS/Airflow/Multizone/Coefficient_V_flow.mo

@@ -86,7 +86,7 @@ Dols and Walton (2002) recommend to use for the flow exponent m=0.6 to m=0.7 if
 February 2, 2022, by Michael Wetter:<br/>
 Revised implementation.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IDEAS, #1436</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
 </li>
 <li>
 Apr 6, 2021, by Klaas De Jonge:<br/>

IDEAS/Airflow/Multizone/Coefficient_m_flow.mo

@@ -85,7 +85,7 @@ Dols and Walton (2002) recommend to use for the flow exponent <i>m=0.6</i> to <i
 February 2, 2022, by Michael Wetter:<br/>
 Revised implementation.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IDEAS, #1436</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
 </li>
 <li>
 Apr 6, 2021, by Klaas De Jonge:<br/>

IDEAS/Airflow/Multizone/EffectiveAirLeakageArea.mo

@@ -133,7 +133,7 @@ revisions="<html>
 February 2, 2022, by Michael Wetter:<br/>
 Revised implementation.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IDEAS, #1436</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
 </li>
 <li>
 Apr 6, 2021, by Klaas De Jonge:<br/>
@@ -148,12 +148,12 @@ Changed base class to remove the parameters <code>A</code> and <code>CD</code>
 which are not used by this model.<br/>
 This change is non-backward compatible.<br/>
 This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/932\">IDEAS, #932</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/932\">IBPSA, #932</a>.
 </li>
 <li>
 May 30, 2018, by Michael Wetter:<br/>
 Improved documentation for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/546\">IDEAS, #546</a>.
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/546\">IBPSA, #546</a>.
 </li>
 <li>
 April 24, 2017, by Filip Jorissen:<br/>