From 4ed0089eaccbed37b1f4bad5e763cba5e741b0fe Mon Sep 17 00:00:00 2001
From: JayHuLBL <jianjunhu@lbl.gov>
Date: Wed, 20 Sep 2023 13:58:57 -0700
Subject: [PATCH] corrected condition for enabling returning air temperature
 input

---
 .../OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Controller.mo   | 11 ++++++-----
 .../G36/AHUs/MultiZone/VAV/Economizers/Controller.mo  |  8 +++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Controller.mo
index 0843ea016c1..42b6430dfd4 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Controller.mo
@@ -34,8 +34,8 @@ block Controller "Multizone VAV air handling unit controller"
     annotation (__cdl(ValueInReference=false),
                 Dialog(group="Economizer design",
                        enable=buiPreCon==Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan));
-  parameter Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer ecoHigLimCon=
-    Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb
+  parameter Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.
+      FixedDryBulb
     "Economizer high limit control device"
     annotation (__cdl(ValueInReference=false),
                 Dialog(group="Economizer design"));
@@ -641,8 +641,8 @@ block Controller "Multizone VAV air handling unit controller"
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TAirRet(
     final unit="K",
     displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    if ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb
+    final quantity="ThermodynamicTemperature") if (ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb
+     or ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulbWithDifferentialDryBulb)
     "Used only for fixed plus differential dry bulb temperature high limit cutoff"
     annotation (Placement(transformation(extent={{-400,-100},{-360,-60}}),
         iconTransformation(extent={{-240,-100},{-200,-60}})));
@@ -1289,7 +1289,8 @@ annotation (
           extent={{-196,-70},{-160,-90}},
           textColor={0,0,0},
           textString="TAirRet",
-          visible=ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb),
+          visible=(ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb
+                or ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulbWithDifferentialDryBulb)),
        Text(
           extent={{-196,-90},{-160,-108}},
           textColor={0,0,0},
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Controller.mo
index bdf55dd95de..57572621ea7 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Controller.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Controller.mo
@@ -238,8 +238,8 @@ block Controller
   Buildings.Controls.OBC.CDL.Interfaces.RealInput TAirRet(
     final unit="K",
     displayUnit="degC",
-    final quantity="ThermodynamicTemperature")
-    if ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb
+    final quantity="ThermodynamicTemperature") if (ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb
+     or ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulbWithDifferentialDryBulb)
     "Used only for fixed plus differential dry bulb temperature high limit cutoff"
     annotation (Placement(transformation(extent={{-280,-120},{-240,-80}}),
         iconTransformation(extent={{-140,-80},{-100,-40}})));
@@ -589,7 +589,9 @@ annotation (defaultComponentName="ecoCon",
           extent={{-100,-52},{-58,-66}},
           textColor={0,0,127},
           pattern=LinePattern.Dash,
-          visible=ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb,
+          visible=(ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb
+               or ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulbWithDifferentialDryBulb),
+
           textString="TAirRet"),
         Text(
           extent={{-100,-82},{-58,-98}},