updated reference results #2293 [ci skip]

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Economizers/Controller.mo

@@ -144,7 +144,7 @@ block Controller "Waterside economizer (WSE) enable/disable status"
         transformation(extent={{180,-118},{200,-98}}), iconTransformation(
           extent={{100,-100},{120,-80}})));
 
-//protected
+protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Economizers.Subsequences.Tuning wseTun(
     final step=step,
     final wseOnTimDec=wseOnTimDec,

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Generic/PlantEnable.mo

@@ -54,7 +54,7 @@ block PlantEnable "Sequence to enable and disable plant"
     "Plant enabling schedule allowing operators to lock out the plant during off-hour"
     annotation (Placement(transformation(extent={{-140,40},{-120,60}})));
 
-//protected
+protected
   final parameter Buildings.Controls.OBC.CDL.Types.Smoothness tabSmo=
     Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments
     "Smoothness of table interpolation";

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/SetpointController.mo

@@ -325,6 +325,16 @@ block SetpointController
     annotation (Placement(transformation(extent={{120,260},{160,300}}),
       iconTransformation(extent={{100,-130},{140,-90}})));
 
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yUp
+    "Stage up signal"
+    annotation (Placement(transformation(extent={{120,60},{160,100}}),
+      iconTransformation(extent={{100,160},{140,200}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yDow
+    "Stage down signal"
+    annotation (Placement(transformation(extent={{120,22},{156,58}}),
+      iconTransformation(extent={{100,130},{140,170}})));
+
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yOpeParLoaRatMin(
     final unit="1",
     final min=0)
@@ -335,9 +345,9 @@ block SetpointController
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCapReq(
     final quantity="Power",
     final unit="W")
-    "Chilled water cooling capacity requirement" annotation (Placement(
-        transformation(extent={{120,370},{160,410}}), iconTransformation(extent=
-           {{100,-230},{140,-190}})));
+    "Chilled water cooling capacity requirement"
+    annotation (Placement(transformation(extent={{120,370},{160,410}}),
+      iconTransformation(extent={{100,-230},{140,-190}})));
 
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Staging.SetPoints.Subsequences.Up staUp(
     final have_WSE=have_WSE,
@@ -375,14 +385,7 @@ block SetpointController
     final nSta=nSta) "Design and minimum capacities for relevant chiller stages"
     annotation (Placement(transformation(extent={{-270,-180},{-250,-160}})));
 
-  CDL.Interfaces.BooleanOutput yUp "Stage up signal" annotation (Placement(
-        transformation(extent={{120,60},{160,100}}), iconTransformation(extent=
-            {{100,160},{140,200}})));
-  CDL.Interfaces.BooleanOutput yDow "Stage down signal" annotation (Placement(
-        transformation(extent={{120,22},{156,58}}), iconTransformation(extent={
-            {100,130},{140,170}})));
-
-//protected
+protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Staging.SetPoints.Subsequences.Initial iniSta(
     final have_WSE=have_WSE)
     annotation (Placement(transformation(extent={{-80,100},{-60,120}})));

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Change.mo

@@ -70,7 +70,7 @@ block Change "Calculates the chiller stage signal"
         transformation(extent={{440,140},{480,180}}),  iconTransformation(
           extent={{100,20},{140,60}})));
 
-//protected
+protected
   Buildings.Controls.OBC.CDL.Logical.Or or2 "Logical or"
     annotation (Placement(transformation(extent={{-360,-100},{-340,-80}})));
 

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/Subsequences/Down.mo

@@ -111,7 +111,7 @@ block Down "Generates a stage down signal"
     annotation (Placement(transformation(extent={{180,-10},{200,10}}),
         iconTransformation(extent={{100,-20},{140,20}})));
 
-//protected
+protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Staging.SetPoints.Subsequences.FailsafeCondition faiSafCon(
     final have_serChi=have_serChi,
     final faiSafTruDelay=faiSafTruDelay,

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/Controller.mo

@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers;
+within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers;
 block Controller "Cooling tower controller"
 
   parameter Integer nChi=2 "Total number of chillers";
@@ -314,7 +314,7 @@ block Controller "Cooling tower controller"
     annotation (Placement(transformation(extent={{100,-260},{140,-220}}),
       iconTransformation(extent={{100,-190},{140,-150}})));
 
-//protected
+protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.Controller towFanSpe(
     final nChi=nChi,
     final nTowCel=nTowCel,

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Controller.mo

@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE;
+within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE;
 block Controller "Tower fan speed control when waterside economizer is enabled"
 
   parameter Integer nChi=2 "Total number of chillers";
@@ -83,7 +83,7 @@ block Controller "Tower fan speed control when waterside economizer is enabled"
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
       iconTransformation(extent={{100,-20},{140,20}})));
 
-//protected
+protected
   Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE.Subsequences.IntegratedOperation
     intOpe(
     final nChi=nChi,

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/IntegratedOperation.mo

@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE.Subsequences;
+within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE.Subsequences;
 block IntegratedOperation
   "Tower fan speed control when the waterside economizer is enabled and the chillers are running"
 
@@ -54,7 +54,7 @@ block IntegratedOperation
     annotation (Placement(transformation(extent={{160,-100},{200,-60}}),
       iconTransformation(extent={{100,-20},{140,20}})));
 
-//protected
+protected
   Buildings.Controls.OBC.CDL.Continuous.Sources.Constant chiMinCycLoa[nChi](
     final k=chiMinCap)
     "Minimum cycling load of each chiller"
@@ -71,7 +71,7 @@ block IntegratedOperation
     final Td=Td,
     final yMax=yMax,
     final yMin=yMin,
-    reverseActing=false,
+    final reverseActing=false,
     final y_reset=yMax)
     "Controller to maintain chiller load at the sum of minimum cycling load of operating chillers"
     annotation (Placement(transformation(extent={{80,90},{100,110}})));
@@ -80,7 +80,8 @@ block IntegratedOperation
     final nin=nChi)
     "Sum of minimum cycling load for the operating chillers"
     annotation (Placement(transformation(extent={{-20,90},{0,110}})));
-  Buildings.Controls.OBC.CDL.Continuous.MultiSum totLoa(final nin=nChi) "Total load of operating chillers"
+  Buildings.Controls.OBC.CDL.Continuous.MultiSum totLoa(
+    final nin=nChi) "Total load of operating chillers"
     annotation (Placement(transformation(extent={{-20,50},{0,70}})));
   Buildings.Controls.OBC.CDL.Continuous.MultiSum minCycLoa(final nin=nChi)
     "Sum of minimum cycling load for all chillers"

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/EnabledWSE/Subsequences/WSEOperation.mo

@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE.Subsequences;
+within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.EnabledWSE.Subsequences;
 block WSEOperation
   "Tower fan speed control when the waterside economizer is running alone"
 
@@ -60,7 +60,7 @@ block WSEOperation
     annotation (Placement(transformation(extent={{140,40},{180,80}}),
       iconTransformation(extent={{100,-20},{140,20}})));
 
-//protected
+protected
   Buildings.Controls.OBC.CDL.Logical.And and2 "Logical and"
     annotation (Placement(transformation(extent={{40,130},{60,150}})));
   Buildings.Controls.OBC.CDL.Logical.Timer tim(
@@ -84,7 +84,8 @@ block WSEOperation
     "Difference between chilled water supply temperature and its setpoint"
     annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
   Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1(
-    final uLow=-0.1, final uHigh=0.1)
+    final uLow=-0.1,
+    final uHigh=0.1)
     "Check if chilled water supply temperature is greater than setpoint"
     annotation (Placement(transformation(extent={{-40,130},{-20,150}})));
   Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not"
@@ -109,7 +110,7 @@ block WSEOperation
     final Td=Td,
     final yMax=yMax,
     final yMin=yMin,
-    reverseActing=false,
+    final reverseActing=false,
     final y_reset=0)
     "Controller to maintain chilled water supply temperature at setpoint"
     annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));

Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Towers/FanSpeed/ReturnWaterTemperature/Controller.mo

@@ -1,4 +1,4 @@
-within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.ReturnWaterTemperature;
+within Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Towers.FanSpeed.ReturnWaterTemperature;
 block Controller
   "Cooling tower speed control to maintain condenser water return temperature at setpoint"
 
@@ -232,7 +232,7 @@ block Controller
     "Tower fan speed control when the plant is not closed coupled"
     annotation (Placement(transformation(extent={{40,-220},{60,-200}})));
 
-//protected
+protected
   Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(
     final nu=nChi) "Check if any chiller is enabled"
     annotation (Placement(transformation(extent={{-120,200},{-100,220}})));