Merge branch 'master' into issue1707_UpdatesISO13790

ibpsa · Sep 16, 2024 · 1796fd9 · 1796fd9
2 parents 27755ba + 430b408
commit 1796fd9
Show file tree

Hide file tree

Showing 571 changed files with 69,719 additions and 3,848 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ env:
     - DOCKER_REPONAME=lbnlblum
     - [email protected]
     - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
-    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1
+    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024xRefresh1-x86_64
 
   jobs:
     # Test matrix for regression tests.
@@ -37,8 +37,8 @@ env:
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,Sensors,Sources,Storage}\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.ThermalZones\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.ThermalZones\""
-    - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls}\""
+    - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls,Electrical}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls,Electrical}\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.{Media,Utilities}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Media,Utilities}\""
 

diff --git a/IBPSA/Airflow/Multizone/BaseClasses/Examples/package.order b/IBPSA/Airflow/Multizone/BaseClasses/Examples/package.order
@@ -1,4 +1,3 @@
-Interpolate
 PowerLaw
 PowerLawFixedM
 WindPressureLowRise

diff --git a/IBPSA/Airflow/Multizone/BaseClasses/interpolate.mo b/IBPSA/Airflow/Multizone/BaseClasses/interpolate.mo
diff --git a/IBPSA/Airflow/Multizone/BaseClasses/package.order b/IBPSA/Airflow/Multizone/BaseClasses/package.order
@@ -6,7 +6,6 @@ PowerLawResistanceParameters
 TwoWayFlowElement
 TwoWayFlowElementBuoyancy
 ZonalFlow
-interpolate
 powerLaw
 powerLawFixedM
 windPressureLowRise

diff --git a/IBPSA/Airflow/Multizone/Examples/CO2TransportStep.mo b/IBPSA/Airflow/Multizone/Examples/CO2TransportStep.mo
@@ -5,13 +5,19 @@ model CO2TransportStep "Model with transport of CO2 through buoyancy driven flow
     volTop(nPorts=3),
     volEas(nPorts=6));
 
-  IBPSA.Fluid.Sensors.TraceSubstances CO2SenTop(redeclare package Medium = Medium)
+  IBPSA.Fluid.Sensors.TraceSubstances CO2SenTop(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "CO2 sensor"
     annotation (Placement(transformation(extent={{20,120},{40,140}})));
-  IBPSA.Fluid.Sensors.TraceSubstances CO2SenWes(redeclare package Medium = Medium)
+  IBPSA.Fluid.Sensors.TraceSubstances CO2SenWes(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "CO2 sensor"
     annotation (Placement(transformation(extent={{-102,10},{-82,30}})));
-  IBPSA.Fluid.Sensors.TraceSubstances CO2SenEas(redeclare package Medium = Medium)
+  IBPSA.Fluid.Sensors.TraceSubstances CO2SenEas(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "CO2 sensor"
     annotation (Placement(transformation(extent={{58,10},{78,30}})));
   Modelica.Blocks.Sources.Pulse pulse(
@@ -65,6 +71,12 @@ the other rooms, and eventually its concentration decays.
 </html>", revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1857\">IBPSA, #1857</a>.
+</li>
+<li>
 March 26, 2021 by Michael Wetter:<br/>
 Updated comments for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/515\">IBPSA, #515</a>.
@@ -78,4 +90,4 @@ and added documentation.
 </li>
 </ul>
 </html>"));
-end CO2TransportStep;
+end CO2TransportStep;
diff --git a/IBPSA/Airflow/Multizone/MediumColumn.mo b/IBPSA/Airflow/Multizone/MediumColumn.mo
@@ -103,11 +103,13 @@ equation
         Text(
           extent={{24,-78},{106,-100}},
           textColor={0,0,127},
-          textString="Bottom"),
+          textString="Bottom",
+          fontSize=36),
         Text(
           extent={{32,104},{98,70}},
           textColor={0,0,127},
-          textString="Top"),
+          textString="Top",
+          fontSize=36),
         Text(
           extent={{36,26},{88,-10}},
           textColor={0,0,127},
@@ -129,7 +131,7 @@ equation
         Text(
           extent={{-50.5,20.5},{50.5,-20.5}},
           textColor={0,0,127},
-          origin={-72.5,-12.5},
+          origin={-72.5,-0.5},
           rotation=90,
           textString="%name"),
         Rectangle(
@@ -141,7 +143,7 @@ equation
           lineColor={0,0,0}),
         Rectangle(
           visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom,
-          extent={{-16,0},{16,-82}},
+          extent={{-16,0},{16,-80}},
           fillColor={85,170,255},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None,

diff --git a/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo b/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo
@@ -75,10 +75,10 @@ model MediumColumnDynamic
 
 equation
   connect(colBot.port_a, vol.ports[1]) annotation (Line(
-      points={{0,-40},{0,-40},{0,-2},{-10,-2}},
+      points={{0,-40},{0,-40},{0,-1},{-10,-1}},
       color={0,127,255}));
   connect(vol.ports[2], colTop.port_b) annotation (Line(
-      points={{-10,2},{0,2},{0,40},{0,40}},
+      points={{-10,1},{0,1},{0,40},{0,40}},
       color={0,127,255}));
   connect(colTop.port_a, port_a) annotation (Line(
       points={{0,60},{0,80},{0,80},{0,100}},
@@ -98,56 +98,36 @@ equation
         Text(
           extent={{24,-78},{106,-100}},
           textColor={0,0,127},
-          textString="Bottom"),
+          textString="Bottom",
+          fontSize=36),
         Text(
           extent={{32,104},{98,70}},
           textColor={0,0,127},
-          textString="Top"),
+          textString="Top",
+          fontSize=36),
         Text(
           extent={{42,26},{94,-10}},
           textColor={0,0,127},
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
           textString="h=%h"),
-        Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromTop,
-          extent={{-16,78},{16,-2}},
-          fillColor={85,170,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0}),
         Text(
           extent={{-50.5,20.5},{50.5,-20.5}},
           textColor={0,0,127},
-          origin={-72.5,-12.5},
+          origin={-72.5,-0.5},
           rotation=90,
           textString="%name"),
         Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.actual,
-          extent={{-16,80},{16,54}},
-          fillColor={85,170,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0}),
-        Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom,
-          extent={{-16,0},{16,-82}},
-          fillColor={85,170,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0}),
-        Rectangle(
-          visible=densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.actual,
-          extent={{-16,-55},{16,-80}},
+          extent={{-16,80},{16,-80}},
           fillColor={85,170,255},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None,
           lineColor={0,0,0}),
         Ellipse(
           extent={{-40,40},{40,-40}},
-          lineColor={0,0,0},
           fillPattern=FillPattern.Sphere,
-          fillColor={0,128,255}),
+          fillColor={0,128,255},
+          pattern=LinePattern.None),
         Line(
           visible=use_HeatTransfer,
           points={{-90,0},{-40,0}},
@@ -182,6 +162,12 @@ at the top of the column.
 revisions="<html>
 <ul>
 <li>
+February 27, 2024, by Michael Wetter:<br/>
+Removed wrong annotation that used a non-existent parameter.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1842\">#1842</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Set <code>final massDynamics=energyDynamics</code>.<br/>
 This is for

diff --git a/IBPSA/Airflow/Multizone/Table_m_flow.mo b/IBPSA/Airflow/Multizone/Table_m_flow.mo
@@ -2,7 +2,7 @@ within IBPSA.Airflow.Multizone;
 model Table_m_flow
   "Mass flow(y-axis) vs Pressure(x-axis) cubic spline fit model based from table data, with last two points linearly interpolated"
   extends IBPSA.Airflow.Multizone.BaseClasses.PartialOneWayFlowElement(
-    m_flow = IBPSA.Airflow.Multizone.BaseClasses.interpolate(
+    m_flow = IBPSA.Utilities.Math.Functions.interpolate(
       u=dp,
       xd=dpMea_nominal,
       yd=mMea_flow_nominal,

diff --git a/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo b/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo
@@ -5,7 +5,7 @@ block SkyClearness "Sky clearness"
   Modelica.Blocks.Interfaces.RealInput zen(
     quantity="Angle",
     unit="rad",
-    displayUnit="degreeC") "Zenith angle of the sun beam"
+    displayUnit="deg") "Zenith angle of the sun beam"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
   Modelica.Blocks.Interfaces.RealInput HDifHor(quantity=
         "RadiantEnergyFluenceRate", unit="W/m2")
@@ -66,6 +66,12 @@ is such that the regularization is usually not triggered.
 </html>", revisions="<html>
 <ul>
 <li>
+March 4, 2024, by Michael Wetter:<br/>
+Corrected <code>displayUnit</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1848\">IBPSA, #1848</a>.
+</li>
+<li>
 September 6, 2021, by Ettore Zanetti:<br/>
 Changed <code>lat</code> from being a parameter to an input from weather bus.<br/>
 Changed input connector <code>HGloHor</code> to <code>HDirNor</code>.<br/>

diff --git a/IBPSA/BoundaryConditions/WeatherData/Bus.mo b/IBPSA/BoundaryConditions/WeatherData/Bus.mo
@@ -2,8 +2,8 @@ within IBPSA.BoundaryConditions.WeatherData;
 expandable connector Bus "Data bus that stores weather data"
   extends Modelica.Icons.SignalBus;
 
-  Modelica.Units.SI.Temperature TDryBul "Dry bulb temperature";
-  Modelica.Units.SI.Temperature TWetBul "Wet bulb temperature";
+  Modelica.Units.SI.Temperature TDryBul(start=293.15) "Dry bulb temperature";
+  Modelica.Units.SI.Temperature TWetBul(start=293.15) "Wet bulb temperature";
   Modelica.Units.SI.Temperature TDewPoi "Dew point temperature";
   Modelica.Units.SI.Temperature TBlaSky "Black-body sky temperature";
 
@@ -50,6 +50,12 @@ This component is an expandable connector that is used to implement a bus that c
 </html>", revisions="<html>
 <ul>
 <li>
+June 18, 2024, by Michael Wetter:<br/>
+Added <code>start</code> and <code>nominal</code> attributes
+to avoid warnings in OpenModelica due to conflicting values.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1890\">IBPSA, #1890</a>.
+</li>
+<li>
 September 22, 2023, by Michael Wetter:<br/>
 Declared the variables that are on the bus.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1798\">IBPSA, #1798</a>.

diff --git a/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo b/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo
@@ -8,7 +8,10 @@ model NumberOfRequests
     kind=0) annotation (Placement(transformation(extent={{0,20},{20,40}})));
   Modelica.Blocks.Sources.Sine sine(f=2)
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Modelica.Blocks.Sources.Pulse pulse(period=0.35)
+  Modelica.Blocks.Sources.Pulse pulse(
+    amplitude=1-pulse.offset,
+    period=0.35,
+    offset=-0.01)
     annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
 equation
   connect(sine.y, numReq.u[1]) annotation (Line(points={{-39,-10},{-19.5,-10},{
@@ -21,6 +24,12 @@ __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Controls/Conti
     Documentation(revisions="<html>
 <ul>
 <li>
+June 16, 2024, by Hongxiang Fu:<br/>
+Changed pulse input from 0 to 1 to 0.01 to 1.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1897\">#1897</a>.
+</li>
+<li>
 January 12, 2017, by Thierry S. Nouidui:<br/>
 Modified example to prevent simultaneous events
 This is for

diff --git a/IBPSA/Controls/SetPoints/SupplyReturnTemperatureReset.mo b/IBPSA/Controls/SetPoints/SupplyReturnTemperatureReset.mo
@@ -15,7 +15,7 @@ block SupplyReturnTemperatureReset
 
   parameter Boolean use_TRoo_in = false
     "Get the room temperature set point from the input connector"
-    annotation(Evaluate=true, HideResult=true);
+    annotation(Evaluate=true);
   parameter Modelica.Units.SI.Temperature TRoo=293.15
     "Fixed value of room temperature set point"
     annotation (Dialog(enable=not use_TRoo_in));
@@ -86,8 +86,14 @@ shift the heating curve.
 </html>", revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 January 03, 2020, by Jianjun Hu:<br/>
-Changed name from <code>HotWaterTemperatureReset</code> to 
+Changed name from <code>HotWaterTemperatureReset</code> to
 <code>SupplyReturnTemperatureReset</code>.<br/>
 This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1273\">#1273</a>.