From 8652b0ab3cb23175271482e082c8015f0bcc711f Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Thu, 16 Nov 2017 11:00:19 -0800 Subject: [PATCH 01/11] Corrected wrong cast of enumeration [ci skip] For #1066 --- .../Examples/IntegratedPrimaryLoadSideEconomizer.mo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimaryLoadSideEconomizer.mo b/Buildings/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimaryLoadSideEconomizer.mo index 2cead3600ef..466aa8afc6d 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimaryLoadSideEconomizer.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Examples/IntegratedPrimaryLoadSideEconomizer.mo @@ -5,13 +5,13 @@ model IntegratedPrimaryLoadSideEconomizer extends Buildings.Applications.DataCenters.ChillerCooled.Examples.BaseClasses.PostProcess( freCooSig( - y=if cooModCon.y == integer(Buildings.Applications.DataCenters.Types.CoolingModes.FreeCooling) + y=if cooModCon.y == Integer(Buildings.Applications.DataCenters.Types.CoolingModes.FreeCooling) then 1 else 0), parMecCooSig( - y=if cooModCon.y == integer(Buildings.Applications.DataCenters.Types.CoolingModes.PartialMechanical) + y=if cooModCon.y == Integer(Buildings.Applications.DataCenters.Types.CoolingModes.PartialMechanical) then 1 else 0), fulMecCooSig( - y=if cooModCon.y == integer(Buildings.Applications.DataCenters.Types.CoolingModes.FullMechanical) + y=if cooModCon.y == Integer(Buildings.Applications.DataCenters.Types.CoolingModes.FullMechanical) then 1 else 0), PHVAC(y=cooTow[1].PFan + cooTow[2].PFan + pumCW[1].P + pumCW[2].P + sum( chiWSE.powChi + chiWSE.powPum) + ahu.PFan + ahu.PHea), From b443fa4321628b35b4f04de6d9427873474783eb Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Thu, 16 Nov 2017 13:44:15 -0800 Subject: [PATCH 02/11] Corrected documentation --- .../OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplyFan.mo | 1 - 1 file changed, 1 deletion(-) diff --git a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplyFan.mo b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplyFan.mo index 38f4d21b304..3cbda72de79 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplyFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36_PR1/AHUs/MultiZone/SetPoints/VAVSupplyFan.mo @@ -413,7 +413,6 @@ Where the zone groups served by the system are small, provide multiple sets of gains that are used in the control loop as a function of a load indicator (such as supply fan airflow rate, the area of the zone groups that are occupied, etc.). -

", revisions="