Merge branch 'lbl-srg:master' into master

Author: karthikeyad-pnnl

.github/workflows/formatting.yml

@@ -40,7 +40,7 @@ jobs:
         run: pip3 install --upgrade pip wheel
 
       - name: "Install BuildingsPy"
-        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@0bc654fd913c83f64163be167807e8989eff0293
+        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@0f21a33a8416149d6aa297e25c6e7dc11e1d21bd
 
       - name: Check for UTF-8 BOM
         run : |

.travis.yml

@@ -31,10 +31,10 @@ services:
 env:
   global:
     - DOCKER_REPONAME=lbnlblum
-    - BUILDINGSPY_VERSION=BuildingsPy@0bc654fd913c83f64163be167807e8989eff0293
+    - BUILDINGSPY_VERSION=BuildingsPy@0f21a33a8416149d6aa297e25c6e7dc11e1d21bd
     - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
     - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.55.11
-    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64
+    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64_rev-1
     - ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64
     - ENERGYPLUS_23_1_0=EnergyPlus-23.1.0-87ed9199d4-Linux-Ubuntu20.04-x86_64
     - MODELICA_JSON_VERSION=6d950c3592fa021aa914ba4ff34a67cbb69962c6
@@ -69,14 +69,11 @@ env:
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Applications\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Applications\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\" SINGLEPROC=\"true\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.Examples.Combined\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.Combined\" SINGLEPROC=\"true\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.Examples.Combined\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-dymola  PACKAGE=\"Buildings.DHC.Examples\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples\" SINGLEPROC=\"true\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.Examples\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""

Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case600.mo

@@ -93,10 +93,10 @@ model Case600
     u(unit="W"),
     y(unit="J", displayUnit="J")) "Cooling energy in Joules"
     annotation (Placement(transformation(extent={{54,74},{66,86}})));
-  MovingAverage PHea(delta=3600)
+  Buildings.Controls.OBC.CDL.Reals.MovingAverage PHea(delta=3600)
     "Hourly averaged heating power"
     annotation (Placement(transformation(extent={{34,84},{42,92}})));
-  MovingAverage PCoo(delta=3600) "Hourly averaged cooling power"
+  Buildings.Controls.OBC.CDL.Reals.MovingAverage PCoo(delta=3600) "Hourly averaged cooling power"
     annotation (Placement(transformation(extent={{38,22},{46,30}})));
 
   Modelica.Blocks.Sources.CombiTimeTable TSetCoo(table=[0.0,273.15 + 27])
@@ -107,196 +107,6 @@ model Case600
   Modelica.Blocks.Sources.Constant latGai(k=0) "Internal heat gains"
     annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
 
-protected
-
-block MovingAverage "Block to output moving average"
-  parameter Real delta(
-    final quantity="Time",
-    final unit="s",
-    min=1E-5)
-    "Time horizon over which the input is averaged";
-  Modelica.Blocks.Interfaces.RealInput u
-    "Connector of Real input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Modelica.Blocks.Interfaces.RealOutput y
-    "Connector of Real output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-protected
-  parameter Real tStart(
-    final quantity="Time",
-    final unit="s",
-    fixed=false)
-    "Start time";
-  Real mu
-    "Internal integrator variable";
-  Real muDel
-    "Internal integrator variable with delay";
-  Boolean mode(
-    start=false,
-    fixed=true)
-    "Calculation mode";
-
-initial equation
-  tStart=time;
-  mu=0;
-
-equation
-  u=der(mu);
-  muDel=delay(
-    mu,
-    delta);
-  // Compute the mode so that Dymola generates
-  // time and not state events as it would with
-  // an if-then construct
-  when time >= tStart+delta then
-    mode=true;
-  end when;
-  if mode then
-    y=(mu-muDel)/delta;
-  else
-    y=(mu-muDel)/(time-tStart+1E-3);
-  end if;
-  annotation (
-    defaultComponentName="movAve",
-    Icon(
-      graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-78,90},{-86,68},{-70,68},{-78,90}},
-          lineColor={192,192,192},
-          fillColor={192,192,192},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-78,68},{-78,-80}},
-          color={192,192,192}),
-        Line(
-          points={{-88,0},{70,0}},
-          color={192,192,192}),
-        Polygon(
-          points={{92,0},{70,8},{70,-8},{92,0}},
-          lineColor={192,192,192},
-          fillColor={192,192,192},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-78,-31},{-64,-31},{-64,-15},{-56,-15},{-56,-63},{-48,-63},
-          {-48,-41},{-40,-41},{-40,43},{-32,43},{-32,11},{-32,11},{-32,-49},
-          {-22,-49},{-22,-31},{-12,-31},{-12,-59},{-2,-59},{-2,23},{4,23},
-          {4,37},{10,37},{10,-19},{20,-19},{20,-7},{26,-7},{26,-37},
-          {36,-37},{36,35},{46,35},{46,1},{54,1},{54,-65},{64,-65}},
-          color={215,215,215}),
-        Line(
-          points={{-78,-24},{68,-24}}),
-        Text(
-          extent={{-140,152},{160,112}},
-          textString="%name",
-          textColor={0,0,255}),
-        Text(
-          extent={{-42,-63},{41,-106}},
-          textColor={192,192,192},
-          textString="%delta s"),
-        Text(
-          extent={{226,60},{106,10}},
-          textColor={0,0,0},
-          textString=DynamicSelect("",String(y,
-            leftJustified=false,
-            significantDigits=3)))}),
-    Documentation(
-      info="<html>
-<p>
-This block outputs the mean value of its input signal as
-</p>
-<pre>
-      1  t
-y =   -  &int;   u(s) ds
-      &delta;  t-&delta;
-</pre>
-<p>
-where <i>&delta;</i> is a parameter that determines the time window over
-which the input is averaged.
-For
-<i> t &lt; &delta;</i> seconds, it outputs
-</P>
-<pre>
-           1      t
-y =   --------    &int;   u(s) ds
-      t-t<sub>0</sub>+10<sup>-10</sup>   t<sub>0</sub>
-</pre>
-<p>
-where <i>t<sub>0</sub></i> is the initial time.
-</p>
-<p>
-This block can for example be used to output the moving
-average of a noisy measurement signal.
-</p>
-<p>
-See
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage\">
-Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage</a>
-and
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage_nonZeroStart\">
-Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage_nonZeroStart</a>
-for example.
-</p>
-</html>",
-revisions="<html>
-<ul>
-<li>
-January 27, 2022, by Jianjun Hu:<br/>
-Renamed the block name from MovingMean to MovingAverage.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">issue 2865</a>.
-</li>
-<li>
-November 12, 2020, by Michael Wetter:<br/>
-Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2243\">issue 2243</a>.
-</li>
-<li>
-March 2, 2020, by Michael Wetter:<br/>
-Changed icon to display dynamically the output value.
-</li>
-<li>
-October 24, 2017, by Michael Wetter:<br/>
-Set initial condition for <code>mu</code>.
-</li>
-<li>
-October 17, 2017, by Michael Wetter:<br/>
-Reformulated implementation to avoid direct feedthrough.
-</li>
-<li>
-October 16, 2017, by Michael Wetter:<br/>
-Reformulated implementation to handle division by zero as the previous
-implementation caused division by zero in the VAV reheat model with the Radau solver.
-</li>
-<li>
-September 27, 2017, by Thierry S. Nouidui:<br/>
-Reformulated implementation to handle division by zero.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/978\">issue 978</a>.
-</li>
-<li>
-September 15, 2017, by Thierry S. Nouidui:<br/>
-Reformulated implementation to avoid state events.
-</li>
-<li>
-July 5, 2017, by Michael Wetter:<br/>
-Revised implementation to allow non-zero start time.
-</li>
-<li>
-June 29, 2017, by Jianjun Hu:<br/>
-First implementation. This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/825\">issue 825</a>.
-</li>
-</ul>
-</html>"));
-end MovingAverage;
-
-
 equation
   connect(sumHeaCoo.y,preHeaCoo. Q_flow)
     annotation (Line(points={{62.4,60},{68,60}}, color={0,0,127}));
@@ -355,6 +165,13 @@ for heating and <i>27</i>&deg;C for cooling. The room has no shade and a window
 </p>
 </html>", revisions="<html><ul>
 <li>
+March 5, 2025, by Jianjun Hu:<br/>
+Replaced the moving average calculation with CDL block.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1982\">
+IBPSA #1982</a>.
+</li>
+<li>
 May 2, 2024, by Alessandro Maccarini:<br/>
 Updated according to ASHRAE 140-2020.
 </li>