Merge branch 'lbl-srg:master' into master

Author: karthikeyad-pnnl

.github/workflows/formatting.yml

@@ -24,7 +24,7 @@ jobs:
     # Skip if the commit message contains "ci skip"
     if: "!contains(github.event.head_commit.message, 'ci skip')"
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       # Checks-out repository under $GITHUB_WORKSPACE, so job can access it

.travis.yml

@@ -33,7 +33,7 @@ env:
     - DOCKER_REPONAME=lbnlblum
     - BUILDINGSPY_VERSION=BuildingsPy@0bc654fd913c83f64163be167807e8989eff0293
     - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
-    - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.51.6
+    - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.55.11
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64
     - 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

Buildings/DHC/ETS/Combined/Controls/BaseClasses/PartialSupervisory.mo

@@ -1,7 +1,7 @@
 within Buildings.DHC.ETS.Combined.Controls.BaseClasses;
 partial block PartialSupervisory
   "Partial model for supervisory controller"
-  extends Modelica.Blocks.Icons.Block;
+
   parameter Integer nSouAmb
     "Number of ambient sources to control"
     annotation (Evaluate=true);
@@ -88,7 +88,16 @@ equation
   annotation (
     Icon(
       coordinateSystem(
-        preserveAspectRatio=false)),
+        preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          textColor={0,0,255},
+          extent={{-100,100},{102,140}},
+          textString="%name")}),
     Diagram(
       coordinateSystem(
         preserveAspectRatio=false,

Buildings/DHC/ETS/Combined/Controls/Borefield.mo

@@ -1,149 +1,151 @@
 within Buildings.DHC.ETS.Combined.Controls;
 model Borefield
   "Borefield controller"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.Units.SI.Temperature TBorWatEntMax(displayUnit="degC")
+
+  parameter Real TBorWatEntMax(
+    final quantity="ThermodynamicTemperature",
+    final unit="K",
+    displayUnit="degC")
     "Maximum value of borefield water entering temperature";
   parameter Real spePumBorMin(
     final unit="1")=0.1
     "Borefield pump minimum speed";
   Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso_actual[2]
     "Isolation valves return position (fractional)"
-    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
     iconTransformation(extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Control signal from supervisory"
-    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
     iconTransformation(extent={{-140,40},{-100,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPum(
     final unit="kg/s")
     "Control signal for borefield pump"
-    annotation (Placement(transformation(extent={{100,40},{140,80}}),
+    annotation (Placement(transformation(extent={{100,60},{140,100}}),
     iconTransformation(extent={{100,40},{140,80}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValMix(
     final unit="1")
     "Control signal for borefield mixing valve"
-    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+    annotation (Placement(transformation(extent={{100,-90},{140,-50}}),
     iconTransformation(extent={{100,-80},{140,-40}})));
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TBorWatEnt(
     final unit="K",
     displayUnit="degC")
     "Borefield water entering temperature"
-    annotation (Placement(transformation(extent={{-140,-120},{-100,-80}}),
+    annotation (Placement(transformation(extent={{-140,-130},{-100,-90}}),
     iconTransformation(extent={{-140,-80},{-100,-40}})));
   Buildings.Controls.OBC.CDL.Reals.PIDWithReset conMix(
     final yMin=0,
     final yMax=1,
     final reverseActing=true,
     y_reset=0,
     k=0.1,
-    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    Ti(
-      displayUnit="s")=120)
+    final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    Ti(displayUnit="s")=120)
     "Mixing valve controller"
-    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+    annotation (Placement(transformation(extent={{-10,-100},{10,-80}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxTBorWatEnt(
     y(final unit="K",
       displayUnit="degC"),
     final k=TBorWatEntMax)
     "Maximum value of borefield water entering temperature"
-    annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
+    annotation (Placement(transformation(extent={{-50,-100},{-30,-80}})));
   Buildings.Controls.OBC.CDL.Reals.GreaterThreshold opeVal(
     final t=0.9,
     final h=0.1)
     "True if at least one isolation valve is open"
-    annotation (Placement(transformation(extent={{-50,-58},{-30,-38}})));
+    annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
   Buildings.Controls.OBC.CDL.Reals.MultiMax multiMax1(
     final nin=2)
     "Maximum opening"
-    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
   Buildings.Controls.OBC.CDL.Reals.GreaterThreshold enaSup(
     final t=0.05,
     final h=0.025)
     "Borefield enabled from supervisory"
-    annotation (Placement(transformation(extent={{-50,-30},{-30,-10}})));
+    annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
   Buildings.Controls.OBC.CDL.Reals.Switch runBor
     "Enable borefield system pump"
-    annotation (Placement(transformation(extent={{70,50},{90,70}})));
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant limVal(
     final k=0.3)
     "Control signal value for full opening of the valve"
-    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
+    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant speMin(
     final k=spePumBorMin)
     "Minimum pump speed"
-    annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
+    annotation (Placement(transformation(extent={{-40,94},{-20,114}})));
   Buildings.Controls.OBC.CDL.Logical.And enaBor
     "Borefield enable signal"
-    annotation (Placement(transformation(extent={{-10,-40},{10,-20}})));
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
   Buildings.Controls.OBC.CDL.Reals.Line mapSpe
     "Mapping function for pump speed"
-    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+    annotation (Placement(transformation(extent={{20,90},{40,110}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(
     final k=1)
     "One"
     annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
     final k=0)
     "Zero"
-    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+    annotation (Placement(transformation(extent={{-60,50},{-40,70}})));
   Buildings.Controls.OBC.CDL.Reals.Line mapVal
     "Mapping function for valve opening"
-    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+    annotation (Placement(transformation(extent={{20,40},{40,60}})));
   Buildings.Controls.OBC.CDL.Reals.Min min1
     "Minimum"
-    annotation (Placement(transformation(extent={{70,-70},{90,-50}})));
+    annotation (Placement(transformation(extent={{70,-80},{90,-60}})));
 equation
   connect(multiMax1.y,opeVal.u)
-    annotation (Line(points={{-68,-40},{-60,-40},{-60,-48},{-52,-48}},color={0,0,127}));
+    annotation (Line(points={{-58,-60},{-42,-60}}, color={0,0,127}));
   connect(yValIso_actual,multiMax1.u)
-    annotation (Line(points={{-120,-40},{-92,-40}},color={0,0,127}));
+    annotation (Line(points={{-120,-60},{-82,-60}},color={0,0,127}));
   connect(u,enaSup.u)
-    annotation (Line(points={{-120,60},{-80,60},{-80,-20},{-52,-20}},color={0,0,127}));
+    annotation (Line(points={{-120,80},{-80,80},{-80,-30},{-42,-30}},color={0,0,127}));
   connect(enaSup.y,enaBor.u1)
-    annotation (Line(points={{-28,-20},{-20,-20},{-20,-30},{-12,-30}},color={255,0,255}));
+    annotation (Line(points={{-18,-30},{0,-30},{0,-40},{18,-40}}, color={255,0,255}));
   connect(opeVal.y,enaBor.u2)
-    annotation (Line(points={{-28,-48},{-20,-48},{-20,-38},{-12,-38}},color={255,0,255}));
+    annotation (Line(points={{-18,-60},{0,-60},{0,-48},{18,-48}}, color={255,0,255}));
   connect(enaBor.y,conMix.trigger)
-    annotation (Line(points={{12,-30},{20,-30},{20,-96},{-6,-96},{-6,-92}},color={255,0,255}));
+    annotation (Line(points={{42,-40},{60,-40},{60,-106},{-6,-106},{-6,-102}}, color={255,0,255}));
   connect(maxTBorWatEnt.y,conMix.u_s)
-    annotation (Line(points={{-28,-80},{-12,-80}},color={0,0,127}));
+    annotation (Line(points={{-28,-90},{-12,-90}},color={0,0,127}));
   connect(runBor.y,yPum)
-    annotation (Line(points={{92,60},{120,60}},color={0,0,127}));
+    annotation (Line(points={{92,80},{120,80}},color={0,0,127}));
   connect(TBorWatEnt,conMix.u_m)
-    annotation (Line(points={{-120,-100},{0,-100},{0,-92}},color={0,0,127}));
+    annotation (Line(points={{-120,-110},{0,-110},{0,-102}}, color={0,0,127}));
   connect(enaBor.y,runBor.u2)
-    annotation (Line(points={{12,-30},{20,-30},{20,20},{64,20},{64,60},{68,60}},color={255,0,255}));
+    annotation (Line(points={{42,-40},{60,-40},{60,80},{68,80}},  color={255,0,255}));
   connect(mapSpe.y,runBor.u1)
-    annotation (Line(points={{42,80},{60,80},{60,68},{68,68}},color={0,0,127}));
+    annotation (Line(points={{42,100},{60,100},{60,88},{68,88}}, color={0,0,127}));
   connect(u,mapSpe.u)
-    annotation (Line(points={{-120,60},{0,60},{0,80},{18,80}},color={0,0,127}));
+    annotation (Line(points={{-120,80},{0,80},{0,100},{18,100}}, color={0,0,127}));
   connect(speMin.y,mapSpe.f1)
-    annotation (Line(points={{-18,84},{18,84}},color={0,0,127}));
+    annotation (Line(points={{-18,104},{18,104}}, color={0,0,127}));
   connect(min1.y,yValMix)
-    annotation (Line(points={{92,-60},{120,-60}},color={0,0,127}));
+    annotation (Line(points={{92,-70},{120,-70}},color={0,0,127}));
   connect(conMix.y,min1.u2)
-    annotation (Line(points={{12,-80},{60,-80},{60,-66},{68,-66}},color={0,0,127}));
+    annotation (Line(points={{12,-90},{50,-90},{50,-76},{68,-76}},color={0,0,127}));
   connect(mapVal.y,min1.u1)
-    annotation (Line(points={{42,40},{60,40},{60,-54},{68,-54}},color={0,0,127}));
+    annotation (Line(points={{42,50},{50,50},{50,-64},{68,-64}},color={0,0,127}));
   connect(one.y,mapSpe.x2)
-    annotation (Line(points={{2,0},{12,0},{12,76},{18,76}},color={0,0,127}));
+    annotation (Line(points={{2,0},{12,0},{12,96},{18,96}},color={0,0,127}));
   connect(one.y,mapSpe.f2)
-    annotation (Line(points={{2,0},{12,0},{12,72},{18,72}},color={0,0,127}));
+    annotation (Line(points={{2,0},{12,0},{12,92},{18,92}},color={0,0,127}));
   connect(one.y,mapVal.f2)
-    annotation (Line(points={{2,0},{12,0},{12,32},{18,32}},color={0,0,127}));
+    annotation (Line(points={{2,0},{12,0},{12,42},{18,42}},color={0,0,127}));
   connect(zer.y,mapVal.x1)
-    annotation (Line(points={{-38,40},{-10,40},{-10,48},{18,48}},color={0,0,127}));
+    annotation (Line(points={{-38,60},{-10,60},{-10,58},{18,58}},color={0,0,127}));
   connect(limVal.y,mapVal.x2)
-    annotation (Line(points={{-18,20},{6,20},{6,36},{18,36}},color={0,0,127}));
+    annotation (Line(points={{-18,30},{6,30},{6,46},{18,46}},color={0,0,127}));
   connect(u,mapVal.u)
-    annotation (Line(points={{-120,60},{0,60},{0,40},{18,40}},color={0,0,127}));
+    annotation (Line(points={{-120,80},{0,80},{0,50},{18,50}},color={0,0,127}));
   connect(limVal.y,mapSpe.x1)
-    annotation (Line(points={{-18,20},{6,20},{6,88},{18,88}},color={0,0,127}));
+    annotation (Line(points={{-18,30},{6,30},{6,108},{18,108}}, color={0,0,127}));
   connect(zer.y,mapVal.f1)
-    annotation (Line(points={{-38,40},{-10,40},{-10,44},{18,44}},color={0,0,127}));
+    annotation (Line(points={{-38,60},{-10,60},{-10,54},{18,54}},color={0,0,127}));
   connect(zer.y,runBor.u3)
-    annotation (Line(points={{-38,40},{-10,40},{-10,52},{68,52}},color={0,0,127}));
+    annotation (Line(points={{-38,60},{-10,60},{-10,72},{68,72}},color={0,0,127}));
   annotation (
     Diagram(
       coordinateSystem(
@@ -200,5 +202,15 @@ the control of the system when the mass flow rate required to meet
 the heat or cold rejection demand is below the flow rate corresponding
 to the minimum pump speed.
 </p>
-</html>"));
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          textColor={0,0,255},
+          extent={{-100,100},{102,140}},
+          textString="%name")}));
 end Borefield;

Buildings/DHC/ETS/Combined/Controls/Chiller.mo

@@ -1,10 +1,16 @@
 within Buildings.DHC.ETS.Combined.Controls;
 model Chiller
   "Chiller controller"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.Units.SI.Temperature TConWatEntMin(displayUnit="degC")
+
+  parameter Real TConWatEntMin(
+    final quantity="ThermodynamicTemperature",
+    final unit="K",
+    displayUnit="degC")
     "Minimum value of condenser water entering temperature";
-  parameter Modelica.Units.SI.Temperature TEvaWatEntMax(displayUnit="degC")
+  parameter Real TEvaWatEntMax(
+    final quantity="ThermodynamicTemperature",
+    final unit="K",
+    displayUnit="degC")
     "Maximum value of evaporator water entering temperature";
   Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
     "Cooling enable signal"
@@ -41,8 +47,8 @@ model Chiller
   Buildings.Controls.OBC.CDL.Logical.Or heaOrCoo
     "Heating or cooling enabled"
     annotation (Placement(transformation(extent={{-120,50},{-100,70}})));
-  PIDWithEnable conValEva(
-    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
+  Buildings.DHC.ETS.Combined.Controls.PIDWithEnable conValEva(
+    final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     final yMax=1,
     final yMin=0,
     y_reset=0,
@@ -52,8 +58,8 @@ model Chiller
     final reverseActing=true)
     "Evaporator three-way valve control"
     annotation (Placement(transformation(extent={{50,-10},{70,10}})));
-  PIDWithEnable conValCon(
-    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
+  Buildings.DHC.ETS.Combined.Controls.PIDWithEnable conValCon(
+    final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
     final yMax=1,
     final yMin=0,
     y_reset=0,
@@ -102,7 +108,16 @@ equation
     Icon(
       coordinateSystem(
         preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
+        extent={{-100,-100},{100,100}}), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          textColor={0,0,255},
+          extent={{-100,100},{102,140}},
+          textString="%name")}),
     Diagram(
       coordinateSystem(
         preserveAspectRatio=false,
@@ -129,7 +144,7 @@ When enabled,
 </p>
 <ul>
 <li>
-the condenser and evaporator pumps are operated at constant speed,
+the condenser and evaporator pumps are operated at constant speed, and
 </li>
 <li>
 the condenser (resp. evaporator) mixing valve is modulated with a PI