added enabling conditions

lbl-srg · Jan 5, 2024 · 80101ff · 80101ff
1 parent bb7b4de
commit 80101ff
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/FanSpeed.mo b/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/FanSpeed.mo
@@ -6,7 +6,7 @@ block FanSpeed
     "True if the unit has a cooling coil";
 
   parameter Boolean have_heaCoi
-    "true if the unit has a heating coil";
+    "True if the unit has a heating coil";
 
   parameter Real deaSpe(
     final unit="1",

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/SupplyAirTemperature.mo b/Buildings/Controls/OBC/ASHRAE/G36/FanCoilUnit/Subsequences/SupplyAirTemperature.mo
@@ -3,10 +3,10 @@ block SupplyAirTemperature
   "Subsequence for calculating supply air temperature setpoint"
 
   parameter Boolean have_cooCoi
-    "Does the fan coil unit have a cooling coil? True: Yes, False: No";
+    "True if the unit has a cooling coil";
 
   parameter Boolean have_heaCoi
-    "Does the fan coil unit have a heating coil? True: Yes, False: No";
+    "True if the unit has a heating coil";
 
   parameter Real uHea_min(
     final unit="1",
@@ -58,59 +58,67 @@ block SupplyAirTemperature
 
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeCooCoi=Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of cooling coil controller"
-    annotation(Dialog(tab="PID controller parameters", group="Cooling coil"));
+    annotation(Dialog(tab="PID controller parameters", group="Cooling coil",
+                      enable=have_cooCoi));
 
   parameter Real kCooCoi(
     final unit="1",
     displayUnit="1")=1
     "Controller gain"
-    annotation(Dialog(tab="PID controller parameters", group="Cooling coil"));
+    annotation(Dialog(tab="PID controller parameters", group="Cooling coil",
+                      enable=have_cooCoi));
 
   parameter Real TiCooCoi(
     final unit="s",
     displayUnit="s",
     final quantity="time")=0.5
     "Integrator time constant"
     annotation(Dialog(tab="PID controller parameters", group="Cooling coil",
-      enable = controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
-      controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+      enable = (controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+                or controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)
+            and have_cooCoi));
 
   parameter Real TdCooCoi(
     final unit="s",
     displayUnit="s",
     final quantity="time")=0.1
     "Derivative block time constant"
     annotation(Dialog(tab="PID controller parameters", group="Cooling coil",
-      enable = controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
-      controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+      enable = (controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+                or controllerTypeCooCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)
+            and have_cooCoi));
 
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerTypeHeaCoi=Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of heating coil controller"
-    annotation(Dialog(tab="PID controller parameters", group="Heating coil"));
+    annotation(Dialog(tab="PID controller parameters", group="Heating coil",
+      enable=have_heaCoi));
 
   parameter Real kHeaCoi(
     final unit="1",
     displayUnit="1")=1
     "Controller gain"
-    annotation(Dialog(tab="PID controller parameters", group="Heating coil"));
+    annotation(Dialog(tab="PID controller parameters", group="Heating coil",
+      enable=have_heaCoi));
 
   parameter Real TiHeaCoi(
     final unit="s",
     displayUnit="s",
     final quantity="time")=0.5
     "Integrator block time constant"
     annotation(Dialog(tab="PID controller parameters", group="Heating coil",
-      enable = controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or
-      controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+      enable = (controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+                or controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)
+            and have_heaCoi));
 
   parameter Real TdHeaCoi(
     final unit="s",
     displayUnit="s",
     final quantity="time")=0.1
     "Derivative block time constant"
     annotation(Dialog(tab="PID controller parameters", group="Heating coil",
-      enable = controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PD or
-      controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+      enable = (controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+                or controllerTypeHeaCoi == Buildings.Controls.OBC.CDL.Types.SimpleController.PID)
+            and have_heaCoi));
 
   parameter Real deaHysLim(
     final unit="1",
@@ -374,8 +382,7 @@ equation
   connect(hysDeaHea.y, swiHeaCoi.u2) annotation (Line(points={{-58,110},{-30,110},
           {-30,90},{138,90}},color={255,0,255}));
   connect(conZer.y, swiHeaCoi.u3) annotation (Line(points={{102,-20},{120,-20},{
-          120,82},{138,82}},
-                         color={0,0,127}));
+          120,82},{138,82}}, color={0,0,127}));
   connect(conZer.y, swiCooCoi.u3) annotation (Line(points={{102,-20},{120,-20},{
           120,-148},{138,-148}},         color={0,0,127}));
   annotation (defaultComponentName="TSupAir",