diff --git a/.travis.yml b/.travis.yml index 7dd4087c74e..08a0dc61da6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ services: env: global: - - BUILDINGSPY_VERSION=BuildingsPy@50ac74d8e4fd067179bb38bc23140c2c9254c94c + - BUILDINGSPY_VERSION=BuildingsPy@7de32eb4b1bd77738dccd0cf9f7fa44b25fd51a2 - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1 - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4 - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1 @@ -64,9 +64,18 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Applications,Experimental}\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Applications,Experimental}\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Applications,Experimental}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Applications\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Applications\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Applications\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\" SINGLEPROC=\"true\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\"" @@ -98,6 +107,7 @@ env: - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Utilities\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Utilities\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Templates\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Templates\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Templates\"" before_install: @@ -152,10 +162,15 @@ install: export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0}; pip3 install pandas==1.3.5; fi; - - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.{Applications,Experimental}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then + - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then echo "Installing Spawn binaries"; Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only; fi; + - if [[ "$TEST_ARG" == *SINGLEPROC* ]]; then + export NPROC=1; + else + export NPROC=10; + fi; # Execute tests script: diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo index 3d72bc1000a..015dbfbb345 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo @@ -200,19 +200,19 @@ model ControllerChillerDXHeatingEconomizer final reverseActing=false) "Cooling coil valve controller" annotation (Placement(transformation(extent={{0,-30},{20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Switch the outdoor air fraction to 0 when in unoccupied mode" annotation (Placement(transformation(extent={{0,20},{20,40}}))); Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uOcc "Current occupancy period, true if it is in occupant period" annotation (Placement(transformation(extent={{-140,-20},{-100,20}}), iconTransformation(extent={{-140,-20},{-100,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(k=0) "Zero outside air fraction" annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swiFan "Switch fan on" + Buildings.Controls.OBC.CDL.Reals.Switch swiFan "Switch fan on" annotation (Placement(transformation(extent={{70,120},{90,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysHea( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysHea( final uLow=0.01, final uHigh=0.05) "Hysteresis for heating" @@ -222,7 +222,7 @@ model ControllerChillerDXHeatingEconomizer annotation (Placement(transformation(extent={{40,94},{60,114}}))); Modelica.Blocks.Logical.And and1 "Logical and" annotation (Placement(transformation(extent={{70,-40},{90,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater chiOnTRoo(h=1) + Buildings.Controls.OBC.CDL.Reals.Greater chiOnTRoo(h=1) "Chiller on signal based on room temperature" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo index 9651c3eaeec..722860ae94c 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerEconomizer.mo @@ -89,7 +89,7 @@ model ControllerEconomizer "Controller for economizer" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Modelica.Blocks.Math.Feedback feedback1 annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Controls.OBC.CDL.Continuous.Hysteresis hysChiPla( + Controls.OBC.CDL.Reals.Hysteresis hysChiPla( final uLow=0.95, final uHigh=0.98) "Hysteresis with delay to switch on cooling" @@ -101,7 +101,7 @@ model ControllerEconomizer "Controller for economizer" Modelica.Blocks.Logical.Not not1 "No economizer" annotation (Placement(transformation(extent={{40,-100},{60,-80}}))); - Controls.OBC.CDL.Continuous.Hysteresis hysCooPot( + Controls.OBC.CDL.Reals.Hysteresis hysCooPot( final uLow=0, final uHigh=0.5) "Hysteresis with delay to check for cooling potential of outside air" @@ -114,7 +114,7 @@ model ControllerEconomizer "Controller for economizer" final trueHoldDuration=60*15) "True/false hold for mixing temperature" annotation (Placement(transformation(extent={{-24,-40},{-4,-20}}))); - Controls.OBC.CDL.Continuous.Hysteresis hysTMix( + Controls.OBC.CDL.Reals.Hysteresis hysTMix( final uLow=-0.5, final uHigh=0.5) "Hysteresis with delay for mixed air temperature" diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo index 79edc2afa0f..892c2da658b 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/Validation/ControllerChillerDXHeatingEconomizer.mo @@ -26,7 +26,7 @@ model ControllerChillerDXHeatingEconomizer minOAFra=0.4, TSetSupAir=286.15) "Controller" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooHea( + Controls.OBC.CDL.Reals.Sources.TimeTable TSetRooHea( table=[ 0, 15 + 273.15; 8*3600, 20 + 273.15; @@ -36,7 +36,7 @@ model ControllerChillerDXHeatingEconomizer extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.Periodic) "Heating setpoint for room temperature" annotation (Placement(transformation(extent={{-100,50},{-80,70}}))); - Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooCoo( + Controls.OBC.CDL.Reals.Sources.TimeTable TSetRooCoo( table=[ 0, 30 + 273.15; 8*3600, 25 + 273.15; diff --git a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo index 527071ccf21..72c890697f1 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo @@ -132,7 +132,7 @@ model ChillerDXHeatingEconomizer final use_inputFilter=false, redeclare package Medium = MediumA) "Supply fan" - annotation (Placement(transformation(extent={{-30,32},{-10,52}}))); + annotation (Placement(transformation(extent={{-30,30},{-10,50}}))); Buildings.Fluid.FixedResistances.PressureDrop totalRes( final m_flow_nominal=mAir_flow_nominal, final dp_nominal=dp_nominal, @@ -370,9 +370,9 @@ protected end IdealValve; equation - connect(fanSup.port_b, totalRes.port_a) annotation (Line(points={{-10,42}, - {0,42},{0,40},{10,40}}, color={0,127,255})); - connect(fanSup.P, PFan) annotation (Line(points={{-9,51},{-6,51},{-6,150},{ + connect(fanSup.port_b, totalRes.port_a) annotation (Line(points={{-10,40}, + {10,40}}, color={0,127,255})); + connect(fanSup.P, PFan) annotation (Line(points={{-9,49},{-6,49},{-6,150},{ 210,150}}, color={0,0,127})); connect(eff.y, QHea_flow) annotation (Line(points={{141,110},{166,110},{166, 130},{210,130}}, @@ -385,7 +385,7 @@ equation index=-1, extent={{-6,3},{-6,3}})); connect(senTMixAir.port_b, fanSup.port_a) annotation (Line(points={{-40,40}, - {-36,40},{-36,42},{-30,42}}, color={0,127,255})); + {-30,40}}, color={0,127,255})); connect(heaCoi.Q_flow, eff.u) annotation (Line(points={{73,46},{80,46},{80, 110},{118,110}}, color={0,0,127})); connect(heaCoi.port_b, cooCoi.port_a2) annotation (Line(points={{72,40},{90,40}}, color={0,127,255})); @@ -410,7 +410,7 @@ equation extent={{-6,3},{-6,3}})); connect(pumChiWat.P, PPum) annotation (Line(points={{111,-79},{111,-52},{180, -52},{180,90},{210,90}}, color={0,0,127})); - connect(chi.P, PCoo) annotation (Line(points={{89,-177},{84,-177},{84,-128},{ + connect(chi.P, PCoo) annotation (Line(points={{89,-177},{80,-177},{80,-128},{ 98,-128},{98,-50},{178,-50},{178,110},{210,110}}, color={0,0,127})); connect(ideVal.port_2, chi.port_a2) annotation (Line(points={{86,0.2},{86,-162},{90,-162}}, @@ -425,7 +425,7 @@ equation connect(senTSup.port_b, supplyAir) annotation (Line(points={{148,40},{174,40}, {174,60},{202,60}}, color={0,127,255})); connect(gaiFan.y, fanSup.m_flow_in) annotation (Line(points={{-59,140},{ - -20,140},{-20,54}}, color={0,0,127})); + -20,140},{-20,52}}, color={0,0,127})); connect(booToInt.y, pumChiWat.m_flow_in) annotation (Line(points={{81,-90},{108,-90}}, color={0,0,127})); connect(booToInt.u, chiOn) annotation (Line(points={{58,-90},{40,-90},{40,-120}, {-220,-120}}, color={255,0,255})); @@ -455,10 +455,10 @@ equation connect(TRet, senTRetAir.T) annotation (Line(points={{210,-80},{174,-80},{174, -20},{-30,-20},{-30,-29}}, color={0,0,127})); connect(senTRetAir.port_a, senTraSub.port_b) annotation (Line(points={{-20,-40},{20,-40}}, color={0,127,255})); - connect(senTraSub.port_a, returnAir) annotation (Line(points={{40,-40},{120,-40},{120,-20},{202,-20}}, - color={0,127,255})); + connect(senTraSub.port_a, returnAir) annotation (Line(points={{40,-40},{192, + -40},{192,-20},{202,-20}}, color={0,127,255})); - connect(fanSup.y_actual, y_actual) annotation (Line(points={{-9,49},{0,49},{0, + connect(fanSup.y_actual, y_actual) annotation (Line(points={{-9,47},{0,47},{0, 172},{210,172}}, color={0,0,127})); annotation (defaultComponentName="chiDXHeaEco", Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-220}, diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo index fbd6684838e..28b15d9fc00 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/BaseClasses/Room.mo @@ -219,7 +219,7 @@ model Room nPorts=1) "Source model for air infiltration" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable intLoad(table=[0, + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable intLoad(table=[0, 0.1; 8*3600,0.1; 8*3600,1.0; 18*3600,1.0; 18*3600,0.1; 24*3600,0.1]) "Internal loads" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); @@ -370,8 +370,8 @@ This is for
  • July 21, 2020, by Kun Zhang:
    Replaced the internal gain block from BaseClasses by directly using the block - -Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable. + +Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable.
  • June 21, 2017, by Michael Wetter:
    diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo index af4be9b85bb..6f150f5a4fd 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/ChillerDXHeatingEconomizer.mo @@ -23,7 +23,7 @@ model ChillerDXHeatingEconomizer TSupChi_nominal=TSupChi_nominal, TSetSupAir=286.15) "Controller for single zone VAV system" annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooHea( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TSetRooHea( table=[ 0, 15 + 273.15; 8*3600, 20 + 273.15; @@ -33,7 +33,7 @@ model ChillerDXHeatingEconomizer extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.Periodic) "Heating setpoint for room temperature" annotation (Placement(transformation(extent={{-152,40},{-132,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TSetRooCoo( table=[ 0, 30 + 273.15; 8*3600, 25 + 273.15; diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo index 7f772d74741..45292befecb 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo @@ -43,7 +43,7 @@ model Guideline36 "VAV controller" annotation (Placement(transformation(extent={{-120,-20},{-80,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysChiPla( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysChiPla( uLow=-1, uHigh=0) "Hysteresis with delay to switch on cooling" @@ -59,19 +59,19 @@ model Guideline36 Buildings.Controls.OBC.CDL.Integers.Sources.Constant demLim(final k=0) "Cooling and heating demand imit level" annotation (Placement(transformation(extent={{-200,-30},{-180,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooWarTim(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooWarTim(final k=0) "Cooldown and warm-up time" annotation (Placement(transformation(extent={{-200,40},{-180,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOccHeaSet(final k=293.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOccHeaSet(final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-210,170},{-190,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOccCooSet(final k=298.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOccCooSet(final k=298.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-180,150},{-160,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TUnoHeaSet(final k=288.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TUnoHeaSet(final k=288.15) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-210,120},{-190,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TUnoCooSet(final k=303.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TUnoCooSet(final k=303.15) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-180,100},{-160,120}}))); Modelica.Blocks.Sources.BooleanConstant freRes(k=true) diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo index d667f60e831..f24cc3b2171 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo @@ -87,7 +87,7 @@ block ZoneWithAHUG36 QCoo_flow_nominal=QCoo_flow_nominal, TSupChi_nominal=TSupChi_nominal) "HVAC system" annotation (Placement(transformation(extent={{40,-78},{80,-38}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysChiPla1(uLow=-1, uHigh=0) + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysChiPla1(uLow=-1, uHigh=0) "Hysteresis with delay to switch on cooling" annotation (Placement(transformation(extent={{-50,-130},{-30,-110}}))); Modelica.Blocks.Math.Feedback errTRooCoo1 @@ -101,23 +101,23 @@ block ZoneWithAHUG36 final k=0) "Cooling and heating demand imit level" annotation (Placement(transformation(extent={{-140,-120},{-120,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOccHeaSet(final k=293.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOccHeaSet(final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-140,130},{-120,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOccCooSet(final k=297.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOccCooSet(final k=297.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-140,100},{-120,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TUnoHeaSet(final k=288.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TUnoHeaSet(final k=288.15) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-140,60},{-120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TUnoCooSet(final k=303.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TUnoCooSet(final k=303.15) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-140,30},{-120,50}}))); Modelica.Blocks.Sources.BooleanConstant freRes(k=true) "Freeze protection reset" annotation (Placement(transformation(extent={{-140,-154},{-120,-134}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetSupChiConst( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetSupChiConst( final k=TSupChi_nominal) "Set point for chiller temperature" annotation (Placement(transformation(extent={{-20,10},{0,30}}))); diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/ConventionalSpring.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/ConventionalSpring.mo index 3f9e688061d..6c6353771fa 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/ConventionalSpring.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/ConventionalSpring.mo @@ -17,7 +17,7 @@ model ConventionalSpring thrOptOn(displayUnit="s")) "Optimal start for heating and cooling system " annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooHea( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TSetRooHea( table=[0,15 + 273.15; 8*3600,20 + 273.15; 18*3600,15 + 273.15; 24*3600,15 + 273.15], smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, @@ -26,7 +26,7 @@ model ConventionalSpring each displayUnit="degC")) "Heating setpoint for room temperature" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable TSetRooCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TSetRooCoo( table=[0,30 + 273.15; 8*3600,24 + 273.15; 18*3600,30 + 273.15; 24*3600,30 + 273.15], smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, @@ -38,10 +38,10 @@ model ConventionalSpring Buildings.Controls.SetPoints.OccupancySchedule occSch(occupancy=3600*{8,18}) "Occupancy schedule" annotation (Placement(transformation(extent={{-100,-16},{-80,4}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetHeaOn(k=20 + 273.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetHeaOn(k=20 + 273.15) "Zone heating setpoint during occupied period" annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetCooOn(k=24 + 273.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetCooOn(k=24 + 273.15) "Zone cooling setpoint during occupied time" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(realTrue=-6) @@ -50,10 +50,10 @@ model ConventionalSpring Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1(realTrue=5) "Switch to occupied heating setpoint" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 + Buildings.Controls.OBC.CDL.Reals.Add add3 "New cooling setpoint schedule for room" annotation (Placement(transformation(extent={{40,34},{60,54}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 + Buildings.Controls.OBC.CDL.Reals.Add add4 "New heating setpoint schedule for room" annotation (Placement(transformation(extent={{40,64},{60,84}}))); Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.BaseClasses.ZoneWithAHUConventional zonAHUOpt diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/Guideline36Spring.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/Guideline36Spring.mo index 4886bf0164b..3ccb054a9a3 100644 --- a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/Guideline36Spring.mo +++ b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/Guideline36Spring.mo @@ -19,10 +19,10 @@ model Guideline36Spring Buildings.Controls.SetPoints.OccupancySchedule occSch(occupancy=3600*{8,18}) "Occupancy schedule" annotation (Placement(transformation(extent={{-60,-34},{-40,-14}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetHeaOn(k=20 + 273.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetHeaOn(k=20 + 273.15) "Zone heating setpoint during occupied period" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSetCooOn(k=24 + 273.15) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetCooOn(k=24 + 273.15) "Zone cooling setpoint during occupied time" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); Buildings.Controls.OBC.Utilities.OptimalStart optStaCoo( @@ -32,7 +32,7 @@ model Guideline36Spring thrOptOn(displayUnit="s")) "Optimal start for cooling" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(k=0) "No optimal start" annotation (Placement(transformation(extent={{-20,-78},{0,-58}}))); Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.BaseClasses.ZoneWithAHUG36 zonAHUG36Opt diff --git a/Buildings/Applications/BaseClasses/Controls/VariableSpeedPumpStage.mo b/Buildings/Applications/BaseClasses/Controls/VariableSpeedPumpStage.mo index 754b67d33ec..f18b7e4788b 100644 --- a/Buildings/Applications/BaseClasses/Controls/VariableSpeedPumpStage.mo +++ b/Buildings/Applications/BaseClasses/Controls/VariableSpeedPumpStage.mo @@ -99,8 +99,10 @@ model VariableSpeedPumpStage "Staging control for variable speed pumps" final integerFalse=0, final integerTrue=2) annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); Buildings.Controls.OBC.CDL.Integers.Add addInt + "Outputs how many pumps are to be commanded on" annotation (Placement(transformation(extent={{60,-56},{80,-36}}))); Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea + "Comparison from integer to real signal for number of pumps" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); Modelica.Blocks.Interfaces.BooleanInput on @@ -115,12 +117,12 @@ equation pattern=LinePattern.Dash)); connect(con1.outPort, oneOn.inPort[1]) annotation (Line( - points={{-50,38.5},{-50,26},{-50.5,26},{-50.5,21}}, + points={{-50,38.5},{-50,26},{-49.75,26},{-49.75,21}}, color={0,0,0}, pattern=LinePattern.Dash)); connect(con2.inPort, oneOn.outPort[1]) annotation (Line( - points={{-50,-26},{-50,-10},{-50.25,-10},{-50.25,-0.5}}, + points={{-50,-26},{-50,-10},{-49.875,-10},{-49.875,-0.5}}, color={0,0,0}, pattern=LinePattern.Dash)); connect(con2.outPort, twoOn.inPort[1]) @@ -140,12 +142,12 @@ equation pattern=LinePattern.Dash)); connect(con3.outPort, oneOn.inPort[2]) annotation (Line( - points={{-10,-38.5},{-10,26},{-49.5,26},{-49.5,21}}, + points={{-10,-38.5},{-10,26},{-50.25,26},{-50.25,21}}, color={0,0,0}, pattern=LinePattern.Dash)); connect(con4.inPort, oneOn.outPort[2]) annotation (Line( - points={{-22,48},{-22,-10},{-49.75,-10},{-49.75,-0.5}}, + points={{-22,48},{-22,-10},{-50.125,-10},{-50.125,-0.5}}, color={0,0,0}, pattern=LinePattern.Dash)); connect(combiTable1Ds.y, y) diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo index 36aefacabae..7f388892186 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Equipment/BaseClasses/PartialPumpParallel.mo @@ -139,20 +139,20 @@ partial model PartialPumpParallel "Partial model for pump parallel" "Isolation valves" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys[num]( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys[num]( each final uLow=threshold, each final uHigh=2*threshold) "Hysteresis for isolation valves" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi[num] + Buildings.Controls.OBC.CDL.Reals.Switch swi[num] "Switch to enable pump only once the valve is commanded open" annotation (Placement(transformation(extent={{-48,-40},{-28,-20}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer[num]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer[num]( each final k=0.0) "Outputs 0 as the control signal" annotation (Placement(transformation(extent={{-90,-70},{-70,-50}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one[num](each final k= + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one[num](each final k= 1.0) "Outputs 1 as the control signal" annotation (Placement(transformation(extent={{-90,-32},{-70,-12}}))); initial equation diff --git a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo index 1e23ed09aac..4d03ca35b3b 100644 --- a/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo +++ b/Buildings/Applications/DataCenters/ChillerCooled/Examples/BaseClasses/PartialDataCenter.mo @@ -283,12 +283,12 @@ partial model PartialDataCenter annotation (Placement(transformation(extent={{-180,-100},{-160,-80}}))); Modelica.Blocks.Math.Gain gai1(k=1/dpSetPoi) "Gain effect" annotation (Placement(transformation(extent={{-200,-70},{-220,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi[numChi] + Buildings.Controls.OBC.CDL.Reals.Switch swi[numChi] "Switch to assign pump signal if plant is on" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); Buildings.Controls.OBC.CDL.Logical.Or plaOn "Output true if plant is on" annotation (Placement(transformation(extent={{-160,230},{-140,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer[numChi](each final + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer[numChi](each final k=0) "Outputs zero" annotation (Placement(transformation(extent={{-220,230},{-200,250}}))); Modelica.Blocks.MathBoolean.Or chiOnSta(nu=numChi) diff --git a/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo b/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo index 9fc15b58aca..0bb6e5981ca 100644 --- a/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo +++ b/Buildings/Applications/DataCenters/DXCooled/Controls/AirsideEconomizer.mo @@ -36,7 +36,7 @@ model AirsideEconomizer "Controller for airside economizer" Ti=Ti) "PID controller" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant const(final k=0) "Constant output signal with value 1" annotation (Placement(transformation(extent={{0,20},{20,40}}))); @@ -48,7 +48,7 @@ protected Buildings.Controls.OBC.CDL.Integers.Equal ecoOff "Determine if airside economizer is off" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch switch1 + Buildings.Controls.OBC.CDL.Reals.Switch switch1 "Switch to select control output" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); diff --git a/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo b/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo index de228f94a42..4066ec52c04 100644 --- a/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo +++ b/Buildings/Applications/DataCenters/DXCooled/Controls/Compressor.mo @@ -49,10 +49,10 @@ protected Buildings.Controls.OBC.CDL.Integers.Equal freCoo "Determine if free cooling is on" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch switch1 + Buildings.Controls.OBC.CDL.Reals.Switch switch1 "Switch to select control output" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant const(final k=0) "Constant output signal with value 1" annotation (Placement(transformation(extent={{20,30},{40,50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo index 7544572928b..759f15f723b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Enable.mo @@ -147,31 +147,31 @@ protected final parameter Real hOutHigLimCutLow = hOutHigLimCutHig - delEntHis "Hysteresis block low limit cutoff"; - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 if use_enthalpy "Add block determines difference between hOut and hOutCut" annotation (Placement(transformation(extent={{-200,140},{-180,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Add block determines difference between TOut and TOutCut" annotation (Placement(transformation(extent={{-200,220},{-180,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysOutTem( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysOutTem( final uLow=TOutHigLimCutLow, final uHigh=TOutHigLimCutHig) "Outdoor air temperature hysteresis for both fixed and differential dry bulb temperature cutoff conditions" annotation (Placement(transformation(extent={{-160,220},{-140,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysOutEnt( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysOutEnt( final uLow=hOutHigLimCutLow, final uHigh=hOutHigLimCutHig) if use_enthalpy "Outdoor air enthalpy hysteresis for both fixed and differential enthalpy cutoff conditions" annotation (Placement(transformation(extent={{-160,140},{-140,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch outDamSwitch + Buildings.Controls.OBC.CDL.Reals.Switch outDamSwitch "Set maximum OA damper position to minimum at disable (after a given time delay)" annotation (Placement(transformation(extent={{82,-78},{102,-58}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDamSwitch "Set minimum RA damper position to maximum at disable" + Buildings.Controls.OBC.CDL.Reals.Switch retDamSwitch "Set minimum RA damper position to maximum at disable" annotation (Placement(transformation(extent={{-20,-176},{0,-156}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch maxRetDamSwitch + Buildings.Controls.OBC.CDL.Reals.Switch maxRetDamSwitch "Keep maximum RA damper position at physical maximum for a short time period after disable signal" annotation (Placement(transformation(extent={{60,-136},{80,-116}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch minRetDamSwitch + Buildings.Controls.OBC.CDL.Reals.Switch minRetDamSwitch "Keep minimum RA damper position at physical maximum for a short time period after disable" annotation (Placement(transformation(extent={{60,-178},{80,-158}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not that starts the timer at disable signal " diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Common.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Common.mo index 7bae9d1741d..15dc28aefa9 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Common.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Common.mo @@ -126,7 +126,7 @@ block Common annotation (Placement(transformation(extent={{180,-160},{220,-120}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset damLimCon( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset damLimCon( final controllerType=controllerType, final k=k, final Ti=Ti, @@ -139,48 +139,48 @@ block Common protected parameter Real yMin=0 "Lower limit of control loop signal"; parameter Real yMax=1 "Upper limit of control loop signal"; - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMinSig( final k=outDamPhy_min) "Physically fixed minimum position of the outdoor air damper. This is the initial position of the economizer damper" annotation (Placement(transformation(extent={{-160,70},{-140,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMaxSig( final k=outDamPhy_max) "Physically fixed maximum position of the outdoor air damper." annotation (Placement(transformation(extent={{-160,30},{-140,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMinSig( final k=retDamPhy_min) "Physically fixed minimum position of the return air damper" annotation (Placement(transformation(extent={{-160,-10},{-140,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMaxSig( final k=retDamPhy_max) "Physically fixed maximum position of the return air damper. This is the initial condition of the return air damper" annotation (Placement(transformation(extent={{-160,-50},{-140,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minSigLim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minSigLim( final k=yMin) "Equals minimum controller output signal" annotation (Placement(transformation(extent={{-100,200},{-80,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxSigLim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxSigLim( final k=yMax) "Equals maximum controller output signal" annotation (Placement(transformation(extent={{-20,200},{0,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant sigFraForOutDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant sigFraForOutDam( final k=uRetDam_min) "Equals the fraction of the control loop signal below which the outdoor air damper limit gets modulated and above which the return air damper limit gets modulated" annotation (Placement(transformation(extent={{-60,200},{-40,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Line minOutDam( + Buildings.Controls.OBC.CDL.Reals.Line minOutDam( final limitBelow=true, final limitAbove=true) "Linear mapping of the outdoor air damper position to the control signal" annotation (Placement(transformation(extent={{120,140},{140,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Line minRetDam( + Buildings.Controls.OBC.CDL.Reals.Line minRetDam( final limitBelow=true, final limitAbove=true) "Linear mapping of the return air damper position to the control signal" annotation (Placement(transformation(extent={{120,100},{140,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDamPosMinSwitch + Buildings.Controls.OBC.CDL.Reals.Switch retDamPosMinSwitch "A switch to deactivate the return air damper minimal outdoor airflow control" annotation (Placement(transformation(extent={{40,-30},{60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch outDamPosMaxSwitch + Buildings.Controls.OBC.CDL.Reals.Switch outDamPosMaxSwitch "A switch to deactivate the outdoor air damper minimal outdoor airflow control" annotation (Placement(transformation(extent={{40,10},{60,30}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not block" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithAFMS.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithAFMS.mo index 47957d56690..6b742cef2f8 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithAFMS.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithAFMS.mo @@ -150,7 +150,7 @@ block SeparateWithAFMS annotation (Placement(transformation(extent={{220,-310},{260,-270}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conMinOA( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conMinOA( final controllerType=minOAConTyp, final k=kMinOA, final Ti=TiMinOA, @@ -171,56 +171,56 @@ protected Buildings.Controls.OBC.CDL.Logical.And enaMinCon "Check if the minimum outdoor air control loop should be enabled" annotation (Placement(transformation(extent={{-80,150},{-60,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer( final k=0) "Constant" annotation (Placement(transformation(extent={{120,260},{140,280}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0.5) "Constant" annotation (Placement(transformation(extent={{80,200},{100,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Line minOutDamPos( + Buildings.Controls.OBC.CDL.Reals.Line minOutDamPos( final limitBelow=true, final limitAbove=true) "Minimum outdoor air damper position" annotation (Placement(transformation(extent={{160,230},{180,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minOutDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minOutDamPhyPosMinSig( final k=minOutDamPhy_min) "Physically fixed minimum position of the minimum outdoor air damper. This is the initial position of the economizer damper" annotation (Placement(transformation(extent={{80,260},{100,280}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minOutDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minOutDamPhyPosMaxSig( final k=minOutDamPhy_max) "Physically fixed maximum position of the minimum outdoor air damper" annotation (Placement(transformation(extent={{120,200},{140,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one( final k=1) "Constant one" annotation (Placement(transformation(extent={{-200,-80},{-180,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=0.05) "Constant" annotation (Placement(transformation(extent={{-160,-80},{-140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con2( final k=0.8) "Constant" annotation (Placement(transformation(extent={{-200,-20},{-180,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minFanSpe( final k=minSpe) "Minimum fan speed" annotation (Placement(transformation(extent={{-160,-20},{-140,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Line moaP( + Buildings.Controls.OBC.CDL.Reals.Line moaP( final limitBelow=true, final limitAbove=true) "Linear mapping of the supply fan speed to the control signal" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=0.05) "Check if economizer outdoor air damper is less than projected position" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.98, final h=0.01) "Check if the minimum outdoor air damper position is fully open" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=1.1) "Projected position with a gain factor" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=0.05) "Check if the economizer outdoor air damper is greater than threshold" annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); @@ -236,37 +236,37 @@ protected Buildings.Controls.OBC.CDL.Logical.Or disRetDamMin "Disable return air damper minimum outdoor air control" annotation (Placement(transformation(extent={{60,-20},{80,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMinSig( final k=outDamPhy_min) "Physically fixed minimum position of the outdoor air damper. This is the initial position of the economizer damper" annotation (Placement(transformation(extent={{-200,-130},{-180,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMaxSig( final k=outDamPhy_max) "Physically fixed maximum position of the outdoor air damper." annotation (Placement(transformation(extent={{-200,-170},{-180,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMinSig( final k=retDamPhy_min) "Physically fixed minimum position of the return air damper" annotation (Placement(transformation(extent={{-200,-210},{-180,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMaxSig( final k=retDamPhy_max) "Physically fixed maximum position of the return air damper. This is the initial condition of the return air damper" annotation (Placement(transformation(extent={{-200,-250},{-180,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDamPosMinSwi + Buildings.Controls.OBC.CDL.Reals.Switch retDamPosMinSwi "A switch to deactivate the return air damper minimal outdoor airflow control" annotation (Placement(transformation(extent={{180,-210},{200,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDamPosMaxSwi + Buildings.Controls.OBC.CDL.Reals.Switch retDamPosMaxSwi "A switch to deactivate the return air damper minimal outdoor airflow control" annotation (Placement(transformation(extent={{180,-260},{200,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Line maxRetDamPos( + Buildings.Controls.OBC.CDL.Reals.Line maxRetDamPos( final limitBelow=true, final limitAbove=true) "Maximum return air damper position" annotation (Placement(transformation(extent={{100,-110},{120,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con3( final k=0.5) "Constant" annotation (Placement(transformation(extent={{60,-90},{80,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con4( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con4( final k=1) "Constant" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithDP.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithDP.mo index fd7e8136b7a..92a492594b1 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithDP.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/SeparateWithDP.mo @@ -148,10 +148,10 @@ block SeparateWithDP "Physical maximum return air damper position limit. Required as an input for the economizer enable disable sequence" annotation (Placement(transformation(extent={{220,-360},{260,-320}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply minDp if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1 + Buildings.Controls.OBC.CDL.Reals.Multiply minDp if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1 "Minimum pressure difference setpoint when complying with ASHRAE 62.1" annotation (Placement(transformation(extent={{-120,160},{-100,180}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset maxRetDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset maxRetDam( final controllerType=dpCon, final k=kDp, final Ti=TiDp, @@ -159,27 +159,27 @@ block SeparateWithDP annotation (Placement(transformation(extent={{120,160},{140,180}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minDesDp( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minDesDp( final k=dpDesMinOutDam) "Design minimum outdoor air damper pressure difference" annotation (Placement(transformation(extent={{-180,180},{-160,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1 "Square of the normalized minimum airflow" annotation (Placement(transformation(extent={{-180,140},{-160,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final h=1) "Check if the minimum pressure difference setpoint is greater than zero" annotation (Placement(transformation(extent={{-80,140},{-60,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=0.05) "Check if economizer outdoor air damper is less than projected position" annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=1.1) "Projected position with a gain factor" annotation (Placement(transformation(extent={{-80,-130},{-60,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=0.05) "Check if the economizer outdoor air damper is greater than threshold" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); @@ -204,83 +204,83 @@ protected Buildings.Controls.OBC.CDL.Logical.And3 enaMinDam "Check if the minimum outdoor air damper should be enabled" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one( final k=1) "Constant" annotation (Placement(transformation(extent={{-200,-130},{-180,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minFanSpe( final k=minSpe) "Minimum fan speed" annotation (Placement(transformation(extent={{-160,-70},{-140,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0.05) "Constant" annotation (Placement(transformation(extent={{-160,-130},{-140,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=0.8) "Constant" annotation (Placement(transformation(extent={{-200,-70},{-180,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Line moaP( + Buildings.Controls.OBC.CDL.Reals.Line moaP( final limitBelow=true, final limitAbove=true) "Linear mapping of the supply fan speed to the control signal" annotation (Placement(transformation(extent={{-120,-100},{-100,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMinSig( final k=outDamPhy_min) "Physically fixed minimum position of the outdoor air damper. This is the initial position of the economizer damper" annotation (Placement(transformation(extent={{-200,-180},{-180,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMaxSig( final k=outDamPhy_max) "Physically fixed maximum position of the outdoor air damper." annotation (Placement(transformation(extent={{-200,-220},{-180,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMinSig( final k=retDamPhy_min) "Physically fixed minimum position of the return air damper" annotation (Placement(transformation(extent={{-200,-260},{-180,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMaxSig( final k=retDamPhy_max) "Physically fixed maximum position of the return air damper. This is the initial condition of the return air damper" annotation (Placement(transformation(extent={{-200,-300},{-180,-280}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDamPosMaxSwi + Buildings.Controls.OBC.CDL.Reals.Switch retDamPosMaxSwi "A switch to deactivate the return air damper maximum outdoor airflow control" annotation (Placement(transformation(extent={{180,-310},{200,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDamPosMinSwi + Buildings.Controls.OBC.CDL.Reals.Switch retDamPosMinSwi "A switch to deactivate the return air damper minimal outdoor airflow control" annotation (Placement(transformation(extent={{180,-260},{200,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1 + Buildings.Controls.OBC.CDL.Reals.Multiply pro1 if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Square of the normalized minimum airflow" annotation (Placement(transformation(extent={{-180,290},{-160,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro2 + Buildings.Controls.OBC.CDL.Reals.Multiply pro2 if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Square of the normalized minimum airflow" annotation (Placement(transformation(extent={{-180,220},{-160,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minAbsDp( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minAbsDp( final k=dpAbsMinOutDam) if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Absolute minimum outdoor air damper pressure difference" annotation (Placement(transformation(extent={{-180,330},{-160,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Line minDp1( + Buildings.Controls.OBC.CDL.Reals.Line minDp1( final limitAbove=true) if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Minimum pressure difference setpoint when complying with Title 24" annotation (Placement(transformation(extent={{20,260},{40,280}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one1( final k=1) if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Design fan speed" annotation (Placement(transformation(extent={{-60,230},{-40,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hal( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hal( final k=0.5) if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Constant" annotation (Placement(transformation(extent={{-60,290},{-40,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one2( final k=1) if not have_CO2Sen and venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Design fan speed" annotation (Placement(transformation(extent={{-120,240},{-100,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply actAbsMinDp + Buildings.Controls.OBC.CDL.Reals.Multiply actAbsMinDp if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Active absolute minimum pressure difference setpoint" annotation (Placement(transformation(extent={{-120,300},{-100,320}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply actDesMinDp + Buildings.Controls.OBC.CDL.Reals.Multiply actDesMinDp if venStd == Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.California_Title_24 "Active design minimum pressure difference setpoint" annotation (Placement(transformation(extent={{-120,200},{-100,220}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_LoopDisable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_LoopDisable.mo index 7561d2db8b7..86706aefcf8 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_LoopDisable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_LoopDisable.mo @@ -2,11 +2,11 @@ within Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subseque model Common_LoopDisable "Validation model for the multi zone VAV AHU minimum outdoor air control - damper position limits" - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow( final k=VOutSet_flow) "Outdoor airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-120,0},{-100,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet1_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet1_flow( final k=VOutSet_flow) "Outdoor airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{20,0},{40,20}}))); @@ -22,12 +22,12 @@ model Common_LoopDisable "AHU operation mode is NOT Occupied" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow( final duration=1800, final offset=minVOutSet_flow, final height=incVOutSet_flow) "Measured outdoor airflow rate" annotation (Placement(transformation(extent={{-120,40},{-100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut1_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut1_flow( final duration=1800, final offset=minVOutSet_flow, final height=incVOutSet_flow) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_VOut_flow.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_VOut_flow.mo index b189251c8dc..0e12e639317 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_VOut_flow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/Common_VOut_flow.mo @@ -2,11 +2,11 @@ within Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subseque model Common_VOut_flow "Validation model for the multi zone VAV AHU minimum outdoor air control - damper position limits" - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow( final k=minVOutSet_flow) "Outdoor volumetric airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow( final duration=1800, final offset=VOutMin_flow, final height=incVOutSet_flow) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithAFMS.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithAFMS.mo index 3693ae77a8d..d51ad0a6aa9 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithAFMS.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithAFMS.mo @@ -17,11 +17,11 @@ model SeparateWithAFMS "Multi zone VAV AHU minimum outdoor air control - damper position limits" annotation (Placement(transformation(extent={{200,10},{220,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow( final k=minVOutSet_flow) "Outdoor volumetric airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{120,50},{140,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow( final duration=1800, final offset=VOutMin_flow, final height=incVOutSet_flow) @@ -57,7 +57,7 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.warmUp) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow1( final k=minVOutSet_flow) "Outdoor airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-220,50},{-200,70}}))); @@ -65,21 +65,21 @@ protected final k=false) "Fan is off" annotation (Placement(transformation(extent={{-220,10},{-200,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow1( final duration=1800, final offset=minVOutSet_flow, final height=incVOutSet_flow) "Measured outdoor airflow rate" annotation (Placement(transformation(extent={{-220,90},{-200,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos( final duration=1800, final offset=0.1, final height=0.5) "Outdoor air damper position" annotation (Placement(transformation(extent={{-220,-70},{-200,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supFanSpe( final k=0) "Supply fan speed" annotation (Placement(transformation(extent={{-220,-110},{-200,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow2( final k=minVOutSet_flow) "Outdoor airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); @@ -87,25 +87,25 @@ protected final k=true) "Fan is on" annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow2( final duration=1800, final offset=minVOutSet_flow, final height=incVOutSet_flow) "Measured outdoor airflow rate" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos1( final duration=1800, final offset=0.1, final height=0.5) "Outdoor air damper position" annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supFanSpe1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supFanSpe1( final k=0.2) "Supply fan speed" annotation (Placement(transformation(extent={{-60,-110},{-40,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos2( final duration=1800, final offset=0.1, final height=0.5) "Outdoor air damper position" annotation (Placement(transformation(extent={{120,-70},{140,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe2( final height=0.5, final duration=1800, final offset=0.1) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithDP.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithDP.mo index 7b660996f1b..71345b86622 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithDP.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Limits/Validation/SeparateWithDP.mo @@ -23,7 +23,7 @@ model SeparateWithDP "Multi zone VAV AHU minimum outdoor air control - damper position limits" annotation (Placement(transformation(extent={{200,10},{220,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow( final k=minVOutSet_flow) "Outdoor volumetric airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{120,50},{140,70}}))); @@ -57,7 +57,7 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.warmUp) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow1( final k=minVOutSet_flow) "Outdoor airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-220,50},{-200,70}}))); @@ -65,15 +65,15 @@ protected final k=false) "Fan is off" annotation (Placement(transformation(extent={{-220,10},{-200,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos( final duration=1800, final offset=0.1, final height=0.5) "Outdoor air damper position" annotation (Placement(transformation(extent={{-220,-70},{-200,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supFanSpe( final k=0) "Supply fan speed" annotation (Placement(transformation(extent={{-220,-110},{-200,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow2( final k=minVOutSet_flow) "Outdoor airflow rate setpoint, 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); @@ -81,36 +81,36 @@ protected final k=true) "Fan is on" annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos1( final duration=1800, final offset=0.1, final height=0.5) "Outdoor air damper position" annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supFanSpe1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supFanSpe1( final k=0.2) "Supply fan speed" annotation (Placement(transformation(extent={{-60,-110},{-40,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos2( final duration=1800, final offset=0.1, final height=0.5) "Outdoor air damper position" annotation (Placement(transformation(extent={{120,-70},{140,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe2( final height=0.5, final duration=1800, final offset=0.1) "Supply fan speed" annotation (Placement(transformation(extent={{120,-110},{140,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpDam( final duration=1800, final offset=250, final height=100) "Pressure accross outdoor air damper" annotation (Placement(transformation(extent={{-220,90},{-200,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpDam1( final duration=1800, final offset=250, final height=100) "Pressure accross outdoor air damper" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpDam2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpDam2( final duration=1800, final offset=120, final height=52) "Pressure accross outdoor air damper" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Reliefs.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Reliefs.mo index bc86e24e0e0..d16d0379788 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Reliefs.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Reliefs.mo @@ -77,32 +77,32 @@ block Reliefs iconTransformation(extent={{100,40},{140,80}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamMinLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamMinLimSig( final k=uMin) "Minimal control loop signal for the outdoor air damper" annotation (Placement(transformation(extent={{-60,-32},{-40,-12}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamMaxLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamMaxLimSig( final k=uOutDamMax) "Maximum control loop signal for the outdoor air damper" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamConMinLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamConMinLimSig( final k=uRetDamMin) "Minimal control loop signal for the return air damper" annotation (Placement(transformation(extent={{-80,68},{-60,88}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamMaxLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamMaxLimSig( final k=uMax) "Maximal control loop signal for the return air damper" annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Line outDamPos( + Buildings.Controls.OBC.CDL.Reals.Line outDamPos( final limitBelow=true, final limitAbove=true) "Damper position is linearly proportional to the control signal between signal limits" annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Line retDamPos( + Buildings.Controls.OBC.CDL.Reals.Line retDamPos( final limitBelow=true, final limitAbove=true) "Damper position is linearly proportional to the control signal between signal limits" annotation (Placement(transformation(extent={{0,60},{20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min "Overwrite due to freeze protection" + Buildings.Controls.OBC.CDL.Reals.Min min "Overwrite due to freeze protection" annotation (Placement(transformation(extent={{60,-70},{80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max "Overwrite due to freeze protection" + Buildings.Controls.OBC.CDL.Reals.Max max "Overwrite due to freeze protection" annotation (Placement(transformation(extent={{60,50},{80,70}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/ReturnFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/ReturnFan.mo index 322ba468f78..ba003652642 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/ReturnFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/ReturnFan.mo @@ -58,28 +58,28 @@ block ReturnFan iconTransformation(extent={{100,-80},{140,-40}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant damMinLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant damMinLimSig( final k=uMin) "Minimal control loop signal for the relief and return air damper position" annotation (Placement(transformation(extent={{-100,-30},{-80,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant damMaxLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant damMaxLimSig( final k=uMax) "Maximal control loop signal for the return and exhast air damper" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Line retDamPos( + Buildings.Controls.OBC.CDL.Reals.Line retDamPos( final limitBelow=true, final limitAbove=true) "Return air damper position" annotation (Placement(transformation(extent={{40,30},{60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Line relDamPos( + Buildings.Controls.OBC.CDL.Reals.Line relDamPos( final limitBelow=true, final limitAbove=true) if not have_dirCon "Relief air damper position" annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer( final k=0) if not have_dirCon "Constant zero" annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one( final k=1) "Constant one" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/Reliefs.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/Reliefs.mo index 7cb5b58f687..a516a411fdc 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/Reliefs.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/Reliefs.mo @@ -6,24 +6,24 @@ model Reliefs "Multi zone VAV AHU minimum outdoor air control - damper modulation" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxRetDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxRetDam( final k=0.9) "Return damper maximum position" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp temLoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp temLoo( final duration=1800, final offset=-1, final height=2) "Temperature control loop output" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxOutDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxOutDam( final k=1) "Outdoor air damper maximum position" annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minRetDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minRetDam( final k=0.1) "Return damper minimum position" annotation (Placement(transformation(extent={{-40,30},{-20,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minOutDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minOutDam( final k=0) "Outdoor air damper minimum position" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/ReturnFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/ReturnFan.mo index 5e8d6755c6b..d90936dffb9 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/ReturnFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Modulations/Validation/ReturnFan.mo @@ -11,16 +11,16 @@ model ReturnFan "Multi zone VAV AHU minimum outdoor air control - damper modulation, the unit does not have direct pressure control" annotation (Placement(transformation(extent={{60,-100},{80,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxRetDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxRetDam( final k=0.9) "Return damper maximum position" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp temLoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp temLoo( final duration=1800, final offset=-1, final height=2) "Temperature control loop output" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minRetDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minRetDam( final k=0.1) "Return damper minimum position" annotation (Placement(transformation(extent={{-40,30},{-20,50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo index 2f12273dda8..7f063c5522c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta.mo @@ -15,34 +15,34 @@ model Enable_FreProSta "Multi zone VAV AHU enable disable sequence" annotation (Placement(transformation(extent={{60,-40},{80,-12}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 2) "Outdoor air temperature is slightly below the cutoff" annotation (Placement(transformation(extent={{-80,140},{-60,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutCut( final k=TOutCutoff) "OA temperature high limit cutoff" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutBelowCutoff( final k=hOutCutoff - 1000) "Outdoor air enthalpy is slightly below the cutoff" annotation (Placement(transformation(extent={{-140,80},{-120,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutCut( final k=hOutCutoff) "Outdoor air enthalpy cutoff" annotation (Placement(transformation(extent={{-140,40},{-120,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMax( final k=0.9) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-110,-120},{-90,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMin( final k=0.1) "Minimal allowed economizer damper position" annotation (Placement(transformation(extent={{-140,-150},{-120,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMax( final k=1) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-140,0},{-120,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPosMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPosMax( final k=0.8) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-110,-60},{-90,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPosMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPosMin( final k=0) "Minimal allowed economizer damper position" annotation (Placement(transformation(extent={{-110,-90},{-90,-70}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant supFanSta(k=true) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo index ab102bbc43d..f151aad6243 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo @@ -2,10 +2,10 @@ within Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subseque model Enable_TOut_hOut "Model validates economizer disable in case outdoor air conditions are above cutoff" - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutCut( final k=TOutCutoff) "Outdoor air temperature cutoff" annotation (Placement(transformation(extent={{-160,80},{-140,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutCut1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutCut1( final k=hOutCutoff) "Outdoor air enthalpy cutoff" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); Buildings.Controls.OBC.CDL.Logical.TriggeredTrapezoid TOut( @@ -43,33 +43,33 @@ protected final quantity="SpecificEnergy")=65100 "Outdoor air enthalpy high limit cutoff"; - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutCut( final k=hOutCutoff) "Outdoor air enthalpy cutoff" annotation (Placement(transformation(extent={{-240,80},{-220,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutCut1( final k=TOutCutoff) "Outdoor air temperature cutoff" annotation (Placement(transformation(extent={{0,80},{20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutBelowCutoff( final k=hOutCutoff - 1000) "Outdoor air enthalpy is slightly below the cutoff" annotation (Placement(transformation(extent={{-240,118},{-220,138}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 2) "Outdoor air temperature is slightly below the cutoff" annotation (Placement(transformation(extent={{40,80},{60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMax( final k=0.9) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-240,-80},{-220,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMin( final k=0.1) "Minimal allowed economizer damper position" annotation (Placement(transformation(extent={{-240,-120},{-220,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPosMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPosMax( final k=0.8) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-160,-160},{-140,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPosMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPosMin( final k=0) "Minimal allowed economizer damper position" annotation (Placement(transformation(extent={{-160,-200},{-140,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyPosMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyPosMax( final k=1) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-160,-120},{-140,-100}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant freProSta( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo index bc87a0c7306..428fc16a22f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Disable.mo @@ -62,22 +62,22 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutBelowCutoff( final k=hOutCutoff - 40000) "Outdoor air enthalpy is below the cutoff" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 30) "Outdoor air temperature is below the cutoff" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow( final k=minVOutSet_flow) "Outdoor airflow rate setpoint, example assumes 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-80,110},{-60,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow( final height=incVOutSet_flow, final offset=VOutMin_flow, final duration=1800) "Measured outdoor air volumetric airflow" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uTSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uTSup( final duration=1800, final height=2, final offset=-1) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo index 30668756345..780290ec4ca 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo @@ -54,30 +54,30 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-120,-130},{-100,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 5) "Outdoor air temperature is slightly below the cutoff" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSet_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSet_flow( final k=minVOutSet_flow) "Outdoor airflow rate setpoint, example assumes 15cfm/occupant and 100 occupants" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow( final offset=VOutMin_flow, final duration=1800, final height=incVOutSet_flow) "Measured outdoor air volumetric airflow" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uTSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uTSup( final duration=1800, final height=2, final offset=-1) "Supply air temperature control signal" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe( final duration=1800, final height=0.5, final offset=0.2) "Supply fan speed" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpDam2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpDam2( final duration=1800, final offset=120, final height=52) "Pressure accross outdoor air damper" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo index 2677d3cf871..7ba704765e2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo @@ -268,7 +268,7 @@ block FreezeProtection annotation (Placement(transformation(extent={{440,-860},{480,-820}}), iconTransformation(extent={{100,-210},{140,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=273.15 + 4.4, final h=Thys) if have_frePro "Check if supply air temperature is less than threshold" @@ -285,10 +285,10 @@ block FreezeProtection final k=minHotWatReq) if have_hotWatCoi and have_frePro "Minimum hot-water plant requests" annotation (Placement(transformation(extent={{-20,830},{0,850}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch minVen if have_frePro + Buildings.Controls.OBC.CDL.Reals.Switch minVen if have_frePro "Minimum ventilation when in stage 1 mode" annotation (Placement(transformation(extent={{60,730},{80,750}}))); - Buildings.Controls.OBC.CDL.Continuous.PID heaCoiCon1( + Buildings.Controls.OBC.CDL.Reals.PID heaCoiCon1( final controllerType=heaCoiCon, final k=k, final Ti=Ti, @@ -297,11 +297,11 @@ block FreezeProtection final yMin=yMin) if have_hotWatCoi and have_frePro "Heating coil control in stage 1 mode" annotation (Placement(transformation(extent={{-320,680},{-300,700}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaCoi1 + Buildings.Controls.OBC.CDL.Reals.Switch heaCoi1 if have_hotWatCoi and have_frePro "Heating coil position" annotation (Placement(transformation(extent={{120,660},{140,680}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=273.15 + 7, final h=Thys) if have_frePro "Check if supply air temperature is greater than threshold" @@ -316,7 +316,7 @@ block FreezeProtection Buildings.Controls.OBC.CDL.Logical.Edge endStaOne if have_frePro "Clear the latch to end the stage 1 freeze protection" annotation (Placement(transformation(extent={{-260,592},{-240,612}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr1( final t=273.15 + 3.3, final h=Thys) if have_frePro "Check if supply air temperature is less than threshold" @@ -330,22 +330,22 @@ block FreezeProtection final falseHoldDuration=0) if have_frePro "Stage in stage 2 freeze protection mode" annotation (Placement(transformation(extent={{-300,452},{-280,472}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch outDam2 if have_frePro + Buildings.Controls.OBC.CDL.Reals.Switch outDam2 if have_frePro "Outdoor air damper position" annotation (Placement(transformation(extent={{120,590},{140,610}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0) if have_frePro "Fully closed damper position" annotation (Placement(transformation(extent={{40,610},{60,630}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch minOutDam2 if minOADes == + Buildings.Controls.OBC.CDL.Reals.Switch minOutDam2 if minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow and have_frePro "Minimum outdoor air damper position" annotation (Placement(transformation(extent={{120,540},{140,560}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDam2 if have_frePro + Buildings.Controls.OBC.CDL.Reals.Switch retDam2 if have_frePro "Return air damper position" annotation (Placement(transformation(extent={{120,408},{140,428}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=1) if have_frePro "Fully open damper or valve position" annotation (Placement(transformation(extent={{-140,310},{-120,330}}))); @@ -364,7 +364,7 @@ block FreezeProtection final t=900) if have_frePro "Check if the supply air temperature has been lower than threshold value for sufficient long time" annotation (Placement(transformation(extent={{-300,240},{-280,260}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr2( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr2( final t=273.15 + 1, final h=Thys) if have_frePro "Check if supply air temperature is less than threshold" @@ -384,33 +384,33 @@ block FreezeProtection Buildings.Controls.OBC.CDL.Logical.Latch lat1 if have_frePro "Stay in stage 3 freeze protection mode" annotation (Placement(transformation(extent={{-140,150},{-120,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch supFan if (not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch supFan if (not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro "Supply fan speed" annotation (Placement(transformation(extent={{120,-230},{140,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retFan if (buiPreCon == + Buildings.Controls.OBC.CDL.Reals.Switch retFan if (buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanMeasuredAir or buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanDp) and (not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro "Return fan speed" annotation (Placement(transformation(extent={{120,-370},{140,-350}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch relFan if buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan + Buildings.Controls.OBC.CDL.Reals.Switch relFan if buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan and (not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro "Relief fan speed" annotation (Placement(transformation(extent={{120,-510},{140,-490}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con3( final k=0) if have_frePro "Zero constant" annotation (Placement(transformation(extent={{-140,48},{-120,68}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch outDam if not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch outDam if not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Outdoor air damper" annotation (Placement(transformation(extent={{320,70},{340,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooCoi if not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch cooCoi if not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Cooling coil position" @@ -425,11 +425,11 @@ block FreezeProtection and have_frePro "Minimum hot-water plant requests" annotation (Placement(transformation(extent={{-140,-782},{-120,-762}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 if have_hotWatCoi and have_frePro "Higher of supply air and mixed air temperature" annotation (Placement(transformation(extent={{-300,-700},{-280,-680}}))); - Buildings.Controls.OBC.CDL.Continuous.PID heaCoiMod( + Buildings.Controls.OBC.CDL.Reals.PID heaCoiMod( final controllerType=heaCoiCon, final k=k, final Ti=Ti, @@ -438,11 +438,11 @@ block FreezeProtection final yMin=yMin) if have_hotWatCoi and have_frePro "Heating coil control when it is in stage 3 mode" annotation (Placement(transformation(extent={{40,-670},{60,-650}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con4( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con4( final k=273.15 + 27) if have_hotWatCoi and have_frePro "Setpoint temperature" annotation (Placement(transformation(extent={{-140,-670},{-120,-650}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaCoiPos if have_hotWatCoi and ( + Buildings.Controls.OBC.CDL.Reals.Switch heaCoiPos if have_hotWatCoi and ( not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro "Heating coil position" @@ -474,7 +474,7 @@ block FreezeProtection final t=3600) if have_frePro "Check if it has been in stage 2 for sufficient long time" annotation (Placement(transformation(extent={{-260,420},{-240,440}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch minOutDam if minOADes == + Buildings.Controls.OBC.CDL.Reals.Switch minOutDam if minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow and (not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro @@ -493,12 +493,12 @@ block FreezeProtection Buildings.Controls.OBC.CDL.Logical.Or or2 if have_frePro "Start stage 1 freeze protection mode" annotation (Placement(transformation(extent={{-160,802},{-140,822}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDam if not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch retDam if not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Return air damper position" annotation (Placement(transformation(extent={{320,150},{340,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supTemSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supTemSet( final k=273.15+ 6) if have_hotWatCoi and have_frePro "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-380,680},{-360,700}}))); @@ -573,17 +573,17 @@ block FreezeProtection and have_frePro "Disable relief fan when in stage 3" annotation (Placement(transformation(extent={{320,-430},{340,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=1) if (have_hotWatCoi and freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{320,-650},{340,-630}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{120,-620},{140,-600}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=1) if (buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan and freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro @@ -594,7 +594,7 @@ block FreezeProtection or not have_frePro) "Dummy block for enabling and disabling conditional connection" annotation (Placement(transformation(extent={{320,-470},{340,-450}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3( final k=1) if ((buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanMeasuredAir or buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanDp) and freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) @@ -607,17 +607,17 @@ block FreezeProtection or not have_frePro) "Dummy block for enabling and disabling conditional connection" annotation (Placement(transformation(extent={{320,-330},{340,-310}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai4( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai4( final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{320,120},{340,140}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai5( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai5( final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{320,40},{340,60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai6( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai6( final k=1) if (minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow and freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment) and have_frePro @@ -632,44 +632,44 @@ block FreezeProtection or (not have_frePro) "Dummy block for enabling and disabling conditional connection" annotation (Placement(transformation(extent={{320,-190},{340,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai7( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai7( final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{120,-260},{140,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai8(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai8(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-240,-60},{-220,-40}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt9(final k=0) if not have_frePro "Dummy constant" annotation (Placement(transformation(extent={{380,360},{400,380}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai9(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai9(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-240,-90},{-220,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai10(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai10(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-240,-120},{-220,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai11(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai11(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-260,-280},{-240,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai12(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai12(final k=1) if (not have_frePro) and (buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanMeasuredAir or buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanDp) "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-260,-420},{-240,-400}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai13(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai13(final k=1) if (not have_frePro) and buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-260,-560},{-240,-540}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai14(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai14(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-260,-640},{-240,-620}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai15(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai15(final k=1) if (not have_frePro) and have_hotWatCoi "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-260,-740},{-240,-720}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo index f896d708a5d..827f76740fc 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo @@ -72,54 +72,54 @@ block AHU "Outdoor airflow related calculations at the AHU level" annotation (Placement(transformation(extent={{220,-120},{260,-80}}), iconTransformation(extent={{100,-100},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant uncDesOutAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant uncDesOutAir( final k=VUncDesOutAir_flow) "Uncorrected design outdoor airflow rate, including diversity where applicable" annotation (Placement(transformation(extent={{-180,0},{-160,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Sum of the breathing zone outdoor airflow" annotation (Placement(transformation(extent={{-180,70},{-160,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min1 + Buildings.Controls.OBC.CDL.Reals.Min min1 "Uncorrected minimum outdoor airflow rate" annotation (Placement(transformation(extent={{-100,50},{-80,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div1 + Buildings.Controls.OBC.CDL.Reals.Divide div1 "First input divided by second input" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=1) "Add parameter" annotation (Placement(transformation(extent={{0,-30},{20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sysVenEff + Buildings.Controls.OBC.CDL.Reals.Subtract sysVenEff "Current system ventilation efficiency" annotation (Placement(transformation(extent={{40,-50},{60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Avoid devide by zero" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant desOutAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant desOutAir( final k=VDesTotOutAir_flow) "Design total outdoor airflow rate " annotation (Placement(transformation(extent={{120,50},{140,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div2 "Division" + Buildings.Controls.OBC.CDL.Reals.Divide div2 "Division" annotation (Placement(transformation(extent={{120,-10},{140,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min2 + Buildings.Controls.OBC.CDL.Reals.Min min2 "Uncorrected minimum outdoor airflow rate" annotation (Placement(transformation(extent={{180,20},{200,40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gaiDivZer( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gaiDivZer( final k=1E-3) "Gain, used to avoid division by zero if the flow rate is smaller than 0.1%" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norVOutMin + Buildings.Controls.OBC.CDL.Reals.Divide norVOutMin "Normalization for minimum outdoor air flow rate" annotation (Placement(transformation(extent={{160,-70},{180,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norVOut + Buildings.Controls.OBC.CDL.Reals.Divide norVOut if (minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper) "Normalization for outdoor air flow rate" annotation (Placement(transformation(extent={{160,-110},{180,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant neaZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant neaZer( final k=1E-4) "Near zero value" annotation (Placement(transformation(extent={{0,-80},{20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Avoid devide by zero" annotation (Placement(transformation(extent={{80,-50},{100,-30}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/SumZone.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/SumZone.mo index bd7b3d0f701..8000cb8f305 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/SumZone.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/SumZone.mo @@ -70,53 +70,53 @@ block SumZone "Calculate the sum of zone level setpoints" annotation (Placement(transformation(extent={{220,-90},{260,-50}}), iconTransformation(extent={{100,-100},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain groFlo( + Buildings.Controls.OBC.CDL.Reals.MatrixGain groFlo( final K=zonGroMat) "Vector of total zone flow of each group" annotation (Placement(transformation(extent={{-140,90},{-120,110}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain groFlo1( + Buildings.Controls.OBC.CDL.Reals.MatrixGain groFlo1( final K=zonGroMat) "Vector of total zone flow of each group" annotation (Placement(transformation(extent={{-140,30},{-120,50}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nGro] "Convert boolean to real" annotation (Placement(transformation(extent={{-40,170},{-20,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul[nGro] + Buildings.Controls.OBC.CDL.Reals.Multiply mul[nGro] "Find the total flow of zone group" annotation (Placement(transformation(extent={{20,110},{40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1[nGro] + Buildings.Controls.OBC.CDL.Reals.Multiply mul1[nGro] "Find the total flow of zone group" annotation (Placement(transformation(extent={{20,50},{40,70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum( + Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum( final nin=nGro) "Sum of the adjusted population component breathing zone flow rate" annotation (Placement(transformation(extent={{80,110},{100,130}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum1( + Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum1( final nin=nGro) "Sum of the adjusted area component breathing zone flow rate" annotation (Placement(transformation(extent={{80,50},{100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain groFlo2( + Buildings.Controls.OBC.CDL.Reals.MatrixGain groFlo2( final K=zonGroMat) "Vector of total zone flow of each group" annotation (Placement(transformation(extent={{-140,-30},{-120,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul2[nGro] + Buildings.Controls.OBC.CDL.Reals.Multiply mul2[nGro] "Find the total flow of zone group" annotation (Placement(transformation(extent={{20,-10},{40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum2( + Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum2( final nin=nGro) "Sum of the zone primary airflow rates for all zones in all zone groups that are in occupied mode" annotation (Placement(transformation(extent={{80,-10},{100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div1[nZon] + Buildings.Controls.OBC.CDL.Reals.Divide div1[nZon] "Zone outdoor air fraction" annotation (Placement(transformation(extent={{-40,-110},{-20,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain groFlo3( + Buildings.Controls.OBC.CDL.Reals.MatrixGain groFlo3( final K=zonGroMatTra) "Vector of zones in occupied mode" annotation (Placement(transformation(extent={{20,-60},{40,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul3[nZon] + Buildings.Controls.OBC.CDL.Reals.Multiply mul3[nZon] "Vector of zone outdoor air fraction" annotation (Placement(transformation(extent={{80,-80},{100,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMax mulMax( + Buildings.Controls.OBC.CDL.Reals.MultiMax mulMax( final nin=nZon) "Maximum zone outdoor air fraction" annotation (Placement(transformation(extent={{140,-80},{160,-60}}))); @@ -127,13 +127,13 @@ block SumZone "Calculate the sum of zone level setpoints" Buildings.Controls.OBC.CDL.Integers.Equal intEqu1[nGro] "Check if operation mode is occupied" annotation (Placement(transformation(extent={{-100,170},{-80,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2[nZon] "Avoid devide by zero" + Buildings.Controls.OBC.CDL.Reals.Max max2[nZon] "Avoid devide by zero" annotation (Placement(transformation(extent={{-100,-150},{-80,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant neaZer[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant neaZer[nZon]( final k=fill(1E-4, nZon)) "Near zero value" annotation (Placement(transformation(extent={{-160,-180},{-140,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min1[nZon] "Use smaller value" + Buildings.Controls.OBC.CDL.Reals.Min min1[nZon] "Use smaller value" annotation (Placement(transformation(extent={{-120,-104},{-100,-84}}))); equation connect(uOpeMod, intEqu1.u1) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/Validation/OutdoorAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/Validation/OutdoorAirFlow.mo index 260d2e6cd4f..1a7aa3bdaeb 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/Validation/OutdoorAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/Validation/OutdoorAirFlow.mo @@ -29,23 +29,23 @@ protected Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.unoccupied}) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant adjPopFlo[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant adjPopFlo[nZon]( final k={0.1,0.12,0.2,0.15}) "Adjusted population component flow" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant adjAreFlo[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant adjAreFlo[nZon]( final k={0.08,0.1,0.15,0.1}) "Adjusted area component flow" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant priFlo[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant priFlo[nZon]( final k={0.3,0.25,0.4,0.5}) "Measured zone primary airflow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minOAFlo[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minOAFlo[nZon]( final k={0.2,0.21,0.35,0.25}) "Minimum outdoor airflow" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outAirFlo(final k=1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outAirFlo(final k=1) "Adjusted area component flow" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo index f69e89a43b8..8cfc690db7e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo @@ -78,58 +78,58 @@ block AHU "AHU level setpoint calculation" annotation (Placement(transformation(extent={{100,-180},{140,-140}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant absOutAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant absOutAir( final k=VAbsOutAir_flow) "Design outdoor airflow rate when all zones with CO2 sensors or occupancy sensors are unpopulated" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min1 + Buildings.Controls.OBC.CDL.Reals.Min min1 "Effective outdoor air absolute minimum setpoint" annotation (Placement(transformation(extent={{20,150},{40,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant desOutAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant desOutAir( final k=VDesOutAir_flow) "Design minimum outdoor airflow with areas served by the system are occupied at their design population, including diversity where applicable" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min2 "Effective outdoor air design minimum setpoint" + Buildings.Controls.OBC.CDL.Reals.Min min2 "Effective outdoor air design minimum setpoint" annotation (Placement(transformation(extent={{20,50},{40,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norVOutMin + Buildings.Controls.OBC.CDL.Reals.Divide norVOutMin "Normalization for minimum outdoor air flow rate" annotation (Placement(transformation(extent={{20,10},{40,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norVOutMin1 + Buildings.Controls.OBC.CDL.Reals.Divide norVOutMin1 "Normalization for minimum outdoor air flow rate" annotation (Placement(transformation(extent={{20,110},{40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0.5) if have_CO2Sen "Constant value" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=1) if have_CO2Sen "Constant value" annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Line effOutAir( + Buildings.Controls.OBC.CDL.Reals.Line effOutAir( final limitBelow=false, final limitAbove=true) if have_CO2Sen "Normalized effective outdoor air setpoint" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=1) if not have_CO2Sen "When there is no zone has CO2 sensor, design setpoint will be applied" annotation (Placement(transformation(extent={{60,-50},{80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norVOutMin2 if have_CO2Sen + Buildings.Controls.OBC.CDL.Reals.Divide norVOutMin2 if have_CO2Sen "Normalization for minimum outdoor air flow rate" annotation (Placement(transformation(extent={{60,-110},{80,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norVOut + Buildings.Controls.OBC.CDL.Reals.Divide norVOut if (minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper) "Normalization for outdoor air flow rate" annotation (Placement(transformation(extent={{40,-170},{60,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant neaZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant neaZer( final k=1E-4) "Near zero value" annotation (Placement(transformation(extent={{-80,-2},{-60,18}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Avoid devide by zero" annotation (Placement(transformation(extent={{-30,104},{-10,124}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Avoid devide by zero" annotation (Placement(transformation(extent={{-30,4},{-10,24}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/SumZone.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/SumZone.mo index 057455f1928..9cf9a366a7a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/SumZone.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/SumZone.mo @@ -54,28 +54,28 @@ block SumZone "Sum of the zone level setpoints calculation" annotation (Placement(transformation(extent={{120,-120},{160,-80}}), iconTransformation(extent={{100,-70},{140,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain groFlo( + Buildings.Controls.OBC.CDL.Reals.MatrixGain groFlo( final K=zonGroMat) "Vector of total zone flow of each group" annotation (Placement(transformation(extent={{-100,10},{-80,30}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain groFlo1( + Buildings.Controls.OBC.CDL.Reals.MatrixGain groFlo1( final K=zonGroMat) "Vector of total zone flow of each group" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nGro] "Convert boolean to real" annotation (Placement(transformation(extent={{0,60},{20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul[nGro] + Buildings.Controls.OBC.CDL.Reals.Multiply mul[nGro] "Find the total flow of zone group" annotation (Placement(transformation(extent={{40,30},{60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1[nGro] + Buildings.Controls.OBC.CDL.Reals.Multiply mul1[nGro] "Find the total flow of zone group" annotation (Placement(transformation(extent={{40,-40},{60,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum( + Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum( final nin=nGro) "Sum of the zone absolute minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{80,30},{100,50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum mulSum1( + Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum1( final nin=nGro) "Sum of the zone design minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{80,-40},{100,-20}}))); @@ -86,7 +86,7 @@ block SumZone "Sum of the zone level setpoints calculation" Buildings.Controls.OBC.CDL.Integers.Equal intEqu1[nGro] "Check if operation mode is occupied" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMax mulMax( + Buildings.Controls.OBC.CDL.Reals.MultiMax mulMax( final nin=nZon) if have_CO2Sen "Maximum CO2 loop signal" annotation (Placement(transformation(extent={{40,-110},{60,-90}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/Validation/OutdoorAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/Validation/OutdoorAirFlow.mo index 13108ee4adb..1f72bc11fef 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/Validation/OutdoorAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/Validation/OutdoorAirFlow.mo @@ -30,16 +30,16 @@ protected Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.unoccupied}) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonAbsMinFlo[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonAbsMinFlo[nZon]( final k={0.1,0.12,0.2,0.15}) "Zone absolute minimum flow" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonDesMinFlo[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonDesMinFlo[nZon]( final k={0.15,0.2,0.25,0.3}) "Adjusted area component flow" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant co2Loo[nZon]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant co2Loo[nZon]( final k={0.3,0.25,0.4,0.5}) "Zone CO2 loop signal" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outAirFlo(final k=1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outAirFlo(final k=1) "Adjusted area component flow" annotation (Placement(transformation(extent={{20,-60},{40,-40}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/PlantRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/PlantRequests.mo index 3e210c55b7b..3c224dd3b3f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/PlantRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/PlantRequests.mo @@ -58,15 +58,15 @@ block PlantRequests "Output plant requests for multizone air handling unit" iconTransformation(extent={{100,-100},{140,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Subtract cooSupTemDif + Buildings.Controls.OBC.CDL.Reals.Subtract cooSupTemDif "Find the cooling supply temperature difference to the setpoint" annotation (Placement(transformation(extent={{-170,190},{-150,210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=3, final h=Thys) "Check if the supply temperature is greater than the setpoint by a threshold value" annotation (Placement(transformation(extent={{-80,190},{-60,210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=2, final h=Thys) "Check if the supply temperature is greater than the setpoint by a threshold value" @@ -79,7 +79,7 @@ protected final delayTime=120) "Check if the input has been true for a certain time" annotation (Placement(transformation(extent={{-40,140},{-20,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=0.95, final h=posHys) "Check if the chilled water valve position is greater than a threshold value" @@ -97,7 +97,7 @@ protected final k=2) "Constant 2" annotation (Placement(transformation(extent={{0,170},{20,190}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.85, final h=posHys) "Check if the chilled water valve position is less than a threshold value" @@ -117,7 +117,7 @@ protected Buildings.Controls.OBC.CDL.Logical.Latch lat1 "Keep true signal until other condition becomes true" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr1( final t=0.1, final h=posHys) "Check if the chilled water valve position is less than a threshold value" @@ -125,16 +125,16 @@ protected Buildings.Controls.OBC.CDL.Integers.Switch intSwi3 "Send 1 chiller plant request" annotation (Placement(transformation(extent={{80,10},{100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract heaSupTemDif if have_hotWatCoi + Buildings.Controls.OBC.CDL.Reals.Subtract heaSupTemDif if have_hotWatCoi "Find the heating supply temperature difference to the setpoint" annotation (Placement(transformation(extent={{-150,-50},{-130,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=17, final h=Thys) if have_hotWatCoi "Check if the supply temperature is less than the setpoint by a threshold value" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=8, final h=Thys) if have_hotWatCoi @@ -154,13 +154,13 @@ protected Buildings.Controls.OBC.CDL.Integers.Switch hotWatRes2 if have_hotWatCoi "Send 2 hot water reset request" annotation (Placement(transformation(extent={{120,-100},{140,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr2( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr2( final t=0.85, final h=posHys) if have_hotWatCoi "Check if the hot water valve position is less than a threshold value" annotation (Placement(transformation(extent={{-120,-190},{-100,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=0.95, final h=posHys) if have_hotWatCoi @@ -172,7 +172,7 @@ protected Buildings.Controls.OBC.CDL.Integers.Switch hotWatRes1 if have_hotWatCoi "Send 1 hot water reset request" annotation (Placement(transformation(extent={{80,-150},{100,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr3( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr3( final t=0.1, final h=posHys) if have_hotWatCoi diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefDamper.mo index e1085a6c6dc..93ea37f87c9 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefDamper.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefDamper.mo @@ -29,29 +29,29 @@ block ReliefDamper iconTransformation(extent={{100,-20},{140,20}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Check if relief damper should be enabled" annotation (Placement(transformation(extent={{60,-40},{80,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract conErr( + Buildings.Controls.OBC.CDL.Reals.Subtract conErr( u1(final unit="Pa", displayUnit="Pa"), u2(final unit="Pa", displayUnit="Pa"), y(final unit="Pa", displayUnit="Pa")) "Control error" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conP( + Buildings.Controls.OBC.CDL.Reals.PID conP( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P, final k=k, final reverseActing=false) "Building static pressure controller" annotation (Placement(transformation(extent={{10,60},{30,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerDam( final k=0) "Close damper when disabled" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dpBuiSetPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpBuiSetPoi( final k=dpBuiSet) "Building pressure setpoint" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer( final k=0) "Zero constant" annotation (Placement(transformation(extent={{-30,60},{-10,80}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFan.mo index d09ed4b46cf..a20a33a6e4a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFan.mo @@ -56,33 +56,33 @@ block ReliefFan "Sequence for control of relief fan in AHU" annotation (Placement(transformation(extent={{220,-120},{260,-80}}), iconTransformation(extent={{100,-100},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MovingAverage movMea( + Buildings.Controls.OBC.CDL.Reals.MovingAverage movMea( final delta=300) "Average building static pressure measurement" annotation (Placement(transformation(extent={{-220,130},{-200,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dpBuiSetPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpBuiSetPoi( final k=dpBuiSet) "Building pressure setpoint" annotation (Placement(transformation(extent={{-220,70},{-200,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div1 + Buildings.Controls.OBC.CDL.Reals.Divide div1 "Normalized the control error" annotation (Placement(transformation(extent={{-180,100},{-160,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-180,160},{-160,180}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conP( + Buildings.Controls.OBC.CDL.Reals.PID conP( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P, final k=k, final reverseActing=false) "Building static pressure controller" annotation (Placement(transformation(extent={{-140,160},{-120,180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.05, final h=hys) "Check if the controller output is greater than threshold" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.005, final h=hys) "Check if the controller output is near zero" @@ -97,7 +97,7 @@ block ReliefFan "Sequence for control of relief fan in AHU" Buildings.Controls.OBC.CDL.Logical.Latch lat "Enable damper" annotation (Placement(transformation(extent={{40,30},{60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=relFanSpe_min + 0.15, final h=hys) "Check if the controller output is greater than minimum speed plus threshold" @@ -106,7 +106,7 @@ block ReliefFan "Sequence for control of relief fan in AHU" final t=420) "Check if the controller output has been greater than threshold for sufficient long time" annotation (Placement(transformation(extent={{-40,-110},{-20,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr3( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr3( final t=relFanSpe_min, final h=hys) "Check if the controller output is less than minimum speed" @@ -127,7 +127,7 @@ block ReliefFan "Sequence for control of relief fan in AHU" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea2 "Convert boolean to real" annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1 "Relief fan speed" + Buildings.Controls.OBC.CDL.Reals.Multiply pro1 "Relief fan speed" annotation (Placement(transformation(extent={{160,-50},{180,-30}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean to real" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFanGroup.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFanGroup.mo index e18635a6ff7..7842f6851aa 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFanGroup.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReliefFanGroup.mo @@ -69,25 +69,25 @@ block ReliefFanGroup annotation (Placement(transformation(extent={{500,60},{540,100}}), iconTransformation(extent={{100,-80},{140,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain enaRel( + Buildings.Controls.OBC.CDL.Reals.MatrixGain enaRel( final K=relFanMat) "Vector of relief fans with the enabled one denoted by 1" annotation (Placement(transformation(extent={{-460,340},{-440,360}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nSupFan] "Convert boolean to real" annotation (Placement(transformation(extent={{-500,340},{-480,360}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai[nRelFan]( final k=staVec) "Vector of enabling fan, along with its staging order" annotation (Placement(transformation(extent={{-420,340},{-400,360}}))); - Buildings.Controls.OBC.CDL.Continuous.MovingAverage movMea( + Buildings.Controls.OBC.CDL.Reals.MovingAverage movMea( final delta=300) "Average building static pressure measurement" annotation (Placement(transformation(extent={{-500,240},{-480,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div1 + Buildings.Controls.OBC.CDL.Reals.Divide div1 "Normalized the control error" annotation (Placement(transformation(extent={{-400,200},{-380,220}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conP( + Buildings.Controls.OBC.CDL.Reals.PID conP( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P, final k=k, final reverseActing=false) @@ -100,10 +100,10 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean to real" annotation (Placement(transformation(extent={{-460,300},{-440,320}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Set controller output to zero when the relief system is disabled" annotation (Placement(transformation(extent={{140,294},{160,314}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.05, final h=hys) "Check if the controller output is greater than threshold" @@ -113,7 +113,7 @@ block ReliefFanGroup annotation (Placement(transformation(extent={{-260,140},{-240,160}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Enable damper" annotation (Placement(transformation(extent={{-220,140},{-200,160}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.005, final h=hys) "Check if the controller output is near zero" @@ -126,14 +126,14 @@ block ReliefFanGroup final nout=nRelFan) "Boolean replicator" annotation (Placement(transformation(extent={{-160,140},{-140,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1[nRelFan]( final t=fill(0.5, nRelFan)) "Check if a relief fan should be enabled" annotation (Placement(transformation(extent={{-160,170},{-140,190}}))); Buildings.Controls.OBC.CDL.Logical.And enaDam[nRelFan] "Enable damper" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=relFanSpe_min + 0.15, final h=hys) "Check if the controller output is greater than minimum speed plus threshold" @@ -149,37 +149,37 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea2[nRelFan] "Convert boolean to real" annotation (Placement(transformation(extent={{-460,-16},{-440,4}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Subtract sub2[nRelFan] "Identify relief fans that have been enabled but not yet operating" annotation (Placement(transformation(extent={{-400,-10},{-380,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply pro1[nRelFan] "List of standby fans, along with their staging order" annotation (Placement(transformation(extent={{-320,10},{-300,30}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMin mulMin(nin=nRelFan) + Buildings.Controls.OBC.CDL.Reals.MultiMin mulMin(nin=nRelFan) "Identify current order of staging" annotation (Placement(transformation(extent={{-120,-70},{-100,-50}}))); Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaRep( final nout=nRelFan) "Replicate real number" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Subtract sub1[nRelFan] "Identify next operating fan" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr1[nRelFan]( final t=fill(0.5, nRelFan)) "Check if the input is less than threshold" annotation (Placement(transformation(extent={{-260,-20},{-240,0}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar[nRelFan]( final p=fill(nRelFan + 1, nRelFan)) "Add value to the input" annotation (Placement(transformation(extent={{-260,10},{-240,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Switch swi[nRelFan] "Switch input values" annotation (Placement(transformation(extent={{-220,-20},{-200,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Abs abs1[nRelFan] "Find absolute value" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr2[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr2[nRelFan]( final t=fill(0.5, nRelFan)) "Identify next operating fan" annotation (Placement(transformation(extent={{40,10},{60,30}}))); @@ -189,7 +189,7 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Logical.Latch lat2 "Stage up next relief fan" annotation (Placement(transformation(extent={{240,-80},{260,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr3( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr3( final t=relFanSpe_min, final h=hys) "Check if the controller output is less than minimum speed" @@ -202,30 +202,30 @@ block ReliefFanGroup final pre_u_start=true) "Break algebraic loop" annotation (Placement(transformation(extent={{0,-338},{20,-318}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro2[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply pro2[nRelFan] "List of operating fans, along with their staging order" annotation (Placement(transformation(extent={{-320,-220},{-300,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1[nRelFan]( final p=fill(nRelFan + 1, nRelFan)) "Add value to the input" annotation (Placement(transformation(extent={{-260,-220},{-240,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr4[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr4[nRelFan]( final t=fill(0.5, nRelFan)) "Check if the input is less than threshold" annotation (Placement(transformation(extent={{-260,-250},{-240,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Switch swi1[nRelFan] "Switch input values" annotation (Placement(transformation(extent={{-220,-250},{-200,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMin mulMin1( + Buildings.Controls.OBC.CDL.Reals.MultiMin mulMin1( final nin=nRelFan) "Minimum staging order of the running relief fans" annotation (Placement(transformation(extent={{-140,-250},{-120,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Subtract sub3[nRelFan] "Identify next operating fan" annotation (Placement(transformation(extent={{-40,-220},{-20,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs2[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Abs abs2[nRelFan] "Find absolute value" annotation (Placement(transformation(extent={{0,-220},{20,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr5[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr5[nRelFan]( final t=fill(0.5, nRelFan)) "Identify next fan to be off" annotation (Placement(transformation(extent={{40,-220},{60,-200}}))); @@ -279,7 +279,7 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea3[nRelFan] "Convert boolean to real" annotation (Placement(transformation(extent={{400,-80},{420,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Limiter lim( + Buildings.Controls.OBC.CDL.Reals.Limiter lim( final uMax=1, final uMin=relFanSpe_min) "Limit the controller output" @@ -288,25 +288,25 @@ block ReliefFanGroup final nout=nRelFan) "Replicate real input" annotation (Placement(transformation(extent={{400,226},{420,246}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro3[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply pro3[nRelFan] "Relief fan speed" annotation (Placement(transformation(extent={{460,220},{480,240}}))); Buildings.Controls.OBC.CDL.Logical.Switch logSwi2[nRelFan] "Vector of relief fan status after staging up" annotation (Placement(transformation(extent={{400,130},{420,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dpBuiSetPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpBuiSetPoi( final k=dpBuiSet) "Building pressure setpoint" annotation (Placement(transformation(extent={{-460,170},{-440,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-420,270},{-400,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0) "Zero fan speed when it is in stage 0" annotation (Placement(transformation(extent={{180,200},{200,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Switch input values" annotation (Placement(transformation(extent={{360,226},{380,246}}))); Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(nin=nRelFan) @@ -343,17 +343,17 @@ block ReliefFanGroup final realFalse=fill(1, nRelFan)) "Convert boolean to real" annotation (Placement(transformation(extent={{-260,60},{-240,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply mul[nRelFan] "Product of inputs" annotation (Placement(transformation(extent={{460,70},{480,90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3[nRelFan]( final t=fill(0.5, nRelFan)) "Check if the relief fan is enabled" annotation (Placement(transformation(extent={{-40,226},{-20,246}}))); Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd1( final nin=nRelFan) "Check if all the fans are proven off" annotation (Placement(transformation(extent={{-320,-70},{-300,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Switch swi3[nRelFan] "Switch input values" annotation (Placement(transformation(extent={{-160,-70},{-140,-50}}))); Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booRep4( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanAirflowTracking.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanAirflowTracking.mo index 057c6eb2800..1b6154b75c7 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanAirflowTracking.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanAirflowTracking.mo @@ -66,7 +66,7 @@ block ReturnFanAirflowTracking "Return fan commanded on" annotation (Placement(transformation(extent={{100,-90},{140,-50}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conP( + Buildings.Controls.OBC.CDL.Reals.PID conP( final controllerType=conTyp, final k=k, final Ti=Ti, @@ -77,19 +77,19 @@ block ReturnFanAirflowTracking annotation (Placement(transformation(extent={{0,70},{20,90}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Check if relief damper should be enabled" annotation (Placement(transformation(extent={{60,-40},{80,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract conErr( + Buildings.Controls.OBC.CDL.Reals.Subtract conErr( u1(final unit="m3/s", displayUnit="m3/s"), u2(final unit="m3/s", displayUnit="m3/s"), y(final unit="m3/s", displayUnit="m3/s")) "Control error" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerSpe( final k=0) "Disable return fan" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant difFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant difFlo( final k=difFloSet) "Return airflow less than supply airflow" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo index 241c2d0dbfe..73c5b6434f7 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/ReturnFanDirectPressure.mo @@ -103,74 +103,74 @@ block ReturnFanDirectPressure annotation (Placement(transformation(extent={{120,-220},{160,-180}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.MovingAverage movMea( + Buildings.Controls.OBC.CDL.Reals.MovingAverage movMea( final delta=300) "Average building static pressure measurement" annotation (Placement(transformation(extent={{-130,130},{-110,150}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conP( + Buildings.Controls.OBC.CDL.Reals.PID conP( final controllerType=conTyp, final k=k, final Ti=Ti, final Td=Td) "Building static pressure controller" annotation (Placement(transformation(extent={{-60,170},{-40,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Line linExhAirDam + Buildings.Controls.OBC.CDL.Reals.Line linExhAirDam "Exhaust air damper position" annotation (Placement(transformation(extent={{60,170},{80,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Line linRetFanStaPre + Buildings.Controls.OBC.CDL.Reals.Line linRetFanStaPre "Return fan static pressure setpoint" annotation (Placement(transformation(extent={{60,20},{80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Relief air damper position" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Return fan discharge static pressure setpoint" annotation (Placement(transformation(extent={{80,-30},{100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div "Normalized the control error" + Buildings.Controls.OBC.CDL.Reals.Divide div "Normalized the control error" annotation (Placement(transformation(extent={{-80,110},{-60,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Line linRetFanSpe "Return fan speed" + Buildings.Controls.OBC.CDL.Reals.Line linRetFanSpe "Return fan speed" annotation (Placement(transformation(extent={{60,-110},{80,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Return fan speed setpoint" annotation (Placement(transformation(extent={{80,-160},{100,-140}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dpBuiSetPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpBuiSetPoi( final k=dpBuiSet) "Building pressure setpoint" annotation (Placement(transformation(extent={{-130,100},{-110,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retFanDisPreMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retFanDisPreMin( final k=p_rel_RetFan_min) "Return fan discharge static pressure minimum setpoint" annotation (Placement(transformation(extent={{0,40},{20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retFanDisPreMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retFanDisPreMax( final k=p_rel_RetFan_max) "Return fan discharge static pressure maximum setpoint" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(final k=0) "Zero fan control signal" annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer1(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer1(final k=0) "Zero constant" annotation (Placement(transformation(extent={{-40,112},{-20,132}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(final k=0.5) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(final k=0.5) "Constant 0.5" annotation (Placement(transformation(extent={{0,150},{20,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(final k=1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(final k=1) "Constant one" annotation (Placement(transformation(extent={{0,96},{20,116}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne(final k=1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne(final k=1) "Constant one" annotation (Placement(transformation(extent={{-100,170},{-80,190}}))); Buildings.Controls.OBC.CDL.Logical.And enaDam "Check if the relief damper should be enabled" annotation (Placement(transformation(extent={{-40,80},{-20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retFanSpeMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retFanSpeMin( final k=disSpe_min) "Return fan speed when discharge static pressure minimum setpoint" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retFanSpeMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retFanSpeMax( final k=disSpe_max) "Return fan speed when discharge static pressure maximum setpoint" annotation (Placement(transformation(extent={{-40,-130},{-20,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer2( final k=0) "Zero fan control signal" annotation (Placement(transformation(extent={{0,-180},{20,-160}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo index ae6b1f672fe..e9195fb8e11 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyFan.mo @@ -127,7 +127,7 @@ block SupplyFan "Block to control multi zone VAV AHU supply fan" final maxRes=maxRes) "Static pressure setpoint reset using trim and respond logic" annotation (Placement(transformation(extent={{-130,-60},{-110,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conSpe( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conSpe( final controllerType=controllerType, final k=k, final Ti=Ti, @@ -138,10 +138,10 @@ block SupplyFan "Block to control multi zone VAV AHU supply fan" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerSpe(k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerSpe(k=0) "Zero fan speed when it becomes OFF" annotation (Placement(transformation(extent={{20,-90},{40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "If fan is OFF, fan speed outputs to zero" annotation (Placement(transformation(extent={{80,-90},{100,-110}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -192,14 +192,14 @@ protected Buildings.Controls.OBC.CDL.Integers.Equal intEqu4 "Check if current operation mode is warmup mode" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant gaiNor( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant gaiNor( final k=maxSet) "Gain for normalization of controller input" annotation (Placement(transformation(extent={{-130,-100},{-110,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norPSet + Buildings.Controls.OBC.CDL.Reals.Divide norPSet "Normalization for pressure set point" annotation (Placement(transformation(extent={{-70,-80},{-50,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide norPMea + Buildings.Controls.OBC.CDL.Reals.Divide norPMea "Normalization of pressure measurement" annotation (Placement(transformation(extent={{-70,-120},{-50,-100}}))); Buildings.Controls.OBC.CDL.Discrete.FirstOrderHold firOrdHol( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo index 9d60be7b487..b67ef7ab44b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplySignals.mo @@ -75,7 +75,7 @@ block SupplySignals annotation (Placement(transformation(extent={{100,40},{140,80}}), iconTransformation(extent={{100,40},{140,80}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conTSup( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conTSup( final controllerType=controllerType, final k=kTSup, final Ti=TiTSup, @@ -88,33 +88,33 @@ block SupplySignals annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Switch to select supply temperature control signal based on status of supply fan" annotation (Placement(transformation(extent={{0,50},{20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant uHeaMaxCon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant uHeaMaxCon( final k=uHea_max) if have_heaCoi "Constant signal to map control action" annotation (Placement(transformation(extent={{0,-20},{20,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant negOne(final k=-1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant negOne(final k=-1) if have_heaCoi "Negative unity signal" annotation (Placement(transformation(extent={{0,18},{20,38}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant uCooMinCon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant uCooMinCon( final k=uCoo_min) "Constant signal to map control action" annotation (Placement(transformation(extent={{0,-60},{20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(final k=0) "Zero control signal" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(final k=1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(final k=1) "Unity signal" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Line conSigCoo( + Buildings.Controls.OBC.CDL.Reals.Line conSigCoo( final limitBelow=true, final limitAbove=false) "Cooling control signal" annotation (Placement(transformation(extent={{60,-30},{80,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Line conSigHea( + Buildings.Controls.OBC.CDL.Reals.Line conSigHea( final limitBelow=false, final limitAbove=true) if have_heaCoi "Heating control signal" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo index 0dfc56f110f..622be6d00e9 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/SupplyTemperature.mo @@ -142,36 +142,36 @@ protected "Minimum setpoint" annotation (Dialog(group="Trim and respond logic")); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Supply temperature distributes linearly between minimum and maximum supply air temperature, according to outdoor temperature" annotation (Placement(transformation(extent={{0,110},{20,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minOutTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minOutTem( final k=TOut_min) "Lower value of the outdoor air temperature reset range" annotation (Placement(transformation(extent={{-60,130},{-40,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxOutTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxOutTem( final k=TOut_max) "Higher value of the outdoor air temperature reset range" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minSupTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minSupTem( final k=TSupCoo_min) "Lowest cooling supply air temperature setpoint" annotation (Placement(transformation(extent={{-100,50},{-80,70}}))); Buildings.Controls.OBC.CDL.Logical.And and1 "Check if it is in Warmup or Setback mode" annotation (Placement(transformation(extent={{0,-120},{20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supTemWarUpSetBac( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supTemWarUpSetBac( final k=TSupWarUpSetBac) "Supply temperature setpoint under warm-up and setback mode" annotation (Placement(transformation(extent={{20,-160},{40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "If operation mode is warm-up or setback modes, setpoint shall be 35 degC" annotation (Placement(transformation(extent={{80,-80},{100,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "If operation mode is setup or cool-down, setpoint shall be the lowest cooling supply setpoint" annotation (Placement(transformation(extent={{20,-80},{40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Check output regarding supply fan status" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant cooDowMod( @@ -196,14 +196,14 @@ protected Buildings.Controls.OBC.CDL.Logical.And and2 "Check if it is in occupied or setup mode" annotation (Placement(transformation(extent={{0,18},{20,38}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "If operation mode is occupied or setup ,mode, setpoint shall be reset" annotation (Placement(transformation(extent={{40,50},{60,70}}))); Buildings.Controls.OBC.CDL.Integers.Equal intEqu "Check if it is in cooldown mode" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - CDL.Continuous.Sources.Constant TDea(final k=TDeaBan) + CDL.Reals.Sources.Constant TDea(final k=TDeaBan) "Deadband supply temperature setpoint" annotation (Placement(transformation(extent={{-100,150},{-80,170}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection.mo index 6275abbd767..292c379019b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection.mo @@ -10,25 +10,25 @@ model FreezeProtection "Freeze protection control" annotation (Placement(transformation(extent={{80,0},{100,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos( final height=0.5, final offset=0.1, final duration=3600) "Outdoor air damper position" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMin( final k=0.1) "Outdoor air damper minimum position" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaCoiPos( final height=0.46, final offset=0.5, final duration=3600) "Heating coil position" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minOutDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minOutDamPos( final k=0.15) "Minimum outdoor air damper position" annotation (Placement(transformation(extent={{-40,30},{-20,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp retDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp retDamPos( final height=0.2, final offset=0.7, final duration=3600) "Return air damper position" @@ -41,27 +41,27 @@ model FreezeProtection Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe( final height=0.2, final offset=0.5, final duration=3600) "Supply fan speed" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoiPos( final height=0.2, final offset=0.5, final duration=3600) "Cooling coil position" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTem( final height=-4, final offset=273.15 + 6, final duration=3600) "Supply air temperature" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp mixTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp mixTem( final height=-5, final offset=273.15 + 8, final duration=3600) "Mixed air temperature" annotation (Placement(transformation(extent={{-40,-110},{-20,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final h=0.01) "Check if the supply fan is proven on" annotation (Placement(transformation(extent={{0,-56},{20,-36}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo index fcddee20db5..5d066a8793b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo @@ -11,36 +11,36 @@ model FreezeProtection_Disable "Freeze protection control" annotation (Placement(transformation(extent={{80,0},{100,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos( final height=0.5, final offset=0.1, final duration=3600) "Outdoor air damper position" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaCoiPos( final height=0.46, final offset=0.5, final duration=3600) "Heating coil position" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minOutDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minOutDamPos( final k=0.15) "Minimum outdoor air damper position" annotation (Placement(transformation(extent={{-40,30},{-20,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp retDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp retDamPos( final height=0.2, final offset=0.7, final duration=3600) "Return air damper position" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe( final height=0.2, final offset=0.5, final duration=3600) "Supply fan speed" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoiPos( final height=0.2, final offset=0.5, final duration=3600) "Cooling coil position" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final h=0.01) "Check if the supply fan is proven on" annotation (Placement(transformation(extent={{0,-56},{20,-36}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/PlantRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/PlantRequests.mo index 79edaac949f..1b37e9f18e6 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/PlantRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/PlantRequests.mo @@ -9,39 +9,39 @@ model PlantRequests final have_hotWatCoi=false) "Calculate plant request" annotation (Placement(transformation(extent={{60,-60},{80,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTem( final height=8, final offset=273.15 + 15, final duration=3600) "Supply air temperature" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTemSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTemSet( final height=6, final offset=273.15 + 14.5, final duration=3600) "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoi( final height=-0.3, final offset=0.96, final duration=3600, startTime=1000) "Cooling coil position" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaCoi( final height=-0.3, final offset=0.96, final duration=3600, startTime=1000) "Heating coil position" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTem1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTem1( final height=8, final offset=273.15 + 12, final duration=3600) "Supply air temperature" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTemSet1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTemSet1( final height=15, final offset=273.15 + 20, final duration=3600) "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooCoi1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooCoi1( final k=0) "Cooling coil position" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefDamper.mo index 972203140f6..f5e992d55cc 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefDamper.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefDamper.mo @@ -14,7 +14,7 @@ model ReliefDamper final period=4000) "Supply fan status" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFan.mo index 8064f9a583c..e5ac987712c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFan.mo @@ -16,12 +16,12 @@ model ReliefFan "Validate model for controlling relief fan" final period=3600) "Supply fan status" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui1( final height=-15, final offset=20, final duration=1800, @@ -32,7 +32,7 @@ model ReliefFan "Validate model for controlling relief fan" final k=true) "Supply fan status" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui2( final height=3, final offset=11, final duration=1800) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFanGroup.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFanGroup.mo index cf5a951127a..95bf26163a3 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFanGroup.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReliefFanGroup.mo @@ -17,7 +17,7 @@ model ReliefFanGroup final period=4000) "Supply fan status" annotation (Placement(transformation(extent={{-120,130},{-100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" @@ -27,13 +27,13 @@ model ReliefFanGroup final period=4000, shift=600) "Supply fan status" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr[4]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr[4]( final t=fill(0.01, 4)) "Check if the relief fan is proven on" annotation (Placement(transformation(extent={{60,100},{80,120}}))); Buildings.Controls.OBC.CDL.Logical.Pre pre[4] "Return relief fan status" annotation (Placement(transformation(extent={{100,100},{120,120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1[4]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1[4]( final t=fill(0.01, 4)) "Check if the relief fan is proven on" annotation (Placement(transformation(extent={{60,0},{80,20}}))); @@ -55,7 +55,7 @@ model ReliefFanGroup final samplePeriod=fill(20, 4)) "Zero order hold" annotation (Placement(transformation(extent={{30,0},{50,20}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2[4]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2[4]( final t=fill(0.01, 4)) "Check if the relief fan is proven on" annotation (Placement(transformation(extent={{60,-120},{80,-100}}))); @@ -65,7 +65,7 @@ model ReliefFanGroup final samplePeriod=fill(20, 4)) "Zero order hold" annotation (Placement(transformation(extent={{30,-120},{50,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui1( final height=-15, final offset=20, final duration=1800, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanAirflowTracking.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanAirflowTracking.mo index e229a4d41ce..78b8c54177f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanAirflowTracking.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanAirflowTracking.mo @@ -16,13 +16,13 @@ model ReturnFanAirflowTracking final period=4000) "Supply fan status" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFlo( final height=1.0, final offset=0.2, final duration=1800) "Supply air flow rate" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp retFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp retFlo( final height=0.4, final offset=0.1, final duration=1800) "Return air flow rate" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanDirectPressure.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanDirectPressure.mo index 1ec1495dd23..2e37da10dc4 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanDirectPressure.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/ReturnFanDirectPressure.mo @@ -23,7 +23,7 @@ model ReturnFanDirectPressure final period=4000) "Supply fan status" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyFan.mo index e5e63c97834..a4892b7f50b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyFan.mo @@ -29,29 +29,29 @@ model SupplyFan "Validate SupplyFan" annotation (Placement(transformation(extent={{80,20},{100,40}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram( final duration=28800, final height=6) "Ramp signal for generating operation mode" annotation (Placement(transformation(extent={{-200,100},{-180,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/14400, final offset=3, final amplitude=2) "Generate sine signal " annotation (Placement(transformation(extent={{-200,-10},{-180,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine1( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine1( final freqHz=1/14400, final offset=200, amplitude=150) "Generate sine signal" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs + Buildings.Controls.OBC.CDL.Reals.Abs abs "Block generates absolute value of input" annotation (Placement(transformation(extent={{-160,100},{-140,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs1 + Buildings.Controls.OBC.CDL.Reals.Abs abs1 "Block generates absolute value of input" annotation (Placement(transformation(extent={{-160,-10},{-140,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); @@ -61,7 +61,7 @@ protected Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-120,100},{-100,120}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplySignals.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplySignals.mo index b29150ca393..e1b34746713 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplySignals.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplySignals.mo @@ -8,13 +8,13 @@ model SupplySignals Buildings.Controls.OBC.CDL.Logical.Sources.Pulse supFanSta(period=7200) "Supply fan status" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse TSup( final amplitude=14, final period=7200, final offset=10 + 273.15) "Supply air temperature" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSupSet( final height=3, final duration=7200, final offset=15 + 273.15) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyTemperature.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyTemperature.mo index 62cbf567cce..8b320ac3dfe 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyTemperature.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/Validation/SupplyTemperature.mo @@ -5,7 +5,7 @@ model SupplyTemperature Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.SupplyTemperature conTSupSet "Supply air temperature setpoint for multi zone system" annotation (Placement(transformation(extent={{70,-10},{90,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin outTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin outTem( final amplitude=5, final freqHz=1/86400, final offset=18 + 273.15) "Outdoor air temperature" @@ -14,15 +14,15 @@ model SupplyTemperature final period=43200) "Supply fan status" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=1, final duration=90000) "Operation mode" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs + Buildings.Controls.OBC.CDL.Reals.Abs abs "Block generates absolute value of input" annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final amplitude=6, final freqHz=1/86400) "Block generates sine signal" @@ -30,14 +30,14 @@ model SupplyTemperature Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{32,-40},{52,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-80},{20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo index db1a3abc224..211d7229cd5 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller.mo @@ -12,54 +12,54 @@ model Controller "Validation controller model" final VDesTotOutAir_flow=0.05) "Multizone VAV AHU controller" annotation (Placement(transformation(extent={{100,-120},{180,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSup( final height=4, final duration=3600, final offset=273.15 + 14) "AHU supply air temperature" annotation (Placement(transformation(extent={{-200,130},{-180,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow( final duration=1800, final offset=0.02, final height=0.0168) "Measured outdoor airflow rate" annotation (Placement(transformation(extent={{-200,-70},{-180,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TMixMea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TMixMea( final height=4, final duration=1, final offset=273.15 + 2, final startTime=0) "Measured mixed air temperature" annotation (Placement(transformation(extent={{-200,-200},{-180,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TOut( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TOut( final amplitude=5, final offset=18 + 273.15, final freqHz=1/3600) "Outdoor air temperature" annotation (Placement(transformation(extent={{-240,180},{-220,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin ducStaPre( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin ducStaPre( final offset=200, final amplitude=150, final freqHz=1/3600) "Duct static pressure" annotation (Placement(transformation(extent={{-200,200},{-180,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine2( final offset=3, final amplitude=2, final freqHz=1/9600) "Duct static pressure setpoint reset requests" annotation (Placement(transformation(extent={{-240,220},{-220,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine3( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine3( final amplitude=6, final freqHz=1/9600) "Maximum supply temperature setpoint reset" annotation (Placement(transformation(extent={{-240,150},{-220,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs2 + Buildings.Controls.OBC.CDL.Reals.Abs abs2 "Block generates absolute value of input" annotation (Placement(transformation(extent={{-160,150},{-140,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs3 + Buildings.Controls.OBC.CDL.Reals.Abs abs3 "Block generates absolute value of input" annotation (Placement(transformation(extent={{-160,220},{-140,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round3(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round4(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-120,220},{-100,240}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger ducPreResReq @@ -72,46 +72,46 @@ model Controller "Validation controller model" final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is occupied" annotation (Placement(transformation(extent={{-200,240},{-180,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant sumDesPopBreZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant sumDesPopBreZon( final k=0.0125) "Sum of the population component design breathing zone flow rate" annotation (Placement(transformation(extent={{-200,90},{-180,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant sumDesAreBreZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant sumDesAreBreZon( final k=0.03) "Sum of the area component design breathing zone flow rate" annotation (Placement(transformation(extent={{-240,70},{-220,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp vavBoxFlo2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp vavBoxFlo2( final offset=0.08, final height=0.02, final duration=3600) "Ramp signal for generating VAV box flow rate" annotation (Placement(transformation(extent={{-180,10},{-160,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp vavBoxFlo1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp vavBoxFlo1( final height=0.05, final offset=0.08, final duration=3600) "Ramp signal for generating VAV box flow rate" annotation (Placement(transformation(extent={{-180,-30},{-160,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "System primary airflow rate, equals to the sum of the measured discharged flow rate of all terminal units" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse uOutAirFra_max( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse uOutAirFra_max( final amplitude=0.005, final width=0.25, final period=3600, final offset=0.015) "Maximum zone outdoor air fraction, equals to the maximum of primary outdoor air fraction of all zones" annotation (Placement(transformation(extent={{-240,-50},{-220,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" annotation (Placement(transformation(extent={{-240,-220},{-220,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaCoi( final k=0) "Heating coil position" annotation (Placement(transformation(extent={{-240,-260},{-220,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoi( final height=-0.3, final offset=0.96, final duration=3600, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo index dd26d290c5e..56adc0b496d 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/Validation/Controller_UnspecifiedClimate.mo @@ -13,54 +13,54 @@ model Controller_UnspecifiedClimate final VDesTotOutAir_flow=0.05) "Multizone VAV AHU controller" annotation (Placement(transformation(extent={{100,-120},{180,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSup( final height=4, final duration=3600, final offset=273.15 + 14) "AHU supply air temperature" annotation (Placement(transformation(extent={{-200,130},{-180,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOut_flow( final duration=1800, final offset=0.02, final height=0.0168) "Measured outdoor airflow rate" annotation (Placement(transformation(extent={{-200,-70},{-180,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TMixMea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TMixMea( final height=4, final duration=1, final offset=273.15 + 2, final startTime=0) "Measured mixed air temperature" annotation (Placement(transformation(extent={{-200,-200},{-180,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TOut( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TOut( final amplitude=5, final offset=18 + 273.15, final freqHz=1/3600) "Outdoor air temperature" annotation (Placement(transformation(extent={{-240,180},{-220,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin ducStaPre( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin ducStaPre( final offset=200, final amplitude=150, final freqHz=1/3600) "Duct static pressure" annotation (Placement(transformation(extent={{-200,200},{-180,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine2( final offset=3, final amplitude=2, final freqHz=1/9600) "Duct static pressure setpoint reset requests" annotation (Placement(transformation(extent={{-240,220},{-220,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine3( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine3( final amplitude=6, final freqHz=1/9600) "Maximum supply temperature setpoint reset" annotation (Placement(transformation(extent={{-240,150},{-220,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs2 + Buildings.Controls.OBC.CDL.Reals.Abs abs2 "Block generates absolute value of input" annotation (Placement(transformation(extent={{-160,150},{-140,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs3 + Buildings.Controls.OBC.CDL.Reals.Abs abs3 "Block generates absolute value of input" annotation (Placement(transformation(extent={{-160,220},{-140,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round3(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round4(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-120,220},{-100,240}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger ducPreResReq @@ -73,46 +73,46 @@ model Controller_UnspecifiedClimate final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is occupied" annotation (Placement(transformation(extent={{-200,240},{-180,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant sumDesPopBreZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant sumDesPopBreZon( final k=0.0125) "Sum of the population component design breathing zone flow rate" annotation (Placement(transformation(extent={{-200,90},{-180,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant sumDesAreBreZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant sumDesAreBreZon( final k=0.03) "Sum of the area component design breathing zone flow rate" annotation (Placement(transformation(extent={{-240,70},{-220,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp vavBoxFlo2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp vavBoxFlo2( final offset=0.08, final height=0.02, final duration=3600) "Ramp signal for generating VAV box flow rate" annotation (Placement(transformation(extent={{-180,10},{-160,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp vavBoxFlo1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp vavBoxFlo1( final height=0.05, final offset=0.08, final duration=3600) "Ramp signal for generating VAV box flow rate" annotation (Placement(transformation(extent={{-180,-30},{-160,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "System primary airflow rate, equals to the sum of the measured discharged flow rate of all terminal units" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse uOutAirFra_max( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse uOutAirFra_max( final amplitude=0.005, final width=0.25, final period=3600, final offset=0.015) "Maximum zone outdoor air fraction, equals to the maximum of primary outdoor air fraction of all zones" annotation (Placement(transformation(extent={{-240,-50},{-220,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" annotation (Placement(transformation(extent={{-240,-220},{-220,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaCoi( final k=0) "Heating coil position" annotation (Placement(transformation(extent={{-240,-260},{-220,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoi( final height=-0.3, final offset=0.96, final duration=3600, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Controller.mo index 5364210220f..3b9bda3f7e3 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Controller.mo @@ -865,7 +865,7 @@ block Controller final spePoiFou=spePoiFou) "Supply air set point and fan signal for single zone VAV system" annotation (Placement(transformation(extent={{-20,390},{0,410}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset cooPI( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset cooPI( final controllerType=cooLooCon, final k=kCoo, final Ti=TiCoo, @@ -873,7 +873,7 @@ block Controller final reverseActing=false) "Zone cooling control signal" annotation (Placement(transformation(extent={{-90,350},{-70,370}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset heaPI( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset heaPI( final controllerType=heaLooCon, final k=kHea, final Ti=TiHea, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo index b2c0fa45f20..ec4083d4981 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Enable.mo @@ -134,34 +134,34 @@ protected final k=false) if not use_enthalpy "Deactivates outdoor air enthalpy condition if there is no enthalpy sensor" annotation (Placement(transformation(extent={{-60,190},{-40,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyMin( final k=retDamPhy_min) "Physically fixed minimum position of the return air damper" annotation (Placement(transformation(extent={{-140,-258},{-120,-238}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamPhyMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamPhyMax( final k=retDamPhy_max) "Physically fixed maximum position of the return air damper. This is the initial condition of the return air damper" annotation (Placement(transformation(extent={{-140,-220},{-120,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysOutTem( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysOutTem( final uHigh=TOutHigLimCutHig, final uLow=TOutHigLimCutLow) "Outdoor air temperature hysteresis for fixed or differential dry bulb temperature cutoff conditions" annotation (Placement(transformation(extent={{-100,240},{-80,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysOutEnt( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysOutEnt( final uLow=hOutHigLimCutLow, final uHigh=hOutHigLimCutHig) if use_enthalpy "Outdoor air enthalpy hysteresis for fixed or differential enthalpy cutoff conditions" annotation (Placement(transformation(extent={{-100,160},{-80,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 if use_enthalpy + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 if use_enthalpy "Add block that determines the difference between hOut and hOutCut" annotation (Placement(transformation(extent={{-140,160},{-120,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Add block that determines difference the between TOut and TOutCut" annotation (Placement(transformation(extent={{-140,240},{-120,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch maxOutDam + Buildings.Controls.OBC.CDL.Reals.Switch maxOutDam "Set maximum OA damper position to minimum at disable (after time delay)" annotation (Placement(transformation(extent={{40,-150},{60,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch minRetDam + Buildings.Controls.OBC.CDL.Reals.Switch minRetDam "Keep minimum RA damper position at physical maximum for a short time period after disable" annotation (Placement(transformation(extent={{40,-250},{60,-230}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo index 9581bd00139..196b45631cc 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Limits.mo @@ -112,63 +112,63 @@ block Limits "Single zone VAV AHU minimum outdoor air control - damper position iconTransformation(extent={{100,40},{140,80}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yFanMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant yFanMinSig( final k=supFanSpe_min) "Minimum supply fan speed" annotation (Placement(transformation(extent={{-140,50},{-120,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMinSig( final k=outDamPhy_min) "Physically fixed minimum position of the outdoor air damper" annotation (Placement(transformation(extent={{20,-10},{40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPhyPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPhyPosMaxSig( final k=outDamPhy_max) "Physically fixed maximum position of the outdoor air damper" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yFanMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant yFanMaxSig( final k=supFanSpe_max) "Maximum supply fan speed" annotation (Placement(transformation(extent={{-140,80},{-120,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yDam_VOutMin_minSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant yDam_VOutMin_minSpeSig( final k=outDamMinFloMinSpe) "OA damper position to supply minimum outdoor airflow at minimum fan speed" annotation (Placement(transformation(extent={{-140,120},{-120,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yDam_VOutDes_minSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant yDam_VOutDes_minSpeSig( final k=outDamDesFloMinSpe) "OA damper position to supply design outdoor airflow at minimum fan speed" annotation (Placement(transformation(extent={{-140,-30},{-120,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yDam_VOutMin_maxSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant yDam_VOutMin_maxSpeSig( final k=outDamMinFloMaxSpe) "OA damper position to supply minimum outdoor airflow at maximum fan speed" annotation (Placement(transformation(extent={{-140,150},{-120,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yDam_VOutDes_maxSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant yDam_VOutDes_maxSpeSig( final k=outDamDesFloMaxSpe) "OA damper position to supply design outdoor airflow at maximum fan speed" annotation (Placement(transformation(extent={{-140,10},{-120,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minVOutSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minVOutSig( final k=VOutMin_flow) "Minimum outdoor airflow rate" annotation (Placement(transformation(extent={{20,170},{40,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant desVOutSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant desVOutSig( final k=VOutDes_flow) "Design outdoor airflow rate" annotation (Placement(transformation(extent={{40,90},{60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Line yDam_VOutMin_curSpe( + Buildings.Controls.OBC.CDL.Reals.Line yDam_VOutMin_curSpe( final limitBelow=true, final limitAbove=true) "Calculates OA damper position required to supply minimum outdoor airflow at current fan speed" annotation (Placement(transformation(extent={{40,130},{60,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Line yDam_VOutDes_curSpe( + Buildings.Controls.OBC.CDL.Reals.Line yDam_VOutDes_curSpe( final limitBelow=true, final limitAbove=true) "Calculates OA damper position required to supply design outdoor airflow at current fan speed" annotation (Placement(transformation(extent={{40,40},{60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Line minVOutSetCurFanSpePos( + Buildings.Controls.OBC.CDL.Reals.Line minVOutSetCurFanSpePos( final limitBelow=true, final limitAbove=true) "Calculates OA damper position required to supply minimum outdoor airflow setpoint at current fan speed" annotation (Placement(transformation(extent={{100,110},{120,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch enaDis + Buildings.Controls.OBC.CDL.Reals.Switch enaDis "Logical switch to enable damper position limit calculation or disable it (set min limit to physical minimum)" annotation (Placement(transformation(extent={{80,-120},{100,-100}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not block" annotation (Placement(transformation(extent={{-20,-80},{0,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch enaDis1 + Buildings.Controls.OBC.CDL.Reals.Switch enaDis1 "Logical switch to enable damper position limit calculation or disable it (set max limit to physical minimum)" annotation (Placement(transformation(extent={{80,-80},{100,-60}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt( @@ -186,14 +186,14 @@ protected annotation (Placement(transformation(extent={{-100,-140},{-80,-120}}))); Buildings.Controls.OBC.CDL.Logical.And3 and3 "Logical and" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch enaDis2 + Buildings.Controls.OBC.CDL.Reals.Switch enaDis2 "Zero minimum damper position when the min OA is near zero" annotation (Placement(transformation(extent={{120,-170},{140,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer( final k=0) "Zero minimum damper position" annotation (Placement(transformation(extent={{80,-200},{100,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold noZerMin( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold noZerMin( final t=floHys, final h=0.5*floHys) "Check if the min OA is greater than zero" annotation (Placement(transformation(extent={{20,-170},{40,-150}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo index b81fabce796..07c8f02ad46 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Modulation.mo @@ -104,7 +104,7 @@ block Modulation "Outdoor and return air damper position modulation sequence for Placement(transformation(extent={{120,-10},{140,10}}), iconTransformation( extent={{100,-20},{140,20}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset uTSup( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset uTSup( final controllerType=controllerType, final k=k, final Ti=Ti, @@ -115,44 +115,44 @@ block Modulation "Outdoor and return air damper position modulation sequence for annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamMinLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamMinLimSig( final k=uMin) "Minimal control loop signal for the outdoor air damper" annotation (Placement(transformation(extent={{-60,-88},{-40,-68}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant retDamMaxLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant retDamMaxLimSig( final k=uMax) "Maximal control loop signal for the return air damper" annotation (Placement(transformation(extent={{-60,-34},{-40,-14}}))); - Buildings.Controls.OBC.CDL.Continuous.Line outDamPos( + Buildings.Controls.OBC.CDL.Reals.Line outDamPos( final limitBelow=true, final limitAbove=true) "Damper position is linearly proportional to the control signal between signal limits" annotation (Placement(transformation(extent={{24,-50},{44,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Line retDamPos( + Buildings.Controls.OBC.CDL.Reals.Line retDamPos( final limitBelow=true, final limitAbove=true) "Damper position is linearly proportional to the control signal between signal limits" annotation (Placement(transformation(extent={{22,-10},{42,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Line HeaCoi( + Buildings.Controls.OBC.CDL.Reals.Line HeaCoi( final limitBelow=true, final limitAbove=true) if have_heaCoi "Heating coil signal is linearly proportional to the control signal between signal limits" annotation (Placement(transformation(extent={{22,30},{42,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaCoiMaxLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaCoiMaxLimSig( final k=1) if have_heaCoi "Maximal control loop signal for the heating coil" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaCoiMinLimSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaCoiMinLimSig( final k=0) if have_heaCoi "Minimum control loop signal for the heating coil" annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant uMaxHeaCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant uMaxHeaCoi( final k=1) "Maximal control loop signal for the heating coil" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch enaDis if have_heaCoi + Buildings.Controls.OBC.CDL.Reals.Switch enaDis if have_heaCoi "Enable or disable the heating coil" annotation (Placement(transformation(extent={{76,30},{96,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant Off( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant Off( final k=0) if have_heaCoi "Off signal for heating coil" annotation (Placement(transformation(extent={{6,-90},{26,-70}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo index c6bf20b634a..6e93381059e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_FreProSta_ZonSta.mo @@ -20,19 +20,19 @@ protected final quantity = "SpecificEnergy")=65100 "Outdoor air enthalpy high limit cutoff"; - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 2) "Outdoor air temperature cutoff" annotation (Placement(transformation(extent={{-40,140},{-20,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutCut( final k=TOutCutoff) "Outdoor temperature high limit cutoff" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutBelowCutoff( final k=hOutCutoff - 1000) "Outdoor air enthalpy is slightly below the cutoff" annotation (Placement(transformation(extent={{-100,100},{-80,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutCut( final k=hOutCutoff) "Outdoor air enthalpy cutoff" annotation (Placement(transformation(extent={{-100,10},{-80,30}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant freProSta( @@ -51,11 +51,11 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.ZoneStates.deadband) "Zone state is deadband" annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMax( final k=0.9) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMin( final k=0.1) "Minimal allowed economizer damper position" annotation (Placement(transformation(extent={{-60,-160},{-40,-140}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo index 2df2cf7d3d5..ff90dd0a008 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Enable_TOut_hOut.mo @@ -14,10 +14,10 @@ model Enable_TOut_hOut "Single zone VAV AHU economizer enable disable sequence" annotation (Placement(transformation(extent={{220,-80},{240,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutCut( final k=TOutCutoff) "Outdoor air temperature cutoff" annotation (Placement(transformation(extent={{-160,40},{-140,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutCut1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutCut1( final k=hOutCutoff) "Outdoor air enthalpy cutoff" annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); Buildings.Controls.OBC.CDL.Logical.TriggeredTrapezoid TOut( @@ -46,17 +46,17 @@ protected "Minimum outdoor air damper position"; final parameter Real outDamPosMax=0.9 "Minimum return air damper position"; - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutCut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutCut( final k=hOutCutoff) "Outdoor air enthalpy cutoff" annotation (Placement(transformation(extent={{-240,0},{-220,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutCut1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutCut1( final k=TOutCutoff) "Outdoor air temperature cutoff" annotation (Placement(transformation(extent={{0,40},{20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutBelowCutoff( final k=hOutCutoff - 1000) "Outdoor air enthalpy is slightly below the cutoff" annotation (Placement(transformation(extent={{-240,40},{-220,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 2) "Outdoor air temperature is slightly below the cutoff" annotation (Placement(transformation(extent={{54,40},{74,60}}))); @@ -64,11 +64,11 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.ZoneStates.deadband) "Zone State is deadband" annotation (Placement(transformation(extent={{-200,-50},{-180,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMaxSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMaxSig( final k=outDamPosMax) "Maximal allowed economizer damper position" annotation (Placement(transformation(extent={{-240,-120},{-220,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMinSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMinSig( final k=outDamPosMin) "Minimal allowed economizer damper position" annotation (Placement(transformation(extent={{-240,-160},{-220,-140}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo index d1766c461af..90fdffa19e7 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_Disable.mo @@ -51,12 +51,12 @@ protected final quantity="VolumeFlowRate")=0.2 "Maximum increase in airflow volume during the example simulation"; - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp SupFanSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp SupFanSpeSig( final duration=1800, final offset=supFanSpe_min, final height=supFanSpe_max - supFanSpe_min) "Supply fan speed signal" annotation (Placement(transformation(extent={{-160,20},{-140,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOutMinSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOutMinSetSig( final duration=1800, final offset=VOutMin_flow, final height=VOutDes_flow - VOutMin_flow) "Constant minimum outdoor airflow setpoint" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo index 0c6240ec9b2..d057788fcef 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Limits_FanSpe_VOut_flow.mo @@ -47,21 +47,21 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "Operation mode - occupied" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOutMinSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOutMinSetSig( final k=VOutSet_flow) "Constant minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{-120,60},{-100,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp SupFanSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp SupFanSpeSig( final duration=1800, final offset=supFanSpe_min, final height=supFanSpe_max - supFanSpe_min) "Supply fan speed signal" annotation (Placement(transformation(extent={{-120,20},{-100,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOutMinSetSig1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOutMinSetSig1( final duration=1800, final offset=VOutMin_flow, final height=VOutDes_flow - VOutMin_flow) "Constant minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{20,60},{40,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant SupFanSpeSig1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant SupFanSpeSig1( final k=fanSpe) "Supply fan speed signal" annotation (Placement(transformation(extent={{20,20},{40,40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo index 03382501204..df36a15f485 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Subsequences/Validation/Modulation_TSup.mo @@ -12,24 +12,24 @@ model Modulation_TSup mod "Economizer modulation sequence" annotation (Placement(transformation(extent={{40,20},{60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSetSig( final k=TSupSet) "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-20,60},{0,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSup( final duration=900, final height=4, final offset=TSupSet - 2) "Measured supply air temperature" annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMin(final k=0.1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMin(final k=0.1) "Minimum outdoor air damper position" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMax(final k=0.9) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMax(final k=0.9) "Maximum outdoor air damper position" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant RetDamPosMin(final k=0.1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant RetDamPosMin(final k=0.1) "Minimum return air damper position" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant RetDamPosMax(final k=0.9) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant RetDamPosMax(final k=0.9) "Maximum return air damper position" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo index 4d0f4773fa6..458b0dad71e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Disable.mo @@ -69,33 +69,33 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-120,-100},{-100,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutBelowCutoff( final k=hOutCutoff - 40000) "Outdoor air enthalpy is below the cutoff" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSetSig( final k=TSupSet) "Heating supply air temperature setpoint" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant freProSta2( final k=Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeProtectionStages.stage2) "Freeze protection stage is 2" annotation (Placement(transformation(extent={{40,-130},{60,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 30) "Outdoor air temperature is below the cutoff" annotation (Placement(transformation(extent={{-120,110},{-100,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSup( final height=4, final offset=TSupSet - 2, final duration=1800) "Supply air temperature" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOutMinSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOutMinSetSig( final duration=1800, final offset=VOutMin_flow, final height=VOutDes_flow - VOutMin_flow) "Minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp SupFanSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp SupFanSpeSig( final duration=1800, final offset=supFanSpe_min, final height=supFanSpe_max - supFanSpe_min) "Supply fan speed signal" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo index 89bdfc4015b..c1a5232c1e5 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Economizers/Validation/Controller_Mod_DamLim.mo @@ -72,31 +72,31 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is Occupied" annotation (Placement(transformation(extent={{-120,-110},{-100,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hOutBelowCutoff( final k=hOutCutoff - 10000) "Outdoor air enthalpy is slightly below the cutoff" annotation (Placement(transformation(extent={{-120,20},{-100,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOutBelowCutoff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOutBelowCutoff( final k=TOutCutoff - 5) "Outdoor air temperature is slightly below the cutoff" annotation (Placement(transformation(extent={{-120,110},{-100,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSetSig( final k=TSupSet) "Heating supply air temperature setpoint" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSig( final k=TSup) "Measured supply air temperature" annotation (Placement(transformation(extent={{-80,80},{-60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSupSig1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSupSig1( final duration=900, final height=2, final offset=TSupSet - 1) "Measured supply air temperature" annotation (Placement(transformation(extent={{40,80},{60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp VOutMinSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp VOutMinSetSig( final duration=1800, final offset=VOutMin_flow, final height=VOutDes_flow - VOutMin_flow) "Minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{-40,80},{-20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp SupFanSpeSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp SupFanSpeSig( final duration=1800, final offset=supFanSpe_min, final height=supFanSpe_max - supFanSpe_min) "Supply fan speed signal" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/CoolingCoil.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/CoolingCoil.mo index f35e408e9da..337ba655fdb 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/CoolingCoil.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/CoolingCoil.mo @@ -46,7 +46,7 @@ block CoolingCoil "Controller for cooling coil valve" annotation (Placement(transformation(extent={{100,-20},{140,20}}), iconTransformation(extent={{100,-20},{140,20}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCoi( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conCoi( final controllerType=controllerTypeCooCoi, final k=kCooCoi, final Ti=TiCooCoi, @@ -63,9 +63,9 @@ protected final k=Buildings.Controls.OBC.ASHRAE.G36.Types.ZoneStates.cooling) "Cooling state value" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch switch "Switch to assign cooling coil control signal" + Buildings.Controls.OBC.CDL.Reals.Switch switch "Switch to assign cooling coil control signal" annotation (Placement(transformation(extent={{72,-10},{92,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant const(k=0) "Cooling off mode" + Buildings.Controls.OBC.CDL.Reals.Sources.Constant const(k=0) "Cooling off mode" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); Buildings.Controls.OBC.CDL.Logical.And and2 "Conditions for cooling state" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/FreezeProtection.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/FreezeProtection.mo index 1fb3d6c1388..4a1fdd07925 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/FreezeProtection.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/FreezeProtection.mo @@ -236,7 +236,7 @@ block FreezeProtection annotation (Placement(transformation(extent={{440,-710},{480,-670}}), iconTransformation(extent={{100,-210},{140,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=273.15 + 4, final h=Thys) if have_frePro "Check if supply air temperature is less than threshold" @@ -253,10 +253,10 @@ block FreezeProtection final k=minHotWatReq) if have_hotWatCoi and have_frePro "Minimum hot-water plant requests" annotation (Placement(transformation(extent={{-20,690},{0,710}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch minVen if have_frePro + Buildings.Controls.OBC.CDL.Reals.Switch minVen if have_frePro "Minimum ventilation when in stage 1 mode" annotation (Placement(transformation(extent={{60,580},{80,600}}))); - Buildings.Controls.OBC.CDL.Continuous.PID heaCoiCon1( + Buildings.Controls.OBC.CDL.Reals.PID heaCoiCon1( final controllerType=heaCoiCon, final k=k, final Ti=Ti, @@ -265,11 +265,11 @@ block FreezeProtection final yMin=yMin) if have_hotWatCoi and have_frePro "Heating coil control in stage 1 mode" annotation (Placement(transformation(extent={{-320,530},{-300,550}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaCoi1 + Buildings.Controls.OBC.CDL.Reals.Switch heaCoi1 if have_hotWatCoi and have_frePro "Heating coil position" annotation (Placement(transformation(extent={{120,510},{140,530}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=273.15 + 7, final h=Thys) if have_frePro "Check if supply air temperature is greater than threshold" @@ -284,7 +284,7 @@ block FreezeProtection Buildings.Controls.OBC.CDL.Logical.Edge endStaOne if have_frePro "Clear the latch to end the stage 1 freeze protection" annotation (Placement(transformation(extent={{-260,442},{-240,462}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr1( final t=273.15 + 3, final h=Thys) if have_frePro "Check if supply air temperature is less than threshold" @@ -298,17 +298,17 @@ block FreezeProtection final falseHoldDuration=0) if have_frePro "Stage in stage 2 freeze protection mode" annotation (Placement(transformation(extent={{-300,352},{-280,372}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch outDam2 if have_frePro + Buildings.Controls.OBC.CDL.Reals.Switch outDam2 if have_frePro "Outdoor air damper position" annotation (Placement(transformation(extent={{120,440},{140,460}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(final k=0.0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(final k=0.0) if have_frePro "Fully closed damper position" annotation (Placement(transformation(extent={{40,460},{60,480}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDam2 if have_frePro + Buildings.Controls.OBC.CDL.Reals.Switch retDam2 if have_frePro "Return air damper position" annotation (Placement(transformation(extent={{120,308},{140,328}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1(final k=1.0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1(final k=1.0) if have_frePro "Fully open damper or valve position" annotation (Placement(transformation(extent={{-80,200},{-60,220}}))); @@ -327,7 +327,7 @@ block FreezeProtection final t=900) if have_frePro "Check if the supply air temperature has been lower than threshold value for sufficient long time" annotation (Placement(transformation(extent={{-300,160},{-280,180}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr2( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr2( final t=273.15 + 1, final h=Thys) if have_frePro "Check if supply air temperature is less than threshold" @@ -342,34 +342,34 @@ block FreezeProtection Buildings.Controls.OBC.CDL.Logical.Latch lat1 if have_frePro "Stay in stage 3 freeze protection mode" annotation (Placement(transformation(extent={{-140,112},{-120,132}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch supFan if not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch supFan if not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Supply fan speed" annotation (Placement(transformation(extent={{160,-150},{180,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retFan if (buiPreCon == + Buildings.Controls.OBC.CDL.Reals.Switch retFan if (buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanMeasuredAir or buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanDp) and not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Return fan speed" annotation (Placement(transformation(extent={{120,-270},{140,-250}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch relFan if (buiPreCon == + Buildings.Controls.OBC.CDL.Reals.Switch relFan if (buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan) and not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Relief fan speed" annotation (Placement(transformation(extent={{120,-390},{140,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con3( final k=0) if have_frePro "Zero constant" annotation (Placement(transformation(extent={{-140,0},{-120,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch outDam if not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch outDam if not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Outdoor air damper" annotation (Placement(transformation(extent={{320,-20},{340,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooCoi if not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch cooCoi if not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Cooling coil position" @@ -382,11 +382,11 @@ block FreezeProtection final k=minHotWatReq) if have_hotWatCoi and have_frePro "Minimum hot-water plant requests" annotation (Placement(transformation(extent={{-140,-642},{-120,-622}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 if have_hotWatCoi and have_frePro "Higher of supply air and mixed air temperature" annotation (Placement(transformation(extent={{-300,-560},{-280,-540}}))); - Buildings.Controls.OBC.CDL.Continuous.PID heaCoiMod( + Buildings.Controls.OBC.CDL.Reals.PID heaCoiMod( final controllerType=heaCoiCon, final k=k, final Ti=Ti, @@ -395,11 +395,11 @@ block FreezeProtection final yMin=yMin) if have_hotWatCoi and have_frePro "Heating coil control when it is in stage 3 mode" annotation (Placement(transformation(extent={{40,-530},{60,-510}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con4( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con4( final k=273.15 + 27) if have_hotWatCoi and have_frePro "Setpoint temperature" annotation (Placement(transformation(extent={{-140,-530},{-120,-510}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaCoiPos if have_hotWatCoi and + Buildings.Controls.OBC.CDL.Reals.Switch heaCoiPos if have_hotWatCoi and not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Heating coil position" @@ -447,12 +447,12 @@ block FreezeProtection Buildings.Controls.OBC.CDL.Logical.FallingEdge falEdg if have_frePro "Switch from stage 2 to stage 1" annotation (Placement(transformation(extent={{-140,620},{-120,640}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch retDam if not freSta == + Buildings.Controls.OBC.CDL.Reals.Switch retDam if not freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Return air damper position" annotation (Placement(transformation(extent={{320,60},{340,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supTemSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supTemSet( final k=273.15+ 6) if have_hotWatCoi and have_frePro "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-380,530},{-360,550}}))); @@ -518,12 +518,12 @@ block FreezeProtection "Disable supply fan when in stage 3" annotation (Placement(transformation(extent={{320,-100},{340,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai4(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai4(final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{320,30},{340,50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" @@ -532,7 +532,7 @@ block FreezeProtection or not have_frePro "Dummy block for enabling and disabling conditional connection" annotation (Placement(transformation(extent={{320,-130},{340,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" @@ -543,7 +543,7 @@ block FreezeProtection or not have_frePro) "Dummy block for enabling and disabling conditional connection" annotation (Placement(transformation(extent={{320,-240},{340,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3(final k=1) if ( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3(final k=1) if ( buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanMeasuredAir or buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanDp) and freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment @@ -555,18 +555,18 @@ block FreezeProtection or not have_frePro) "Dummy block for enabling and disabling conditional connection" annotation (Placement(transformation(extent={{320,-360},{340,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai5(final k=1) if ( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai5(final k=1) if ( buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan) and freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{120,-420},{140,-400}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai6(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai6(final k=1) if freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment and have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{120,-500},{140,-480}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai7(final k=1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai7(final k=1) if have_hotWatCoi and (freSta == Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.Hardwired_to_equipment or not have_frePro) "Dummy block for enabling and disabling the conditional connection" @@ -580,30 +580,30 @@ block FreezeProtection CDL.Integers.Sources.Constant conInt10(final k=0) if not have_frePro "Dummy constant" annotation (Placement(transformation(extent={{380,-680},{400,-660}}))); - CDL.Continuous.MultiplyByParameter gai8(final k=1) + CDL.Reals.MultiplyByParameter gai8(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-300,-80},{-280,-60}}))); - CDL.Continuous.MultiplyByParameter gai9(final k=1) + CDL.Reals.MultiplyByParameter gai9(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-300,-130},{-280,-110}}))); - CDL.Continuous.MultiplyByParameter gai10(final k=1) + CDL.Reals.MultiplyByParameter gai10(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-300,-190},{-280,-170}}))); - CDL.Continuous.MultiplyByParameter gai11(final k=1) + CDL.Reals.MultiplyByParameter gai11(final k=1) if (buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanMeasuredAir or buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReturnFanDp) and not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-300,-310},{-280,-290}}))); - CDL.Continuous.MultiplyByParameter gai12(final k=1) + CDL.Reals.MultiplyByParameter gai12(final k=1) if (buiPreCon == Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.ReliefFan) and not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-300,-440},{-280,-420}}))); - CDL.Continuous.MultiplyByParameter gai13(final k=1) + CDL.Reals.MultiplyByParameter gai13(final k=1) if not have_frePro "Dummy block for enabling and disabling the conditional connection" annotation (Placement(transformation(extent={{-300,-510},{-280,-490}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/PlantRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/PlantRequests.mo index 685d8e1c2fc..350dbeb95ed 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/PlantRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/PlantRequests.mo @@ -65,15 +65,15 @@ block PlantRequests iconTransformation(extent={{100,-100},{140,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Subtract cooSupTemDif + Buildings.Controls.OBC.CDL.Reals.Subtract cooSupTemDif "Find the cooling supply temperature difference to the setpoint" annotation (Placement(transformation(extent={{-160,190},{-140,210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=3, final h=Thys) "Check if the supply temperature is greater than the setpoint by a threshold value" annotation (Placement(transformation(extent={{-80,190},{-60,210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=2, final h=Thys) "Check if the supply temperature is greater than the setpoint by a threshold value" @@ -86,7 +86,7 @@ protected final delayTime=120) "Check if the input has been true for a certain time" annotation (Placement(transformation(extent={{-40,140},{-20,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=0.95, final h=posHys) "Check if the chilled water valve position is greater than a threshold value" @@ -104,7 +104,7 @@ protected final k=2) "Constant 2" annotation (Placement(transformation(extent={{0,170},{20,190}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.85, final h=posHys) "Check if the chilled water valve position is less than a threshold value" @@ -124,7 +124,7 @@ protected Buildings.Controls.OBC.CDL.Logical.Latch lat1 "Keep true signal until other condition becomes true" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr1( final t=0.1, final h=posHys) "Check if the chilled water valve position is less than a threshold value" @@ -132,16 +132,16 @@ protected Buildings.Controls.OBC.CDL.Integers.Switch intSwi3 "Send 1 chiller plant request" annotation (Placement(transformation(extent={{80,10},{100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract heaSupTemDif if have_hotWatCoi + Buildings.Controls.OBC.CDL.Reals.Subtract heaSupTemDif if have_hotWatCoi "Find the heating supply temperature difference to the setpoint" annotation (Placement(transformation(extent={{-140,-50},{-120,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=17, final h=Thys) if have_hotWatCoi "Check if the supply temperature is less than the setpoint by a threshold value" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=8, final h=Thys) if have_hotWatCoi @@ -161,13 +161,13 @@ protected Buildings.Controls.OBC.CDL.Integers.Switch hotWatRes2 if have_hotWatCoi "Send 2 hot water reset request" annotation (Placement(transformation(extent={{120,-100},{140,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr2( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr2( final t=0.85, final h=posHys) if have_hotWatCoi "Check if the hot water valve position is less than a threshold value" annotation (Placement(transformation(extent={{-120,-190},{-100,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=0.95, final h=posHys) if have_hotWatCoi @@ -179,7 +179,7 @@ protected Buildings.Controls.OBC.CDL.Integers.Switch hotWatRes1 if have_hotWatCoi "Send 1 hot water reset request" annotation (Placement(transformation(extent={{80,-150},{100,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr3( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr3( final t=0.1, final h=posHys) if have_hotWatCoi diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefDamper.mo index 86b31d10d9b..b5d04549443 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefDamper.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefDamper.mo @@ -37,7 +37,7 @@ block ReliefDamper iconTransformation(extent={{100,-20},{140,20}}))); protected - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.05, final h=posHys) "Check if the outdoor damper is open" @@ -45,25 +45,25 @@ protected Buildings.Controls.OBC.CDL.Logical.And and2 "Check if the relief damper should be open" annotation (Placement(transformation(extent={{-20,-50},{0,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Check if relief damper should be enabled" annotation (Placement(transformation(extent={{80,-50},{100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerDam( final k=0) "Close damper when disabled" annotation (Placement(transformation(extent={{-20,-110},{0,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minRel( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minRel( final k=relDam_min) "Minimum relief damper position" annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxRel( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxRel( final k=relDam_max) "Maximum relief damper position" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant fulOpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant fulOpe( final k=1) "Fully open relief damper" annotation (Placement(transformation(extent={{-100,10},{-80,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Line relDam( + Buildings.Controls.OBC.CDL.Reals.Line relDam( final limitBelow=true, final limitAbove=true) "Relief damper signal is linearly proportional to the control signal between signal limits" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFan.mo index c64d20c0b52..d9b85153060 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFan.mo @@ -54,33 +54,33 @@ block ReliefFan "Sequence for control of relief fan in AHU" annotation (Placement(transformation(extent={{220,-120},{260,-80}}), iconTransformation(extent={{100,-100},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MovingAverage movMea( + Buildings.Controls.OBC.CDL.Reals.MovingAverage movMea( final delta=300) "Average building static pressure measurement" annotation (Placement(transformation(extent={{-220,130},{-200,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dpBuiSetPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpBuiSetPoi( final k=dpBuiSet) "Building pressure setpoint" annotation (Placement(transformation(extent={{-220,70},{-200,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div1 + Buildings.Controls.OBC.CDL.Reals.Divide div1 "Normalized the control error" annotation (Placement(transformation(extent={{-180,100},{-160,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-180,160},{-160,180}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conP( + Buildings.Controls.OBC.CDL.Reals.PID conP( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P, final k=k, final reverseActing=false) "Building static pressure controller" annotation (Placement(transformation(extent={{-140,160},{-120,180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.05, final h=hys) "Check if the controller output is greater than threshold" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.005, final h=hys) "Check if the controller output is near zero" @@ -95,7 +95,7 @@ block ReliefFan "Sequence for control of relief fan in AHU" Buildings.Controls.OBC.CDL.Logical.Latch lat "Enable damper" annotation (Placement(transformation(extent={{40,30},{60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=relFanSpe_min + 0.15, final h=hys) "Check if the controller output is greater than minimum speed plus threshold" @@ -104,7 +104,7 @@ block ReliefFan "Sequence for control of relief fan in AHU" final t=420) "Check if the controller output has been greater than threshold for sufficient long time" annotation (Placement(transformation(extent={{-40,-110},{-20,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr3( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr3( final t=relFanSpe_min, final h=hys) "Check if the controller output is less than minimum speed" @@ -125,7 +125,7 @@ block ReliefFan "Sequence for control of relief fan in AHU" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea2 "Convert boolean to real" annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1 "Relief fan speed" + Buildings.Controls.OBC.CDL.Reals.Multiply pro1 "Relief fan speed" annotation (Placement(transformation(extent={{160,-50},{180,-30}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean to real" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFanGroup.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFanGroup.mo index f29bfdce256..0d59d6a3644 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFanGroup.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReliefFanGroup.mo @@ -70,25 +70,25 @@ block ReliefFanGroup annotation (Placement(transformation(extent={{500,60},{540,100}}), iconTransformation(extent={{100,-80},{140,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MatrixGain enaRel( + Buildings.Controls.OBC.CDL.Reals.MatrixGain enaRel( final K=relFanMat) "Vector of relief fans with the enabled one denoted by 1" annotation (Placement(transformation(extent={{-460,340},{-440,360}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nSupFan] "Convert boolean to real" annotation (Placement(transformation(extent={{-500,340},{-480,360}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai[nRelFan]( final k=staVec) "Vector of enabling fan, along with its staging order" annotation (Placement(transformation(extent={{-420,340},{-400,360}}))); - Buildings.Controls.OBC.CDL.Continuous.MovingAverage movMea( + Buildings.Controls.OBC.CDL.Reals.MovingAverage movMea( final delta=300) "Average building static pressure measurement" annotation (Placement(transformation(extent={{-500,240},{-480,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div1 + Buildings.Controls.OBC.CDL.Reals.Divide div1 "Normalized the control error" annotation (Placement(transformation(extent={{-400,200},{-380,220}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conP( + Buildings.Controls.OBC.CDL.Reals.PID conP( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P, final k=k, final reverseActing=false) @@ -101,10 +101,10 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean to real" annotation (Placement(transformation(extent={{-460,300},{-440,320}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Set controller output to zero when the relief system is disabled" annotation (Placement(transformation(extent={{140,294},{160,314}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.05, final h=hys) "Check if the controller output is greater than threshold" @@ -114,7 +114,7 @@ block ReliefFanGroup annotation (Placement(transformation(extent={{-260,140},{-240,160}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Enable damper" annotation (Placement(transformation(extent={{-220,140},{-200,160}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.005, final h=hys) "Check if the controller output is near zero" @@ -127,14 +127,14 @@ block ReliefFanGroup final nout=nRelFan) "Boolean replicator" annotation (Placement(transformation(extent={{-160,140},{-140,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1[nRelFan]( final t=fill(0.5, nRelFan)) "Check if a relief fan should be enabled" annotation (Placement(transformation(extent={{-160,170},{-140,190}}))); Buildings.Controls.OBC.CDL.Logical.And enaDam[nRelFan] "Enable damper" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=relFanSpe_min + 0.15, final h=hys) "Check if the controller output is greater than minimum speed plus threshold" @@ -150,37 +150,37 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea2[nRelFan] "Convert boolean to real" annotation (Placement(transformation(extent={{-460,-16},{-440,4}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Subtract sub2[nRelFan] "Identify relief fans that have been enabled but not yet operating" annotation (Placement(transformation(extent={{-400,-10},{-380,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply pro1[nRelFan] "List of standby fans, along with their staging order" annotation (Placement(transformation(extent={{-320,10},{-300,30}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMin mulMin(nin=nRelFan) + Buildings.Controls.OBC.CDL.Reals.MultiMin mulMin(nin=nRelFan) "Identify current order of staging" annotation (Placement(transformation(extent={{-120,-70},{-100,-50}}))); Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaRep( final nout=nRelFan) "Replicate real number" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Subtract sub1[nRelFan] "Identify next operating fan" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr1[nRelFan]( final t=fill(0.5, nRelFan)) "Check if the input is less than threshold" annotation (Placement(transformation(extent={{-260,-20},{-240,0}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar[nRelFan]( final p=fill(nRelFan + 1, nRelFan)) "Add value to the input" annotation (Placement(transformation(extent={{-260,10},{-240,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Switch swi[nRelFan] "Switch input values" annotation (Placement(transformation(extent={{-220,-20},{-200,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Abs abs1[nRelFan] "Find absolute value" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr2[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr2[nRelFan]( final t=fill(0.5, nRelFan)) "Identify next operating fan" annotation (Placement(transformation(extent={{40,10},{60,30}}))); @@ -190,7 +190,7 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Logical.Latch lat2 "Stage up next relief fan" annotation (Placement(transformation(extent={{240,-80},{260,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr3( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr3( final t=relFanSpe_min, final h=hys) "Check if the controller output is less than minimum speed" @@ -203,30 +203,30 @@ block ReliefFanGroup final pre_u_start=true) "Break algebraic loop" annotation (Placement(transformation(extent={{0,-338},{20,-318}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro2[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply pro2[nRelFan] "List of operating fans, along with their staging order" annotation (Placement(transformation(extent={{-320,-220},{-300,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1[nRelFan]( final p=fill(nRelFan + 1, nRelFan)) "Add value to the input" annotation (Placement(transformation(extent={{-260,-220},{-240,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr4[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr4[nRelFan]( final t=fill(0.5, nRelFan)) "Check if the input is less than threshold" annotation (Placement(transformation(extent={{-260,-250},{-240,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Switch swi1[nRelFan] "Switch input values" annotation (Placement(transformation(extent={{-220,-250},{-200,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMin mulMin1( + Buildings.Controls.OBC.CDL.Reals.MultiMin mulMin1( final nin=nRelFan) "Minimum staging order of the running relief fans" annotation (Placement(transformation(extent={{-140,-250},{-120,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Subtract sub3[nRelFan] "Identify next operating fan" annotation (Placement(transformation(extent={{-40,-220},{-20,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs2[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Abs abs2[nRelFan] "Find absolute value" annotation (Placement(transformation(extent={{0,-220},{20,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr5[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr5[nRelFan]( final t=fill(0.5, nRelFan)) "Identify next fan to be off" annotation (Placement(transformation(extent={{40,-220},{60,-200}}))); @@ -280,7 +280,7 @@ block ReliefFanGroup Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea3[nRelFan] "Convert boolean to real" annotation (Placement(transformation(extent={{400,-80},{420,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Limiter lim( + Buildings.Controls.OBC.CDL.Reals.Limiter lim( final uMax=1, final uMin=relFanSpe_min) "Limit the controller output" @@ -289,25 +289,25 @@ block ReliefFanGroup final nout=nRelFan) "Replicate real input" annotation (Placement(transformation(extent={{400,226},{420,246}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro3[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply pro3[nRelFan] "Relief fan speed" annotation (Placement(transformation(extent={{460,220},{480,240}}))); Buildings.Controls.OBC.CDL.Logical.Switch logSwi2[nRelFan] "Vector of relief fan status after staging up" annotation (Placement(transformation(extent={{400,130},{420,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant dpBuiSetPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpBuiSetPoi( final k=dpBuiSet) "Building pressure setpoint" annotation (Placement(transformation(extent={{-460,170},{-440,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-420,270},{-400,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0) "Zero fan speed when it is in stage 0" annotation (Placement(transformation(extent={{180,200},{200,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Switch input values" annotation (Placement(transformation(extent={{360,226},{380,246}}))); Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(nin=nRelFan) @@ -344,17 +344,17 @@ block ReliefFanGroup final realFalse=fill(1, nRelFan)) "Convert boolean to real" annotation (Placement(transformation(extent={{-260,60},{-240,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Multiply mul[nRelFan] "Product of inputs" annotation (Placement(transformation(extent={{460,70},{480,90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3[nRelFan]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3[nRelFan]( final t=fill(0.5, nRelFan)) "Check if the relief fan is enabled" annotation (Placement(transformation(extent={{-40,226},{-20,246}}))); Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd1( final nin=nRelFan) "Check if all the fans are proven off" annotation (Placement(transformation(extent={{-320,-70},{-300,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3[nRelFan] + Buildings.Controls.OBC.CDL.Reals.Switch swi3[nRelFan] "Switch input values" annotation (Placement(transformation(extent={{-160,-70},{-140,-50}}))); Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booRep4( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReturnFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReturnFan.mo index e301805789d..3a0d778710a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReturnFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/ReturnFan.mo @@ -32,13 +32,13 @@ block ReturnFan "Return fan control for single zone AHU" annotation (Placement(transformation(extent={{100,-80},{140,-40}}), iconTransformation(extent={{100,-80},{140,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=speDif) "Adjusted return fan speed" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi "Return fan speed" + Buildings.Controls.OBC.CDL.Reals.Switch swi "Return fan speed" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0) "Zero speed" annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Supply.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Supply.mo index 4ccc275b877..ae67685bc1f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Supply.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Supply.mo @@ -182,147 +182,147 @@ block Supply "Supply air set point for single zone VAV system" iconTransformation(extent={{100,-80},{140,-40}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant fanOff( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant fanOff( final k=0) "Fan off status" annotation (Placement(transformation(extent={{40,350},{60,370}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch fanSpe "Supply fan speed" + Buildings.Controls.OBC.CDL.Reals.Switch fanSpe "Supply fan speed" annotation (Placement(transformation(extent={{100,330},{120,350}}))); - Buildings.Controls.OBC.CDL.Continuous.LimitSlewRate ramLim( + Buildings.Controls.OBC.CDL.Reals.LimitSlewRate ramLim( final raisingSlewRate=1/600, final Td=60) "Prevent changes in fan speed of more than 10% per minute" annotation (Placement(transformation(extent={{140,330},{160,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxDewPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxDewPoi( final k=TSupDew_max) "Maximum supply air dew-point temperature" annotation (Placement(transformation(extent={{-160,270},{-140,290}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-1) "Maximum supply dewpoint temperature minus threshold" annotation (Placement(transformation(extent={{-100,270},{-80,290}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=-6) "Zone temperature minus threshold" annotation (Placement(transformation(extent={{-100,230},{-80,250}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=0.5) "Zone temperature plus threshold" annotation (Placement(transformation(extent={{-100,190},{-80,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Min endPoiTwo + Buildings.Controls.OBC.CDL.Reals.Min endPoiTwo "End point two for specifying medium fan speed" annotation (Placement(transformation(extent={{-40,250},{-20,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Min endPoiOne + Buildings.Controls.OBC.CDL.Reals.Min endPoiOne "End point one for specifying medium fan speed" annotation (Placement(transformation(extent={{-40,170},{-20,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minFanSpe( final k=minSpe) "Minimum fan speed" annotation (Placement(transformation(extent={{20,120},{40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxCooFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxCooFanSpe( final k=maxCooSpe) "Maximum fan speed for cooling" annotation (Placement(transformation(extent={{-40,120},{-20,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Line medFanSpe + Buildings.Controls.OBC.CDL.Reals.Line medFanSpe "Medium fan speed" annotation (Placement(transformation(extent={{80,210},{100,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Average aveZonSet + Buildings.Controls.OBC.CDL.Reals.Average aveZonSet "Average of the zone heating and cooling setpoint" annotation (Placement(transformation(extent={{-120,-130},{-100,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Limiter lim( + Buildings.Controls.OBC.CDL.Reals.Limiter lim( final uMax=TSupDea_max, final uMin=TSupDea_min) "Limiter that outputs the dead band value for the supply air temperature" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one( final k=1) "Constant one" annotation (Placement(transformation(extent={{-120,-100},{-100,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Line heaFanSpe + Buildings.Controls.OBC.CDL.Reals.Line heaFanSpe "Fan speed when it is in heating state" annotation (Placement(transformation(extent={{60,80},{80,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant speOnePoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant speOnePoi( final k=spePoiOne) "Speed control point one in x-axis of control map" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxHeaFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxHeaFanSpe( final k=maxHeaSpe) "Maximum fan speed for heating" annotation (Placement(transformation(extent={{-120,120},{-100,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant speTwoPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant speTwoPoi( final k=spePoiTwo) "Speed control point two in x-axis of control map" annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant speThrPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant speThrPoi( final k=spePoiThr) "Speed control point three in x-axis of control map" annotation (Placement(transformation(extent={{-120,0},{-100,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant speFouPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant speFouPoi( final k=spePoiFou) "Speed control point four in x-axis of control map" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Line cooFanSpe1 + Buildings.Controls.OBC.CDL.Reals.Line cooFanSpe1 "Fan speed when it is in cooling state" annotation (Placement(transformation(extent={{60,20},{80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Line cooFanSpe2 + Buildings.Controls.OBC.CDL.Reals.Line cooFanSpe2 "Fan speed when it is in cooling mode" annotation (Placement(transformation(extent={{60,-70},{80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Max spe + Buildings.Controls.OBC.CDL.Reals.Max spe "Fan speed" annotation (Placement(transformation(extent={{140,60},{160,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Line heaSupTem + Buildings.Controls.OBC.CDL.Reals.Line heaSupTem "Supply air temperature when it is in heating state" annotation (Placement(transformation(extent={{60,-160},{80,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant temOnePoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant temOnePoi( final k=temPoiOne) "Temperature control point one in x-axis of control map" annotation (Placement(transformation(extent={{-120,-190},{-100,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxSupTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxSupTem( final k=TSup_max) "Highest heating supply air temperature" annotation (Placement(transformation(extent={{-40,-190},{-20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant temTwoPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant temTwoPoi( final k=temPoiTwo) "Temperature control point two in x-axis of control map" annotation (Placement(transformation(extent={{-120,-270},{-100,-250}}))); - Buildings.Controls.OBC.CDL.Continuous.Line cooSupTem + Buildings.Controls.OBC.CDL.Reals.Line cooSupTem "Supply air temperature when it is in cooling state" annotation (Placement(transformation(extent={{60,-250},{80,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant supCooTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant supCooTem( final k=TSup_min) "Cooling supply air temperature" annotation (Placement(transformation(extent={{-120,-310},{-100,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar3( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar3( final p=-1) "Minimum cooling supply temperature minus threshold" annotation (Placement(transformation(extent={{-40,-280},{-20,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Line cooSupTem1 + Buildings.Controls.OBC.CDL.Reals.Line cooSupTem1 "Supply air temperature when it is in cooling state" annotation (Placement(transformation(extent={{60,-340},{80,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant temThrPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant temThrPoi( final k=temPoiThr) "Temperature control point three in x-axis of control map" annotation (Placement(transformation(extent={{-40,-320},{-20,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant temFouPoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant temFouPoi( final k=temPoiFou) "Temperature control point four in x-axis of control map" annotation (Placement(transformation(extent={{-120,-370},{-100,-350}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooFan + Buildings.Controls.OBC.CDL.Reals.Switch cooFan "Fan speed when it is in cooling state" annotation (Placement(transformation(extent={{100,-20},{120,0}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold heaSta( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold heaSta( final t=looHys, final h=0.8*looHys) "Check if it is in heating state" annotation (Placement(transformation(extent={{-40,-230},{-20,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch supTemSet + Buildings.Controls.OBC.CDL.Reals.Switch supTemSet "Supply temperature setpoint" annotation (Placement(transformation(extent={{120,-210},{140,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch supTemSet1 + Buildings.Controls.OBC.CDL.Reals.Switch supTemSet1 "Supply temperature setpoint" annotation (Placement(transformation(extent={{120,-290},{140,-270}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant unoMod( @@ -335,7 +335,7 @@ protected Buildings.Controls.OBC.CDL.Logical.Not not1 "Supply fan status" annotation (Placement(transformation(extent={{40,290},{60,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=spePoiFou - spePoiThr) "Check setpoint section" annotation (Placement(transformation(extent={{20,-20},{40,0}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/CoolingCoil.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/CoolingCoil.mo index 7d708ca5bfb..0c42293abb0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/CoolingCoil.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/CoolingCoil.mo @@ -9,12 +9,12 @@ model CoolingCoil "Validation of cooling coil model" final controllerTypeCooCoi=Buildings.Controls.OBC.CDL.Types.SimpleController.P, final kCooCoi=1) "Cooling coil controller" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSup( final height=4, final offset=TSupSet - 2, final duration=3600*8) "Measured supply air temperature" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSetSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSetSig( final k=TSupSet) "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); @@ -22,7 +22,7 @@ model CoolingCoil "Validation of cooling coil model" final k=true) "Fan is on" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse zonSta( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse zonSta( final offset=2, final period=3600*2) "Zone state" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection.mo index cbcf876142f..39274fa0f64 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection.mo @@ -8,21 +8,21 @@ model FreezeProtection "Freeze protection control" annotation (Placement(transformation(extent={{80,0},{100,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos( final height=0.5, final offset=0.1, final duration=3600) "Outdoor air damper position" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant outDamPosMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant outDamPosMin( final k=0.1) "Outdoor air damper minimum position" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaCoiPos( final height=0.49, final offset=0.5, final duration=3000) "Heating coil position" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp retDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp retDamPos( final height=0.2, final offset=0.7, final duration=3600) "Return air damper position" @@ -35,27 +35,27 @@ model FreezeProtection Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe( final height=0.2, final offset=0.5, final duration=3600) "Supply fan speed" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoiPos( final height=0.2, final offset=0.5, final duration=3600) "Cooling coil position" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTem( final height=-4, final offset=273.15 + 6, final duration=3600) "Supply air temperature" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp mixTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp mixTem( final height=-5, final offset=273.15 + 8, final duration=3600) "Mixed air temperature" annotation (Placement(transformation(extent={{-40,-110},{-20,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.05) "Supply fan command on" annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo index 5213a1742d7..618a5024334 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/FreezeProtection_Disable.mo @@ -8,32 +8,32 @@ model FreezeProtection_Disable "Freeze protection control" annotation (Placement(transformation(extent={{80,0},{100,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamPos( final height=0.5, final offset=0.1, final duration=3600) "Outdoor air damper position" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaCoiPos( final height=0.46, final offset=0.5, final duration=3600) "Heating coil position" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp retDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp retDamPos( final height=0.2, final offset=0.7, final duration=3600) "Return air damper position" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe( final height=0.2, final offset=0.5, final duration=3600) "Supply fan speed" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoiPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoiPos( final height=0.2, final offset=0.5, final duration=3600) "Cooling coil position" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final h=0.01) "Check if the supply fan is proven on" annotation (Placement(transformation(extent={{0,-56},{20,-36}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo index a506cebb4c0..25a153f6333 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ModeAndSetPoints.mo @@ -11,10 +11,10 @@ model ModeAndSetPoints ignDemLim=false) "Operating mode and temperature setpoints" annotation (Placement(transformation(extent={{80,40},{100,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin cooSetAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin cooSetAdj( final freqHz=1/28800) "Cooling setpoint adjustment" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin heaSetAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin heaSetAdj( final freqHz=1/28800, final amplitude=0.5) "Heating setpoint adjustment" @@ -37,54 +37,54 @@ model ModeAndSetPoints final width=0.95) "Generate signal indicating occupancy status" annotation (Placement(transformation(extent={{-80,-130},{-60,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerAdj( final k=0) "Zero adjustment" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Switch to zero adjustment when window is open" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Switch to zero adjustment when window is open" annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooDowTim( final k=1800) "Cooling down time" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant warUpTim( final k=1800) "Warm-up time" annotation (Placement(transformation(extent={{-80,130},{-60,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( final offset=0, final height=6.2831852, final duration=24*3600) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-120,100},{-100,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin2 + Buildings.Controls.OBC.CDL.Reals.Sin sin2 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=12.5) "Gain factor" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem( + Buildings.Controls.OBC.CDL.Reals.AddParameter zonTem( final p=273.15 + 22.5) "Current zone temperature" annotation (Placement(transformation(extent={{0,100},{20,120}}))); Buildings.Controls.SetPoints.OccupancySchedule occSch "Occupancy schedule" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSetOcc( final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSetOcc( final k=297.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSetUno( final k=285.15) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSetUno( final k=303.15) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); Buildings.Controls.OBC.CDL.Logical.Not winOpe "Window is open" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/PlantRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/PlantRequests.mo index 70fa70f13b0..0b6cb49fd7e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/PlantRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/PlantRequests.mo @@ -9,42 +9,42 @@ model PlantRequests final have_hotWatCoi=false) "Calculate plant request" annotation (Placement(transformation(extent={{60,-80},{80,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTem( final height=8, final offset=273.15 + 15, final duration=3600) "Supply air temperature" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTemSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTemSet( final height=6, final offset=273.15 + 14.5, final duration=3600) "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoi( final height=-0.3, final offset=0.96, final duration=3600, startTime=1000) "Cooling coil position" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaCoi( final height=-0.3, final offset=0.96, final duration=3600, startTime=1000) "Heating coil position" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTem1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTem1( final height=8, final offset=273.15 + 12, final duration=3600) "Cooling supply air temperature" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTemSet1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTemSet1( final height=15, final offset=273.15 + 20, final duration=3600) "Supply air temperature setpoint" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooCoi1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooCoi1( final k=0) "Cooling coil position" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supTem2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supTem2( final height=7, final offset=273.15 + 13, final duration=3600) "Supply air temperature" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefDamper.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefDamper.mo index aab1b549732..9ed4d716f9c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefDamper.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefDamper.mo @@ -4,7 +4,7 @@ model ReliefDamper "Validation of relief damper control" Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.ReliefDamper relDam(final relDam_min=0.1, final relDam_max=0.6) "Relief damper controller" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDamMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDamMin( final height=0.1, final offset=0.1, final duration=3600) @@ -14,7 +14,7 @@ model ReliefDamper "Validation of relief damper control" final period=3600) "Supply fan status" annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDam( final height=0.6, final offset=0.2, final duration=3600) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFan.mo index 4c7a8c529bb..ac4c28763b2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFan.mo @@ -16,12 +16,12 @@ model ReliefFan "Validate model for controlling relief fan" final period=3600) "Supply fan status" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui1( final height=-15, final offset=20, final duration=1800, @@ -32,7 +32,7 @@ model ReliefFan "Validate model for controlling relief fan" final k=true) "Supply fan status" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui2( final height=3, final offset=11, final duration=1800) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFanGroup.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFanGroup.mo index 58b0e91ab73..9503003f1dd 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFanGroup.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReliefFanGroup.mo @@ -17,7 +17,7 @@ model ReliefFanGroup final period=4000) "Supply fan status" annotation (Placement(transformation(extent={{-120,130},{-100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui( final height=40, final offset=0, final duration=1800) "Building static presure" @@ -27,13 +27,13 @@ model ReliefFanGroup final period=4000, shift=600) "Supply fan status" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr[4]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr[4]( final t=fill(0.01, 4)) "Check if the relief fan is proven on" annotation (Placement(transformation(extent={{60,100},{80,120}}))); Buildings.Controls.OBC.CDL.Logical.Pre pre[4] "Return relief fan status" annotation (Placement(transformation(extent={{100,100},{120,120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1[4]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1[4]( final t=fill(0.01, 4)) "Check if the relief fan is proven on" annotation (Placement(transformation(extent={{60,0},{80,20}}))); @@ -55,7 +55,7 @@ model ReliefFanGroup final samplePeriod=fill(20, 4)) "Zero order hold" annotation (Placement(transformation(extent={{30,0},{50,20}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2[4]( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2[4]( final t=fill(0.01, 4)) "Check if the relief fan is proven on" annotation (Placement(transformation(extent={{60,-120},{80,-100}}))); @@ -65,7 +65,7 @@ model ReliefFanGroup final samplePeriod=fill(20, 4)) "Zero order hold" annotation (Placement(transformation(extent={{30,-120},{50,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp dpBui1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpBui1( final height=-15, final offset=20, final duration=1800, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReturnFan.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReturnFan.mo index 4a1ed38838f..35f49c1b613 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReturnFan.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/ReturnFan.mo @@ -4,7 +4,7 @@ model ReturnFan "Validation of return fan control" Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.ReturnFan retFan "Cooling coil controller" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supFanSpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supFanSpe( final height=0.7, final offset=0.2, final duration=3600) "Supply fan speed" @@ -13,7 +13,7 @@ model ReturnFan "Validation of return fan control" final period=3600) "Supply fan status" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Fan speed should be zero when it is disabled" annotation (Placement(transformation(extent={{20,0},{40,20}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_T.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_T.mo index 506e7aa8a5e..32c1d3f8c09 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_T.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_T.mo @@ -13,24 +13,24 @@ model Supply_T "Block that computes the setpoints for temperature and fan speed" annotation (Placement(transformation(extent={{60,-20},{80,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant uHea(k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant uHea(k=0) "Heating control signal" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant uCoo(k=0.6) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant uCoo(k=0.6) "Cooling control signal" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TOut( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TOut( final duration=3600, final height=18, final offset=273.15 + 10) "Outdoor air temperature" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract dT + Buildings.Controls.OBC.CDL.Reals.Subtract dT "Difference zone minus outdoor temperature" annotation (Placement(transformation(extent={{60,-60},{80,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSet( final k=273.15 + 24) "Zone cooling set point" annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); @@ -38,7 +38,7 @@ model Supply_T final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is occupied" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSet( final k=273.15 + 20) "Zone heating set point" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_u.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_u.mo index a2afaec5271..6f81a518096 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_u.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Validation/Supply_u.mo @@ -34,24 +34,24 @@ model Supply_u "Validation model for temperature and fan speed" "Block that computes the setpoints for temperature and fan speed" annotation (Placement(transformation(extent={{60,-40},{80,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 28) "Zone air temperature" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOut( final k=273.15 + 22) "Outdoor temperature" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final duration=900, final height=-1, final offset=1) "Heating control signal" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo(final duration=900, + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo(final duration=900, final startTime=2700) "Cooling control signal" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon1( final k=273.15 + 23) "Zone air temperature" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); @@ -59,11 +59,11 @@ model Supply_u "Validation model for temperature and fan speed" final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "AHU operation mode is occupied" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSet(final k=273.15 + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSet(final k=273.15 + 22) "Zone heating set point" annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSet( final k=273.15 + 24) "Zone cooling set point" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Validation/Controller.mo index 3a839b77963..0e65951389c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/Validation/Controller.mo @@ -26,7 +26,7 @@ model Controller "Validation of the top-level controller" final relDam_max=0.6) "Validate the cooling case" annotation (Placement(transformation(extent={{20,0},{60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TZon( final duration=86400, final height=6, final offset=273.15 + 16) @@ -36,23 +36,23 @@ model Controller "Validation of the top-level controller" final occupancy=3600*{4,20}) "Occupancy schedule" annotation (Placement(transformation(extent={{-140,130},{-120,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TOut( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TOut( final k=273.15 +17) "Outdoor air dry bulb temperature" annotation (Placement(transformation(extent={{-180,190},{-160,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooDowTim( final k=1800) "Cooling down time" annotation (Placement(transformation(extent={{-140,170},{-120,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant warUpTim( final k=1800) "Warm-up time" annotation (Placement(transformation(extent={{-180,150},{-160,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin cooSetAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin cooSetAdj( final freqHz=1/28800) "Cooling setpoint adjustment" annotation (Placement(transformation(extent={{-150,-30},{-130,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin heaSetAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin heaSetAdj( final freqHz=1/28800, final amplitude=0.5) "Heating setpoint adjustment" @@ -62,14 +62,14 @@ model Controller "Validation of the top-level controller" final shift=1200) "Generate signal indicating window status" annotation (Placement(transformation(extent={{-180,-10},{-160,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerAdj( final k=0) "Zero adjustment" annotation (Placement(transformation(extent={{-150,10},{-130,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Switch to zero adjustment when window is open" annotation (Placement(transformation(extent={{-70,-56},{-50,-36}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Switch to zero adjustment when window is open" annotation (Placement(transformation(extent={{-70,-26},{-50,-6}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse occSta( @@ -89,47 +89,47 @@ model Controller "Validation of the top-level controller" Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-80,-130},{-60,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp mixTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp mixTem( final height=-5, final offset=273.15 + 8, final duration=3600) "Mixed air temperature" annotation (Placement(transformation(extent={{-140,-150},{-120,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp outDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp outDam( final height=0.6, final offset=0.2, final duration=86400) "Outdoor damper position" annotation (Placement(transformation(extent={{-180,-170},{-160,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooCoi( final height=-0.3, final offset=0.96, final duration=86400, startTime=1000) "Cooling coil position" annotation (Placement(transformation(extent={{-140,-190},{-120,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaCoi( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaCoi( final k=0) "Heating coil position" annotation (Placement(transformation(extent={{-180,-210},{-160,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSup( final height=2, final duration=86400, final offset=273.15 + 22.5) "Terminal unit discharge air temperature" annotation (Placement(transformation(extent={{-140,-110},{-120,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSetOcc( final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-140,90},{-120,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSetOcc( final k=297.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-180,70},{-160,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSetUno( final k=285.15) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-140,50},{-120,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSetUno( final k=303.15) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-180,30},{-160,50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Generic/AirEconomizerHighLimits.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/AirEconomizerHighLimits.mo index 17608fa94d1..ac8c51b6d53 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/Generic/AirEconomizerHighLimits.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/Generic/AirEconomizerHighLimits.mo @@ -188,29 +188,29 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Logical and" annotation (Placement(transformation(extent={{220,400},{240,420}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{460,800},{480,820}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=273.15 + 24) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off temperature" annotation (Placement(transformation(extent={{220,840},{240,860}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{420,660},{440,680}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=273.15 + 21) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off temperature" annotation (Placement(transformation(extent={{220,700},{240,720}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{380,580},{400,600}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con2( final k=273.15 + 18) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off temperature" @@ -239,7 +239,7 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Logical or" annotation (Placement(transformation(extent={{80,400},{100,420}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{340,420},{360,440}}))); @@ -264,16 +264,16 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Logical not" annotation (Placement(transformation(extent={{440,360},{460,380}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con3( final k=273.15 + 24) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off temperature" annotation (Placement(transformation(extent={{20,150},{40,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off outdoor air enthalpy" annotation (Placement(transformation(extent={{380,30},{400,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con4( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con4( final k=66000) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Enthalpy cutoff value, J/kg" @@ -373,11 +373,11 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-340},{220,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{480,-340},{500,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con5( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con5( final k=273.15 + 24) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" @@ -390,11 +390,11 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-430},{220,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi6 + Buildings.Controls.OBC.CDL.Reals.Switch swi6 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{440,-430},{460,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con6( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con6( final k=273.15 + 23) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" @@ -407,21 +407,21 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-510},{220,-490}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con7( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con7( final k=273.15 + 22) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" annotation (Placement(transformation(extent={{200,-470},{220,-450}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi7 + Buildings.Controls.OBC.CDL.Reals.Switch swi7 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{400,-510},{420,-490}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con8( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con8( final k=273.15 + 21) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" annotation (Placement(transformation(extent={{200,-550},{220,-530}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi8 + Buildings.Controls.OBC.CDL.Reals.Switch swi8 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{360,-590},{380,-570}}))); @@ -429,7 +429,7 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-660},{220,-640}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi9 + Buildings.Controls.OBC.CDL.Reals.Switch swi9 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{480,-640},{500,-620}}))); @@ -437,15 +437,15 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-740},{220,-720}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi10 + Buildings.Controls.OBC.CDL.Reals.Switch swi10 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{440,-740},{460,-720}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-1) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" annotation (Placement(transformation(extent={{280,-700},{300,-680}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi11 + Buildings.Controls.OBC.CDL.Reals.Switch swi11 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{400,-820},{420,-800}}))); @@ -453,21 +453,21 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-820},{220,-800}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=-2) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" annotation (Placement(transformation(extent={{280,-780},{300,-760}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi12 + Buildings.Controls.OBC.CDL.Reals.Switch swi12 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{360,-900},{380,-880}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=-3) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" annotation (Placement(transformation(extent={{280,-860},{300,-840}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con9( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con9( final k=273.15 + 24) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off temperature" @@ -495,13 +495,13 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical not" annotation (Placement(transformation(extent={{-320,-680},{-300,-660}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con10( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con10( final k=0) if (eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 and not ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialEnthalpyWithFixedDryBulb) "Constant 0" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con11( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con11( final k=0) if not (ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.DifferentialDryBulb or ecoHigLimCon == Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulbWithDifferentialDryBulb) @@ -515,11 +515,11 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Logical and" annotation (Placement(transformation(extent={{220,270},{240,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min1 + Buildings.Controls.OBC.CDL.Reals.Min min1 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Smaller input" annotation (Placement(transformation(extent={{220,310},{240,330}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi13 + Buildings.Controls.OBC.CDL.Reals.Switch swi13 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{300,270},{320,290}}))); @@ -527,16 +527,16 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Logical and" annotation (Placement(transformation(extent={{220,180},{240,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min2 + Buildings.Controls.OBC.CDL.Reals.Min min2 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Smaller input" annotation (Placement(transformation(extent={{220,220},{240,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con12( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con12( final k=273.15 + 21) if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off temperature" annotation (Placement(transformation(extent={{20,250},{40,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi14 + Buildings.Controls.OBC.CDL.Reals.Switch swi14 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{260,180},{280,200}}))); @@ -557,11 +557,11 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-990},{220,-970}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi15 + Buildings.Controls.OBC.CDL.Reals.Switch swi15 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{480,-990},{500,-970}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min3 + Buildings.Controls.OBC.CDL.Reals.Min min3 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Smaller input" annotation (Placement(transformation(extent={{360,-960},{380,-940}}))); @@ -569,11 +569,11 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-1060},{220,-1040}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min4 + Buildings.Controls.OBC.CDL.Reals.Min min4 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Smaller input" annotation (Placement(transformation(extent={{360,-1030},{380,-1010}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi16 + Buildings.Controls.OBC.CDL.Reals.Switch swi16 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{440,-1060},{460,-1040}}))); @@ -581,19 +581,19 @@ block AirEconomizerHighLimits "Specify the economizer high liimits" if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Logical and" annotation (Placement(transformation(extent={{200,-1130},{220,-1110}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi17 + Buildings.Controls.OBC.CDL.Reals.Switch swi17 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{440,-1130},{460,-1110}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min5 + Buildings.Controls.OBC.CDL.Reals.Min min5 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Smaller input" annotation (Placement(transformation(extent={{360,-1100},{380,-1080}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi18 + Buildings.Controls.OBC.CDL.Reals.Switch swi18 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Cut off outdoor air temperature" annotation (Placement(transformation(extent={{440,-1200},{460,-1180}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min6 + Buildings.Controls.OBC.CDL.Reals.Min min6 if eneStd == Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.California_Title_24 "Smaller input" annotation (Placement(transformation(extent={{360,-1170},{380,-1150}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo index 925c36e1046..cf04741000d 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo @@ -39,7 +39,7 @@ block TimeSuppression annotation (Placement(transformation(extent={{180,-120},{220,-80}}), iconTransformation(extent={{100,-20},{140,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Min supTim + Buildings.Controls.OBC.CDL.Reals.Min supTim "Calculated suppression time due to the setpoint change" annotation (Placement(transformation(extent={{80,0},{100,20}}))); @@ -52,7 +52,7 @@ protected final samplePeriod=samplePeriod) "Delay value to record input value" annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs1 + Buildings.Controls.OBC.CDL.Reals.Abs abs1 "Absolute change of the setpoint temperature" annotation (Placement(transformation(extent={{100,100},{120,120}}))); Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triSam @@ -70,40 +70,40 @@ protected Buildings.Controls.OBC.CDL.Logical.Timer tim "Time when the setpoint is being changed" annotation (Placement(transformation(extent={{-40,-160},{-20,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1 + Buildings.Controls.OBC.CDL.Reals.Greater gre1 "Check if current model time is greater than the initial period equaling the sample time" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if there is setpoint change" annotation (Placement(transformation(extent={{-120,-160},{-100,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.ModelTime modTim + Buildings.Controls.OBC.CDL.Reals.Sources.ModelTime modTim "Time of the model" annotation (Placement(transformation(extent={{-140,100},{-120,120}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=chaRat) "Setpoint change rate" annotation (Placement(transformation(extent={{20,20},{40,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate difference of previous and current setpoints" annotation (Placement(transformation(extent={{-20,130},{0,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=samplePeriod) "Sample period time" annotation (Placement(transformation(extent={{-140,70},{-120,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxSupTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxSupTim( final k=maxTim) "Maximum suppression time " annotation (Placement(transformation(extent={{20,-20},{40,0}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant con5( final k=true) "Constant true" annotation (Placement(transformation(extent={{80,-130},{100,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Use setpoint different value when sample period time has passed" annotation (Placement(transformation(extent={{40,100},{60,120}}))); Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol( @@ -113,16 +113,16 @@ protected Buildings.Controls.OBC.CDL.Logical.Switch pasSupTim "Check if suppression time has passed" annotation (Placement(transformation(extent={{140,-110},{160,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater pasSup + Buildings.Controls.OBC.CDL.Reals.Greater pasSup "Check if the change has been suppressed by sufficient time" annotation (Placement(transformation(extent={{20,-160},{40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract temDif + Buildings.Controls.OBC.CDL.Reals.Subtract temDif "Difference between setpoint and zone temperature" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triSam1 "Zone temperature at the moment when there is setpoint change" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs2 + Buildings.Controls.OBC.CDL.Reals.Abs abs2 "Absolute temperature difference" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Generic/TrimAndRespond.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/TrimAndRespond.mo index bf24f783e0e..7bce941eedf 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/Generic/TrimAndRespond.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/Generic/TrimAndRespond.mo @@ -35,89 +35,89 @@ block TrimAndRespond "Block to inplement trim and respond logic" final delayOnInit=true) "Send an on signal after some delay time" annotation (Placement(transformation(extent={{-200,160},{-180,180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr "Check if the real requests is more than ignored requests setting" annotation (Placement(transformation(extent={{20,-60},{40,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch netRes "Net setpoint reset value" + Buildings.Controls.OBC.CDL.Reals.Switch netRes "Net setpoint reset value" annotation (Placement(transformation(extent={{160,-20},{180,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant resAmoCon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant resAmoCon( final k=resAmo) "Respond amount constant" annotation (Placement(transformation(extent={{-200,-140},{-180,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Products of net requests and respond amount value" annotation (Placement(transformation(extent={{-20,-110},{0,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1 "Product of trim and respond amount" + Buildings.Controls.OBC.CDL.Reals.Multiply pro1 "Product of trim and respond amount" annotation (Placement(transformation(extent={{-160,-110},{-140,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro2 "Product of respond and maximum amount" + Buildings.Controls.OBC.CDL.Reals.Multiply pro2 "Product of respond and maximum amount" annotation (Placement(transformation(extent={{-160,-180},{-140,-160}}))); Buildings.Controls.OBC.CDL.Discrete.UnitDelay uniDel( final samplePeriod=samplePeriod, final y_start=iniSet) "Output the input signal with a unit delay" annotation (Placement(transformation(extent={{-100,96},{-80,116}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Switch between initial setpoint and reseted setpoint" annotation (Placement(transformation(extent={{160,180},{180,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Before instant (device ON + delTim + samplePeriod), the setpoint should not be trimmed" annotation (Placement(transformation(extent={{120,0},{140,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Reinitialize setpoint to initial setting when device become OFF" annotation (Placement(transformation(extent={{100,130},{120,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 "Logical switch" + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Logical switch" annotation (Placement(transformation(extent={{120,-160},{140,-140}}))); Buildings.Controls.OBC.CDL.Discrete.Sampler sampler( final samplePeriod=samplePeriod) "Sample number of requests" annotation (Placement(transformation(extent={{-160,-20},{-140,0}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr1 + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr1 "Check if trim and response amount have same sign" annotation (Placement(transformation(extent={{-120,-110},{-100,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2 "Check if trim and response amount have opposite sign" annotation (Placement(transformation(extent={{-120,-180},{-100,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if response amount have positive sign" annotation (Placement(transformation(extent={{20,-160},{40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=-1) "Convert results back to negative" annotation (Placement(transformation(extent={{80,-190},{100,-170}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant iniSetCon(k=iniSet) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant iniSetCon(k=iniSet) "Initial setpoint" annotation (Placement(transformation(extent={{-100,180},{-80,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant numIgnReqCon(k=numIgnReq) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant numIgnReqCon(k=numIgnReq) "Number of ignored requests" annotation (Placement(transformation(extent={{-160,-60},{-140,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant triAmoCon(k=triAmo) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant triAmoCon(k=triAmo) "Trim amount constant" annotation (Placement(transformation(extent={{-200,-90},{-180,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxResCon(k=maxRes) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxResCon(k=maxRes) "Maximum response per time interval" annotation (Placement(transformation(extent={{-200,-210},{-180,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxSetCon(k=maxSet) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxSetCon(k=maxSet) "Maximum setpoint constant" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerTri(k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerTri(k=0) "Zero reset amount during time range from (device ON) to (device ON + delTim + timSet)" annotation (Placement(transformation(extent={{60,-20},{80,0}}))); Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea "Convert integer input to real output" annotation (Placement(transformation(extent={{-200,-20},{-180,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract difReqIgnReq + Buildings.Controls.OBC.CDL.Reals.Subtract difReqIgnReq "Difference between ignored request number and the real request number" annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 + Buildings.Controls.OBC.CDL.Reals.Add add1 "Increase setpoint by amount of value defined from reset logic" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Net reset value" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Net reset value" annotation (Placement(transformation(extent={{120,-96},{140,-76}}))); - Buildings.Controls.OBC.CDL.Continuous.Min minInp + Buildings.Controls.OBC.CDL.Reals.Min minInp "Total response should not be more than maximum response" annotation (Placement(transformation(extent={{20,-130},{40,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Min min1 + Buildings.Controls.OBC.CDL.Reals.Min min1 "Reset setpoint should not be higher than the maximum setpoint" annotation (Placement(transformation(extent={{0,90},{20,110}}))); Buildings.Controls.OBC.CDL.Logical.And and2 @@ -125,10 +125,10 @@ protected annotation (Placement(transformation(extent={{120,-40},{140,-20}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical Not" annotation (Placement(transformation(extent={{-100,130},{-80,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minSetCon(k=minSet) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minSetCon(k=minSet) "Minimum setpoint constant" annotation (Placement(transformation(extent={{0,60},{20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Max maxInp + Buildings.Controls.OBC.CDL.Reals.Max maxInp "Reset setpoint should not be lower than the minimum setpoint" annotation (Placement(transformation(extent={{40,90},{60,110}}))); Buildings.Controls.OBC.CDL.Utilities.Assert assMes( @@ -139,9 +139,9 @@ protected final message="Respond amount 'resAmo' and maximum respond amount 'maxRes' must have same sign.") "Generate alarm message" annotation (Placement(transformation(extent={{-80,-180},{-60,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs "Absolute value of real input" + Buildings.Controls.OBC.CDL.Reals.Abs abs "Absolute value of real input" annotation (Placement(transformation(extent={{-120,-140},{-100,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs1 "Absolute value of real input" + Buildings.Controls.OBC.CDL.Reals.Abs abs1 "Absolute value of real input" annotation (Placement(transformation(extent={{-120,-210},{-100,-190}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/AirEconomizerHighLimits.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/AirEconomizerHighLimits.mo index 9745147134f..85b8eb634a3 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/AirEconomizerHighLimits.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/AirEconomizerHighLimits.mo @@ -92,12 +92,12 @@ model AirEconomizerHighLimits final tit24CliZon=Buildings.Controls.OBC.ASHRAE.G36.Types.Title24ClimateZone.Zone_1) "Title 24 standard, with fixed enthalpy and fixed dry bulb device" annotation (Placement(transformation(extent={{-10,-110},{10,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp retAirEnt( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp retAirEnt( final height=5000, final duration=10, final offset=65000) "Return air enthalpy" annotation (Placement(transformation(extent={{-90,-6},{-70,14}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp retAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp retAirTem( final height=5, final duration=10, final offset=295.15) "Return air temperature" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TimeSuppression.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TimeSuppression.mo index a85bf3134cd..053c3de3aed 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TimeSuppression.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TimeSuppression.mo @@ -9,13 +9,13 @@ model TimeSuppression final chaRat=1080, final maxTim=7200) "Time suppression for temperature alarm" annotation (Placement(transformation(extent={{40,-90},{60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin zonTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin zonTem( final amplitude=2, final freqHz=1/7200, final offset=298.15) "Zone temperature" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooSet( final height=5, final duration=600, final offset=295.15, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TrimAndRespond.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TrimAndRespond.mo index ff9ca1be4fc..a75746d76f3 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TrimAndRespond.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/Generic/Validation/TrimAndRespond.mo @@ -36,18 +36,18 @@ model TrimAndRespond "Model validates the trim and respond block" Buildings.Controls.OBC.CDL.Logical.Sources.Constant con( final k=true) "Logic true indicating device ON" annotation (Placement(transformation(extent={{20,80},{40,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final amplitude=6, final freqHz=1/5400) "Block generates sine signal" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs + Buildings.Controls.OBC.CDL.Reals.Abs abs "Block generates absolute value of input" annotation (Placement(transformation(extent={{-52,40},{-32,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine1( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine1( final amplitude=6, freqHz=1/5400) "Block generates sine signal" annotation (Placement(transformation(extent={{-88,-90},{-68,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs1 + Buildings.Controls.OBC.CDL.Reals.Abs abs1 "Block generates absolute value of input" annotation (Placement(transformation(extent={{-10,-90},{10,-70}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul( @@ -56,18 +56,18 @@ model TrimAndRespond "Model validates the trim and respond block" annotation (Placement(transformation(extent={{-88,-20},{-68,0}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{20,-20},{40,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi "Switch between two Real signals" + Buildings.Controls.OBC.CDL.Reals.Switch swi "Switch between two Real signals" annotation (Placement(transformation(extent={{-48,-50},{-28,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1(final k=0) "Zero request when device is OFF" annotation (Placement(transformation(extent={{-88,-50},{-68,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-20,40},{0,60}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{20,-90},{40,-70}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/ActiveAirFlow.mo index 72dbcd9081b..0e2a4a932d0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/ActiveAirFlow.mo @@ -47,7 +47,7 @@ block ActiveAirFlow final realTrue=1) "Convert boolean to real" annotation (Placement(transformation(extent={{20,-70},{40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply actMin + Buildings.Controls.OBC.CDL.Reals.Multiply actMin "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{60,-90},{80,-70}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant occMod( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Alarms.mo index db6a133141f..fbfec19a8b7 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Alarms.mo @@ -67,11 +67,11 @@ block Alarms "Generate alarms of cooling only terminal unit" annotation (Placement(transformation(extent={{240,-190},{280,-150}}), iconTransformation(extent={{100,-80},{140,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,130},{-160,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,160},{-100,180}}))); @@ -79,16 +79,16 @@ block Alarms "Generate alarms of cooling only terminal unit" final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,80},{-160,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,30},{-100,50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,50},{-160,70}}))); @@ -113,11 +113,11 @@ block Alarms "Generate alarms of cooling only terminal unit" final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -146,11 +146,11 @@ block Alarms "Generate alarms of cooling only terminal unit" final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,40},{120,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,-70},{-180,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,-70},{-140,-50}}))); @@ -161,7 +161,7 @@ block Alarms "Generate alarms of cooling only terminal unit" final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-100,-50},{-80,-30}}))); @@ -183,7 +183,7 @@ block Alarms "Generate alarms of cooling only terminal unit" final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,-180},{40,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Dampers.mo index 1986fdae95b..9971cc5579b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Dampers.mo @@ -93,26 +93,26 @@ block Dampers annotation (Placement(transformation(extent={{260,-280},{300,-240}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-220,210},{-200,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=1) "Constant one" annotation (Placement(transformation(extent={{-180,210},{-160,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Map cooling loop output to the active airflow setpoint" annotation (Placement(transformation(extent={{-120,180},{-100,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=dTHys) "Check if supplyair temperature from the air handler is greater than room temperature" annotation (Placement(transformation(extent={{-160,250},{-140,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Select active airfow setpoint based on difference between supply and zone temperature" annotation (Placement(transformation(extent={{-60,250},{-40,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch actFlo + Buildings.Controls.OBC.CDL.Reals.Switch actFlo "Specify active flow setpoint based on the zone status" annotation (Placement(transformation(extent={{-20,150},{0,170}}))); - Buildings.Controls.OBC.CDL.Continuous.PID conPID( + Buildings.Controls.OBC.CDL.Reals.PID conPID( final controllerType=damCon, final k=kDam, final Ti=TiDam, @@ -126,14 +126,14 @@ block Dampers Buildings.Controls.OBC.CDL.Integers.Equal cooSta "Check if zone is in cooling state" annotation (Placement(transformation(extent={{-160,90},{-140,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant nomFlow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant nomFlow( final k=VCooMax_flow) "Nominal volume flow rate" annotation (Placement(transformation(extent={{0,-150},{20,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{100,-160},{120,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{100,-200},{120,-180}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt1( @@ -169,13 +169,13 @@ block Dampers final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{40,-90},{60,-70}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 @@ -202,13 +202,13 @@ block Dampers final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{0,-270},{20,-250}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{60,-250},{80,-230}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{60,-290},{80,-270}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{220,-270},{240,-250}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/SystemRequests.mo index 2fa15bbb889..35e9c60bc6c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/SystemRequests.mo @@ -101,26 +101,26 @@ block SystemRequests iconTransformation(extent={{100,-80},{140,-40}}))); protected - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-120,-180},{-100,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -131,18 +131,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-180},{60,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-100,-80},{-80,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-100,-120},{-80,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -194,10 +194,10 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-60,-160},{-40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); Buildings.Controls.OBC.CDL.Logical.And and5 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/ActiveAirFlow.mo index 72461278496..883f212c280 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/ActiveAirFlow.mo @@ -4,12 +4,12 @@ model ActiveAirFlow Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.ActiveAirFlow actAirSet(final VCooMax_flow=0.5) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -18,7 +18,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Alarms.mo index 273ea7c4bc7..fc950c404f1 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Alarms.mo @@ -7,17 +7,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirRate( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -28,7 +28,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse damSta( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Dampers.mo index 75cbb87021b..f5ed272b09c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/Dampers.mo @@ -8,35 +8,35 @@ model Dampers final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-80},{100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=1, final duration=3600, final offset=0, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-100,30},{-80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VDis_flow( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) "Discharge airflow rate" annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp zonSta( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp zonSta( final offset=3, final height=-2, final duration=1000, @@ -45,11 +45,11 @@ model Dampers Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-70},{0,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, startTime=1000) "Override flow setpoint" @@ -57,10 +57,10 @@ model Dampers Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -68,7 +68,7 @@ model Dampers Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-140},{0,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round3(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-140},{-40,-120}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/SystemRequests.mo index e9421713ff7..07579ef47fd 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Subsequences/Validation/SystemRequests.mo @@ -7,7 +7,7 @@ model SystemRequests final looHys=0.01, final damPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); @@ -15,27 +15,27 @@ model SystemRequests final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,30},{0,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=0.9, final duration=7200, final offset=0.1) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirRate( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-20,-70},{0,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Validation/Controller.mo index cd7239319f6..718c952243c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly/Validation/Controller.mo @@ -15,13 +15,13 @@ model Controller final VOccMin_flow=0, final VAreMin_flow=0) "Cooling only unit controller" annotation (Placement(transformation(extent={{100,-10},{120,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -34,11 +34,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,130},{-60,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,110},{-100,130}}))); @@ -47,7 +47,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -57,27 +57,27 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,50},{20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp supAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp supAirTem( final height=2, final duration=43200, final offset=273.15 + 14) "Supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Discharge airflow rate" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -86,11 +86,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=5000, startTime=60000) "Override damper position" @@ -98,7 +98,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); @@ -107,7 +107,7 @@ model Controller final period=73200, final shift=18800) "Supply fan status" annotation (Placement(transformation(extent={{-80,-170},{-60,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set(final k=894) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set(final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,20},{-100,40}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Controller.mo index deca4ffde2f..f27772275fa 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Controller.mo @@ -410,18 +410,18 @@ block Controller "Controller for dual-duct terminal unit with cold-duct minimum final dTHys=dTHys) "Specify suppresion time due to the zone heating setpoint change and check if it has passed the suppresion period" annotation (Placement(transformation(extent={{-200,240},{-180,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{-40,280},{-20,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{-80,250},{-60,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Sum of minimum flow and cooling maximum flow" annotation (Placement(transformation(extent={{-40,230},{-20,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if cooling maximum is greater than the sum of minimum and heating maximum flow" annotation (Placement(transformation(extent={{20,280},{40,300}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/ActiveAirFlow.mo index 588663d1066..55123eec788 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/ActiveAirFlow.mo @@ -70,7 +70,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{40,90},{60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{100,80},{120,100}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal heaMaxFlo( @@ -103,22 +103,22 @@ protected Buildings.Controls.OBC.CDL.Logical.Or3 or1 "Check if it is in occupied, warm-up, or setback mode" annotation (Placement(transformation(extent={{40,-120},{60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Sum of minimum flow and cooling maximum flow" annotation (Placement(transformation(extent={{20,-60},{40,-40}}))); Buildings.Controls.OBC.CDL.Utilities.Assert assMes( final message="Warning: the sum of minimum flow and heating maximum flow is greater than the cooling maximum flow.") "Generate warning when the cooling maximum is less than the sum of heating maximum and the minimum flow" annotation (Placement(transformation(extent={{100,0},{120,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if cooling maximum is greater than the sum of minimum and heating maximum flow" annotation (Placement(transformation(extent={{60,0},{80,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{-20,-80},{0,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{0,0},{20,20}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Alarms.mo index 68327fb1d43..326329cfd84 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Alarms.mo @@ -97,11 +97,11 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum annotation (Placement(transformation(extent={{240,-330},{280,-290}}), iconTransformation(extent={{100,-90},{140,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,280},{-160,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,310},{-100,330}}))); @@ -109,16 +109,16 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,310},{-60,330}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,230},{-160,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,180},{-100,200}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,200},{-160,220}}))); @@ -143,11 +143,11 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,230},{100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,140},{-100,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,140},{-60,160}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -176,10 +176,10 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,190},{120,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-180,20},{-160,40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-140,20},{-120,40}}))); @@ -190,7 +190,7 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); @@ -212,7 +212,7 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{60,-90},{80,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-180,-130},{-160,-110}}))); @@ -230,11 +230,11 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{160,-90},{180,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMaxFlo( final k=VHeaMax_flow) "Heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-180,-210},{-160,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3(final k=0.1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3(final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-140,-210},{-120,-190}}))); Buildings.Controls.OBC.CDL.Logical.Not not6 @@ -244,7 +244,7 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,-190},{40,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-80,-190},{-60,-170}}))); @@ -266,7 +266,7 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{60,-320},{80,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam1( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" @@ -285,7 +285,7 @@ block Alarms "Generate alarms of dual-duct terminal unit with cold-duct minimum final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{160,-320},{180,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Total discharge airflow" annotation (Placement(transformation(extent={{-200,80},{-180,100}}))); Buildings.Controls.OBC.CDL.Logical.TrueDelay truDel6( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Dampers.mo index 63c0fdc8c1a..16a7f3be152 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Dampers.mo @@ -157,60 +157,60 @@ block Dampers Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-60,160},{-40,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,210},{-140,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cold duct airflow setpoint" annotation (Placement(transformation(extent={{80,200},{100,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{20,230},{40,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,240},{-260,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,240},{-200,260}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-280,180},{-260,200}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-120,130},{-100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,130},{-140,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Total discharge airflow setpoint" annotation (Placement(transformation(extent={{260,250},{280,270}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Cooing or heating state" annotation (Placement(transformation(extent={{-200,70},{-180,90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-280,-190},{-260,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin1 + Buildings.Controls.OBC.CDL.Reals.Line lin1 "Active airflow setpoint for heating" annotation (Placement(transformation(extent={{-60,-160},{-40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer1( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-200,-130},{-180,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne1( final k=1) "Constant one" annotation (Placement(transformation(extent={{-140,-130},{-120,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-200,-90},{-180,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is less than room temperature" @@ -218,20 +218,20 @@ block Dampers Buildings.Controls.OBC.CDL.Logical.And and1 "Logical and" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{60,-60},{80,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{140,160},{160,180}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCooDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conCooDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -241,19 +241,19 @@ block Dampers final y_reset=0) "Cooling damper position controller" annotation (Placement(transformation(extent={{220,160},{240,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{140,100},{160,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooDamPos + Buildings.Controls.OBC.CDL.Reals.Switch cooDamPos "Output cooling damper position" annotation (Placement(transformation(extent={{280,-10},{300,10}}))); Buildings.Controls.OBC.CDL.Logical.Not not3 "Not proven on" annotation (Placement(transformation(extent={{180,20},{200,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor1 "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{120,-90},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conHeaDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conHeaDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -263,10 +263,10 @@ block Dampers final y_reset=0) "Heating damper position controller" annotation (Placement(transformation(extent={{200,-90},{220,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor1 "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{120,-160},{140,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaDamPos + Buildings.Controls.OBC.CDL.Reals.Switch heaDamPos "Output heating damper position" annotation (Placement(transformation(extent={{280,-280},{300,-260}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -277,18 +277,18 @@ block Dampers final realFalse=1) "Ensure heating damper is closed when it is in cooling or deadband state" annotation (Placement(transformation(extent={{20,-260},{40,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Ensure heating damper is closed when it is in cooling or deadband state" annotation (Placement(transformation(extent={{240,-240},{260,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax1( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{20,160},{40,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax1( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{20,120},{40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 "Nominal flow" + Buildings.Controls.OBC.CDL.Reals.Max max2 "Nominal flow" annotation (Placement(transformation(extent={{80,140},{100,160}}))); equation connect(uCoo, lin.u) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Overrides.mo index efadf0bc5bc..63c868ee8e1 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Overrides.mo @@ -97,11 +97,11 @@ block Overrides "Software switches to override setpoints" final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-40,130},{-20,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{28,150},{48,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{62,190},{82,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi "Airflow setpoint after considering override" + Buildings.Controls.OBC.CDL.Reals.Switch swi "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{100,30},{120,50}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 "Check if the airflow setpoint should be overrided" annotation (Placement(transformation(extent={{-20,50},{0,70}}))); @@ -127,12 +127,12 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-90},{100,-70}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt5( @@ -146,7 +146,7 @@ block Overrides "Software switches to override setpoints" final realTrue=VHeaMax_flow) "Force zone airflow setpoint to zone heating maximum flow" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 + Buildings.Controls.OBC.CDL.Reals.Add add4 "Add up two inputs" annotation (Placement(transformation(extent={{-6,110},{14,130}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -174,13 +174,13 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-190},{-20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add5 + Buildings.Controls.OBC.CDL.Reals.Add add5 "Add up inputs" annotation (Placement(transformation(extent={{20,-170},{40,-150}}))); Buildings.Controls.OBC.CDL.Logical.Or or4 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-210},{20,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-210},{100,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/SystemRequests.mo index 8f6206c654a..ebd906bdc92 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/SystemRequests.mo @@ -144,27 +144,27 @@ block SystemRequests "Output system requests for dual-duct unit with cold-duct m iconTransformation(extent={{100,-200},{140,-160}}))); protected - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,330},{-60,350}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,290},{-60,310}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-160,60},{-140,80}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,240},{-60,260}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -175,18 +175,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,60},{40,80}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-140,160},{-120,180}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-140,120},{-120,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,330},{-100,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,290},{-100,310}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -236,35 +236,35 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-80,80},{-60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-40,190},{-20,210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr7( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr7( final t=thrTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr8( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr8( final t=twoTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr9( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr9( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-180,-340},{-160,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr10( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr10( final t=0.95, final h=looHys) "Check if heating loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,-160},{-60,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr11( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr11( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -275,18 +275,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt5 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,-340},{40,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-160,-240},{-140,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai4( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai4( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-160,-280},{-140,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-120,-70},{-100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub4 + Buildings.Controls.OBC.CDL.Reals.Subtract sub4 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-120,-110},{-100,-90}}))); Buildings.Controls.OBC.CDL.Logical.And and6 @@ -341,23 +341,23 @@ protected final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-80,-320},{-60,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu2(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu2(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-80,-240},{-60,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu3(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu3(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-80,-280},{-60,-260}}))); Buildings.Controls.OBC.CDL.Logical.And and10 "Logical and" annotation (Placement(transformation(extent={{-40,-210},{-20,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr12( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr12( final t=0.15, final h=looHys) "Check if heating loop signal is greater than 0.15" annotation (Placement(transformation(extent={{-80,-400},{-60,-380}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Hold the true input" annotation (Placement(transformation(extent={{0,-400},{20,-380}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.01, final h=looHys) "Check if the heating loop output is less than threshold" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/ActiveAirFlow.mo index aa03cb3b950..dab887353a0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/ActiveAirFlow.mo @@ -6,12 +6,12 @@ model ActiveAirFlow final VHeaMax_flow=0.4, final floHys=0.01) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -20,7 +20,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Alarms.mo index a961b8a2a89..756e14adb08 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Alarms.mo @@ -8,17 +8,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{60,30},{80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooDisAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooDisAir( final duration=7200, final offset=0.1, final height=0.3) "Cooling duct discharge airflow rate" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -30,14 +30,14 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{0,10},{20,30}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse colDammSta( final width=0.5, final period=7500) "Cooling duct damper open and close status" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos1( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -50,7 +50,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean input to real output" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Damper position" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse heaDammSta( @@ -58,7 +58,7 @@ model Alarms "Validation of model that generates alarms" final period=7500) "Heating duct damper open and close status" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaDisAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaDisAir( final duration=7200, final offset=0.1, final height=0.3) "Heating duct discharge airflow rate" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Dampers.mo index 63747075a38..a9ad19308d1 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Dampers.mo @@ -7,29 +7,29 @@ model Dampers final VHeaMax_flow=0.06, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-90},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,100},{-80,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VColDuc( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VColDuc( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) @@ -40,18 +40,18 @@ model Dampers final period=7200) "Cold air handling unit status" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSup( final k=273.15 + 25) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActHeaMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActHeaMax_flow( final k=0.07) "Active heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); @@ -61,7 +61,7 @@ model Dampers final shift=5000) "Hot air handling unit status" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VHotDuc( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VHotDuc( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Overrides.mo index ff7cbfbbcfd..f1f68de7d3c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/Overrides.mo @@ -6,17 +6,17 @@ model Overrides "Validation of model that overrides control" final VCooMax_flow=0.9, final VHeaMax_flow=0.8) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooDamPos( final duration=3600, final height=0.5, final offset=0.5) "Cooling damper position setpoint" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, startTime=1000) "Override flow setpoint" @@ -24,11 +24,11 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -36,16 +36,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,0},{20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaDamPos( final duration=3600, final height=0.5, final offset=0.5) "Heating damper position setpoint" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -53,7 +53,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-60},{20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round3(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/SystemRequests.mo index 4895e42849f..e82950c8b75 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Subsequences/Validation/SystemRequests.mo @@ -7,7 +7,7 @@ model SystemRequests final looHys=0.01, final damPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-22},{80,18}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -15,30 +15,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TZonCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,100},{0,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,50},{0,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDucAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDucAirSet( final height=0.9, final duration=7200, final offset=0.1) "Cold-duct airflow rate setpoint" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDucAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDucAirRate( final duration=7200, final offset=0.1, final height=0.3) "Cold duct airflow rate" annotation (Placement(transformation(extent={{-20,10},{0,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDamPos( final duration=3000, final height=-0.7, final offset=0.7) "Cold-duct damper position" @@ -50,7 +50,7 @@ model SystemRequests annotation (Placement(transformation(extent={{-60,130},{-40,150}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-20,130},{0,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine1( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine1( final freqHz=1/7200, final offset=293.15) "Generate data for setpoint" @@ -66,25 +66,25 @@ model SystemRequests annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=0.9, final duration=3600, final startTime=3600) "Heating loop signal" annotation (Placement(transformation(extent={{-20,-100},{0,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDucAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDucAirSet( final height=0.9, final duration=7200, final offset=0.1) "Hot-duct airflow rate setpoint" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDucAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDucAirRate( final duration=7200, final offset=0.1, final height=0.3) "Hot duct airflow rate" annotation (Placement(transformation(extent={{-20,-140},{0,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDamPos( final duration=3600, final height=0.7, startTime=3600) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Validation/Controller.mo index 4c3a4929bab..02c85cb8fae 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctColdDuctMin/Validation/Controller.mo @@ -17,13 +17,13 @@ model Controller final VAreMin_flow=0) "Dual duct unit controller" annotation (Placement(transformation(extent={{100,40},{120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,210},{-100,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -36,11 +36,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,150},{-60,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,190},{-60,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,170},{-100,190}}))); @@ -49,7 +49,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,130},{-100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -59,27 +59,27 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colSupAirTem( final height=2, final duration=43200, final offset=273.15 + 14) "Cold-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VColDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VColDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Cold duct airflow rate" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -88,11 +88,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveColDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveColDam( final height=2, final duration=5000, startTime=60000) "Override cold-duct damper position" @@ -100,7 +100,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-150},{-20,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-150},{-60,-130}}))); @@ -110,7 +110,7 @@ model Controller final shift=18800) "Cooling supply fan status" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveHotDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveHotDam( final height=2, final duration=5000, final startTime=60000) "Override hot-duct damper position" @@ -118,7 +118,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-180},{-20,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-180},{-60,-160}}))); @@ -127,18 +127,18 @@ model Controller final period=73200, final shift=18800) "Heating supply fan status" annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VHotDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VHotDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Hot duct airflow rate" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotSupAirTem( final height=2, final duration=43200, final offset=273.15 + 24) "Hot-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set( final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/ActiveAirFlow.mo index 0a83f9de27c..4f8980fd91b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/ActiveAirFlow.mo @@ -67,7 +67,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{40,80},{60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{100,70},{120,90}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal heaMaxFlo( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Alarms.mo index c1a058e6030..3b651fe8e62 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Alarms.mo @@ -78,11 +78,11 @@ block Alarms annotation (Placement(transformation(extent={{240,-200},{280,-160}}), iconTransformation(extent={{100,-100},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,170},{-160,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,200},{-100,220}}))); @@ -90,16 +90,16 @@ block Alarms final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,200},{-60,220}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,120},{-160,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,90},{-160,110}}))); @@ -124,11 +124,11 @@ block Alarms final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,120},{100,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,30},{-100,50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -157,24 +157,24 @@ block Alarms final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,80},{120,100}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-220},{-180,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam1( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-260},{-180,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo1( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-180,-60},{-160,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai4( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai4( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-140,-60},{-120,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre3( + Buildings.Controls.OBC.CDL.Reals.Greater gre3( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-80,-20},{-60,0}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Dampers.mo index 4e72d54bba1..1b690b25e49 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Dampers.mo @@ -146,51 +146,51 @@ block Dampers Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-60,190},{-40,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,240},{-140,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cold duct airflow setpoint" annotation (Placement(transformation(extent={{80,230},{100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{20,260},{40,280}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,270},{-260,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,270},{-200,290}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-280,210},{-260,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-120,160},{-100,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,160},{-140,180}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Cooing or heating state" annotation (Placement(transformation(extent={{-200,100},{-180,120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-280,-240},{-260,-220}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "In deadband state" annotation (Placement(transformation(extent={{-120,100},{-100,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Active cold duct airflow setpoint when it is in deadband state" annotation (Placement(transformation(extent={{20,100},{40,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-200,-140},{-180,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is less than room temperature" @@ -198,20 +198,20 @@ block Dampers Buildings.Controls.OBC.CDL.Logical.And and1 "Logical and" annotation (Placement(transformation(extent={{-60,-140},{-40,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{0,-140},{20,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{100,-110},{120,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate flow rate difference between minimum flow setpoint and measured discharge flow" annotation (Placement(transformation(extent={{120,-60},{140,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Ensure positive flow" annotation (Placement(transformation(extent={{180,-30},{200,-10}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea2( @@ -219,13 +219,13 @@ block Dampers final realFalse=0) "Convert boolean to real" annotation (Placement(transformation(extent={{-200,10},{-180,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul3 + Buildings.Controls.OBC.CDL.Reals.Multiply mul3 "Cold duct flow setpoint when in heating state" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{140,190},{160,210}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCooDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conCooDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -235,19 +235,19 @@ block Dampers final y_reset=0) "Cooling damper position controller" annotation (Placement(transformation(extent={{220,190},{240,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{140,140},{160,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooDamPos + Buildings.Controls.OBC.CDL.Reals.Switch cooDamPos "Output cooling damper position" annotation (Placement(transformation(extent={{280,20},{300,40}}))); Buildings.Controls.OBC.CDL.Logical.Not not3 "Not proven on" annotation (Placement(transformation(extent={{180,50},{200,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor1 "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{120,-180},{140,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conHeaDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conHeaDam( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.P, final k=kHeaMaxDam, final yMax=1, @@ -255,10 +255,10 @@ block Dampers final y_reset=0) "Heating damper position controller" annotation (Placement(transformation(extent={{200,-180},{220,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor1 "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{120,-220},{140,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaDamPos + Buildings.Controls.OBC.CDL.Reals.Switch heaDamPos "Output heating damper position" annotation (Placement(transformation(extent={{280,-330},{300,-310}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -269,32 +269,32 @@ block Dampers final realFalse=1) "Ensure heating damper is closed when it is in cooling or deadband state" annotation (Placement(transformation(extent={{20,-310},{40,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Ensure heating damper is closed when it is in cooling or deadband state" annotation (Placement(transformation(extent={{240,-290},{260,-270}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer1( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-200,-180},{-180,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne1( final k=1) "Constant one" annotation (Placement(transformation(extent={{-120,-180},{-100,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin1 + Buildings.Controls.OBC.CDL.Reals.Line lin1 "Active airflow setpoint for heating" annotation (Placement(transformation(extent={{-60,-210},{-40,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Total discharge airflow setpoint" annotation (Placement(transformation(extent={{280,280},{300,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax1( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{20,190},{40,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax1( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{20,150},{40,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Nominal flow" annotation (Placement(transformation(extent={{80,170},{100,190}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Overrides.mo index 87b93453380..69c45422b60 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Overrides.mo @@ -97,11 +97,11 @@ block Overrides "Software switches to override setpoints" final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-40,130},{-20,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{28,150},{48,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{62,190},{82,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi "Airflow setpoint after considering override" + Buildings.Controls.OBC.CDL.Reals.Switch swi "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{100,30},{120,50}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 "Check if the airflow setpoint should be overrided" annotation (Placement(transformation(extent={{-20,50},{0,70}}))); @@ -127,12 +127,12 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-90},{100,-70}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt5( @@ -146,7 +146,7 @@ block Overrides "Software switches to override setpoints" final realTrue=VHeaMax_flow) "Force zone airflow setpoint to zone heating maximum flow" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 + Buildings.Controls.OBC.CDL.Reals.Add add4 "Add up two inputs" annotation (Placement(transformation(extent={{-6,110},{14,130}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -174,13 +174,13 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-190},{-20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add5 + Buildings.Controls.OBC.CDL.Reals.Add add5 "Add up inputs" annotation (Placement(transformation(extent={{20,-170},{40,-150}}))); Buildings.Controls.OBC.CDL.Logical.Or or4 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-210},{20,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-210},{100,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/SystemRequests.mo index 353099a9c01..80b4a042791 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/SystemRequests.mo @@ -130,27 +130,27 @@ block SystemRequests iconTransformation(extent={{100,-200},{140,-160}}))); protected - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,370},{-60,390}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,330},{-60,350}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-160,-100},{-140,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,280},{-60,300}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -161,18 +161,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,-100},{40,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-140,0},{-120,20}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-140,-40},{-120,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,370},{-100,390}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,330},{-100,350}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -222,31 +222,31 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-80,0},{-60,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-40,30},{-20,50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr7( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr7( final t=thrTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,180},{-60,200}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr8( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr8( final t=twoTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,140},{-60,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr9( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr9( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-180,-350},{-160,-330}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr10( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr10( final t=0.95, final h=looHys) "Check if heating loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); @@ -256,10 +256,10 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt5 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,-350},{40,-330}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-140,180},{-120,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub4 + Buildings.Controls.OBC.CDL.Reals.Subtract sub4 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-140,140},{-120,160}}))); Buildings.Controls.OBC.CDL.Logical.And and6 @@ -317,14 +317,14 @@ protected Buildings.Controls.OBC.CDL.Logical.And and10 "Logical and" annotation (Placement(transformation(extent={{-100,-220},{-80,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr12( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr12( final t=0.15, final h=looHys) "Check if heating loop signal is greater than 0.15" annotation (Placement(transformation(extent={{-80,-430},{-60,-410}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Hold the true input" annotation (Placement(transformation(extent={{0,-430},{20,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.01, final h=looHys) "Check if the heating loop output is less than threshold" @@ -332,17 +332,17 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt6 "Heating fan request" annotation (Placement(transformation(extent={{80,-430},{100,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-80,-380},{-60,-360}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr6( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr6( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-160,-170},{-140,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr13( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr13( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/ActiveAirFlow.mo index e3fc726eb3d..52708aaf111 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/ActiveAirFlow.mo @@ -6,12 +6,12 @@ model ActiveAirFlow final VHeaMax_flow=0.4) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -20,7 +20,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Alarms.mo index 3b84b210b89..4c39caa1d67 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Alarms.mo @@ -7,17 +7,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{60,30},{80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -29,14 +29,14 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{0,10},{20,30}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse colDammSta( final width=0.5, final period=7500) "Cooling duct damper open and close status" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos1( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -49,7 +49,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean input to real output" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Damper position" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse heaDammSta( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Dampers.mo index 5a3adb90d24..29255f5af23 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Dampers.mo @@ -7,29 +7,29 @@ model Dampers final VHeaMax_flow=0.06, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-90},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,100},{-80,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VDis( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) "Discharge airflow rate" @@ -39,18 +39,18 @@ model Dampers final period=7200) "Cold air handling unit status" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSup( final k=273.15 + 25) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActHeaMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActHeaMax_flow( final k=0.07) "Active heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Overrides.mo index d43e5c9af13..65e0a908025 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/Overrides.mo @@ -6,17 +6,17 @@ model Overrides "Validation of model that overrides control" final VCooMax_flow=0.9, final VHeaMax_flow=0.8) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooDamPos( final duration=3600, final height=0.5, final offset=0.5) "Cooling damper position setpoint" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, startTime=1000) "Override flow setpoint" @@ -24,11 +24,11 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -36,16 +36,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,0},{20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaDamPos( final duration=3600, final height=0.5, final offset=0.5) "Heating damper position setpoint" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -53,7 +53,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-60},{20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round3(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/SystemRequests.mo index 2b90f1684a1..68bd58194bf 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Subsequences/Validation/SystemRequests.mo @@ -7,7 +7,7 @@ model SystemRequests final looHys=0.01, final damPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-22},{80,18}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -15,30 +15,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TZonCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,100},{0,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,50},{0,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirRate( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDamPos( final duration=3000, final height=-0.7, final offset=0.7) "Cold-duct damper position" @@ -50,7 +50,7 @@ model SystemRequests annotation (Placement(transformation(extent={{-60,130},{-40,150}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-20,130},{0,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine1( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine1( final freqHz=1/7200, final offset=293.15) "Generate data for setpoint" @@ -66,13 +66,13 @@ model SystemRequests annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=0.9, final duration=3600, final startTime=3600) "Heating loop signal" annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDamPos( final duration=3600, final height=0.7, startTime=3600) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Validation/Controller.mo index 91bce9fba44..69d3508c3e2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConDischargeSensor/Validation/Controller.mo @@ -17,13 +17,13 @@ model Controller final VAreMin_flow=0) "Dual duct unit controller" annotation (Placement(transformation(extent={{100,40},{120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,210},{-100,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -36,11 +36,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,150},{-60,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,190},{-60,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,170},{-100,190}}))); @@ -49,7 +49,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,130},{-100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -59,27 +59,27 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colSupAirTem( final height=2, final duration=43200, final offset=273.15 + 14) "Cold-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Discharge airflow rate" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -88,11 +88,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveColDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveColDam( final height=2, final duration=5000, startTime=60000) "Override cold-duct damper position" @@ -100,7 +100,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-150},{-20,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-150},{-60,-130}}))); @@ -110,7 +110,7 @@ model Controller final shift=18800) "Cooling supply fan status" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveHotDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveHotDam( final height=2, final duration=5000, final startTime=60000) "Override hot-duct damper position" @@ -118,7 +118,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-180},{-20,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-180},{-60,-160}}))); @@ -127,13 +127,13 @@ model Controller final period=73200, final shift=18800) "Heating supply fan status" annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotSupAirTem( final height=2, final duration=43200, final offset=273.15 + 24) "Hot-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set(final k=894) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set(final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/ActiveAirFlow.mo index 0b9e624a08b..39b691a9737 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/ActiveAirFlow.mo @@ -67,7 +67,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{40,80},{60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{100,70},{120,90}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal heaMaxFlo( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Alarms.mo index 4a9550de010..c1816958e6f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Alarms.mo @@ -97,11 +97,11 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi annotation (Placement(transformation(extent={{240,-330},{280,-290}}), iconTransformation(extent={{100,-90},{140,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,280},{-160,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,310},{-100,330}}))); @@ -109,16 +109,16 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,310},{-60,330}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,230},{-160,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,180},{-100,200}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,200},{-160,220}}))); @@ -143,11 +143,11 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,230},{100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,140},{-100,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,140},{-60,160}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -176,10 +176,10 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,190},{120,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-180,20},{-160,40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-140,20},{-120,40}}))); @@ -190,7 +190,7 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); @@ -212,7 +212,7 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{60,-90},{80,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-180,-130},{-160,-110}}))); @@ -230,11 +230,11 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{160,-90},{180,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMaxFlo( final k=VHeaMax_flow) "Heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-180,-210},{-160,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3(final k=0.1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3(final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-140,-210},{-120,-190}}))); Buildings.Controls.OBC.CDL.Logical.Not not6 @@ -244,7 +244,7 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,-190},{40,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-80,-190},{-60,-170}}))); @@ -266,7 +266,7 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{60,-320},{80,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam1( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" @@ -285,7 +285,7 @@ block Alarms "Generate alarms of dual-duct terminal unit using mixing control wi final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{160,-320},{180,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Total discharge airflow" annotation (Placement(transformation(extent={{-200,80},{-180,100}}))); Buildings.Controls.OBC.CDL.Logical.TrueDelay truDel6( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Dampers.mo index 5b6546cefab..46759277692 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Dampers.mo @@ -156,41 +156,41 @@ block Dampers Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-60,190},{-40,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,240},{-140,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cold duct airflow setpoint" annotation (Placement(transformation(extent={{80,230},{100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{20,260},{40,280}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,270},{-260,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,270},{-200,290}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-280,210},{-260,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-120,160},{-100,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,160},{-140,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Total discharge airflow setpoint" annotation (Placement(transformation(extent={{260,280},{280,300}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Cooing or heating state" annotation (Placement(transformation(extent={{-200,100},{-180,120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" @@ -198,24 +198,24 @@ block Dampers Buildings.Controls.OBC.CDL.Logical.Not not1 "In deadband state" annotation (Placement(transformation(extent={{-120,100},{-100,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Active cold duct airflow setpoint when it is in deadband state" annotation (Placement(transformation(extent={{20,100},{40,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin1 + Buildings.Controls.OBC.CDL.Reals.Line lin1 "Active airflow setpoint for heating" annotation (Placement(transformation(extent={{-60,-210},{-40,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer1( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-200,-180},{-180,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne1( final k=1) "Constant one" annotation (Placement(transformation(extent={{-140,-180},{-120,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-200,-140},{-180,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is less than room temperature" @@ -223,20 +223,20 @@ block Dampers Buildings.Controls.OBC.CDL.Logical.And and1 "Logical and" annotation (Placement(transformation(extent={{-60,-140},{-40,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{0,-140},{20,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{60,-110},{80,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate flow rate difference between minimum flow setpoint and the heating setpoint" annotation (Placement(transformation(extent={{120,-80},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Ensure positive flow" annotation (Placement(transformation(extent={{180,-50},{200,-30}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea2( @@ -244,13 +244,13 @@ block Dampers final realFalse=0) "Convert boolean to real" annotation (Placement(transformation(extent={{-200,10},{-180,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul3 + Buildings.Controls.OBC.CDL.Reals.Multiply mul3 "Cold duct flow setpoint when in heating state" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{140,190},{160,210}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCooDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conCooDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -260,19 +260,19 @@ block Dampers final y_reset=0) "Cooling damper position controller" annotation (Placement(transformation(extent={{220,190},{240,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{140,130},{160,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooDamPos + Buildings.Controls.OBC.CDL.Reals.Switch cooDamPos "Output cooling damper position" annotation (Placement(transformation(extent={{280,20},{300,40}}))); Buildings.Controls.OBC.CDL.Logical.Not not3 "Not proven on" annotation (Placement(transformation(extent={{180,50},{200,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor1 "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{120,-140},{140,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conHeaDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conHeaDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -282,10 +282,10 @@ block Dampers final y_reset=0) "Heating damper position controller" annotation (Placement(transformation(extent={{200,-140},{220,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor1 "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{120,-210},{140,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaDamPos + Buildings.Controls.OBC.CDL.Reals.Switch heaDamPos "Output heating damper position" annotation (Placement(transformation(extent={{280,-330},{300,-310}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -296,18 +296,18 @@ block Dampers final realFalse=1) "Ensure heating damper is closed when it is in cooling or deadband state" annotation (Placement(transformation(extent={{20,-310},{40,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Ensure heating damper is closed when it is in cooling or deadband state" annotation (Placement(transformation(extent={{240,-290},{260,-270}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax1( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{20,190},{40,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax1( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{20,150},{40,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Nominal flow" annotation (Placement(transformation(extent={{80,170},{100,190}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Overrides.mo index 10fa0e460a2..0d31fbf1fe1 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Overrides.mo @@ -97,11 +97,11 @@ block Overrides "Software switches to override setpoints" final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-40,130},{-20,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{28,150},{48,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{62,190},{82,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi "Airflow setpoint after considering override" + Buildings.Controls.OBC.CDL.Reals.Switch swi "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{100,30},{120,50}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 "Check if the airflow setpoint should be overrided" annotation (Placement(transformation(extent={{-20,50},{0,70}}))); @@ -127,12 +127,12 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-90},{100,-70}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt5( @@ -146,7 +146,7 @@ block Overrides "Software switches to override setpoints" final realTrue=VHeaMax_flow) "Force zone airflow setpoint to zone heating maximum flow" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 + Buildings.Controls.OBC.CDL.Reals.Add add4 "Add up two inputs" annotation (Placement(transformation(extent={{-6,110},{14,130}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -174,13 +174,13 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-190},{-20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add5 + Buildings.Controls.OBC.CDL.Reals.Add add5 "Add up inputs" annotation (Placement(transformation(extent={{20,-170},{40,-150}}))); Buildings.Controls.OBC.CDL.Logical.Or or4 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-210},{20,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-210},{100,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/SystemRequests.mo index 87c255f6bc0..633a1d356d6 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/SystemRequests.mo @@ -144,27 +144,27 @@ block SystemRequests "Output system requests for dual-duct unit using mixing con iconTransformation(extent={{100,-200},{140,-160}}))); protected - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,330},{-60,350}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,290},{-60,310}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-160,60},{-140,80}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,240},{-60,260}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -175,18 +175,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,60},{40,80}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-140,160},{-120,180}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-140,120},{-120,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,330},{-100,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,290},{-100,310}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -236,35 +236,35 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-80,80},{-60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-40,190},{-20,210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr7( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr7( final t=thrTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr8( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr8( final t=twoTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr9( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr9( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-180,-340},{-160,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr10( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr10( final t=0.95, final h=looHys) "Check if heating loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,-160},{-60,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr11( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr11( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -275,18 +275,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt5 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,-340},{40,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-160,-240},{-140,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai4( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai4( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-160,-280},{-140,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-120,-70},{-100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub4 + Buildings.Controls.OBC.CDL.Reals.Subtract sub4 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-120,-110},{-100,-90}}))); Buildings.Controls.OBC.CDL.Logical.And and6 @@ -341,23 +341,23 @@ protected final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-80,-320},{-60,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu2(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu2(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-80,-240},{-60,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu3(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu3(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-80,-280},{-60,-260}}))); Buildings.Controls.OBC.CDL.Logical.And and10 "Logical and" annotation (Placement(transformation(extent={{-40,-210},{-20,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr12( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr12( final t=0.15, final h=looHys) "Check if heating loop signal is greater than 0.15" annotation (Placement(transformation(extent={{-80,-400},{-60,-380}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Hold the true input" annotation (Placement(transformation(extent={{0,-400},{20,-380}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.01, final h=looHys) "Check if the heating loop output is less than threshold" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/ActiveAirFlow.mo index 4f8a0e83e7f..7b0f443d1eb 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/ActiveAirFlow.mo @@ -6,12 +6,12 @@ model ActiveAirFlow final VHeaMax_flow=0.4) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -20,7 +20,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Alarms.mo index 862131e8c1e..8e721693a1d 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Alarms.mo @@ -8,17 +8,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{60,30},{80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooDisAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooDisAir( final duration=7200, final offset=0.1, final height=0.3) "Cooling duct discharge airflow rate" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -30,14 +30,14 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{0,10},{20,30}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse colDammSta( final width=0.5, final period=7500) "Cooling duct damper open and close status" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos1( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -50,7 +50,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean input to real output" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Damper position" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse heaDammSta( @@ -58,7 +58,7 @@ model Alarms "Validation of model that generates alarms" final period=7500) "Heating duct damper open and close status" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaDisAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaDisAir( final duration=7200, final offset=0.1, final height=0.3) "Heating duct discharge airflow rate" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Dampers.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Dampers.mo index 05ab0892948..831f7e6f705 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Dampers.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Dampers.mo @@ -7,29 +7,29 @@ model Dampers final VHeaMax_flow=0.06, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-90},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,100},{-80,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VColDuc( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VColDuc( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) @@ -40,18 +40,18 @@ model Dampers final period=7200) "Cold air handling unit status" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSup( final k=273.15 + 25) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActHeaMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActHeaMax_flow( final k=0.07) "Active heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); @@ -61,7 +61,7 @@ model Dampers final shift=5000) "Hot air handling unit status" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VHotDuc( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VHotDuc( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Overrides.mo index 6bdbb557c4d..495c1ed8422 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/Overrides.mo @@ -6,17 +6,17 @@ model Overrides "Validation of model that overrides control" final VCooMax_flow=0.9, final VHeaMax_flow=0.8) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooDamPos( final duration=3600, final height=0.5, final offset=0.5) "Cooling damper position setpoint" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, startTime=1000) "Override flow setpoint" @@ -24,11 +24,11 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -36,16 +36,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,0},{20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaDamPos( final duration=3600, final height=0.5, final offset=0.5) "Heating damper position setpoint" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -53,7 +53,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-60},{20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round3(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/SystemRequests.mo index c397e709e64..df82c772f7b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Subsequences/Validation/SystemRequests.mo @@ -7,7 +7,7 @@ model SystemRequests final looHys=0.01, final damPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-22},{80,18}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -15,30 +15,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TZonCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,100},{0,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,50},{0,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDucAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDucAirSet( final height=0.9, final duration=7200, final offset=0.1) "Cold-duct airflow rate setpoint" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDucAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDucAirRate( final duration=7200, final offset=0.1, final height=0.3) "Cold duct airflow rate" annotation (Placement(transformation(extent={{-20,10},{0,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDamPos( final duration=3000, final height=-0.7, final offset=0.7) "Cold-duct damper position" @@ -50,7 +50,7 @@ model SystemRequests annotation (Placement(transformation(extent={{-60,130},{-40,150}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-20,130},{0,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine1( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine1( final freqHz=1/7200, final offset=293.15) "Generate data for setpoint" @@ -66,25 +66,25 @@ model SystemRequests annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=0.9, final duration=3600, final startTime=3600) "Heating loop signal" annotation (Placement(transformation(extent={{-20,-100},{0,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDucAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDucAirSet( final height=0.9, final duration=7200, final offset=0.1) "Hot-duct airflow rate setpoint" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDucAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDucAirRate( final duration=7200, final offset=0.1, final height=0.3) "Hot duct airflow rate" annotation (Placement(transformation(extent={{-20,-140},{0,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDamPos( final duration=3600, final height=0.7, startTime=3600) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Validation/Controller.mo index 1fed38e793a..9c32412855b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctMixConInletSensor/Validation/Controller.mo @@ -17,13 +17,13 @@ model Controller final VAreMin_flow=0) "Dual duct unit controller" annotation (Placement(transformation(extent={{100,40},{120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,210},{-100,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -36,11 +36,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,150},{-60,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,190},{-60,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,170},{-100,190}}))); @@ -49,7 +49,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,130},{-100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -59,27 +59,27 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colSupAirTem( final height=2, final duration=43200, final offset=273.15 + 14) "Cold-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VColDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VColDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Cold duct airflow rate" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -88,11 +88,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveColDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveColDam( final height=2, final duration=5000, startTime=60000) "Override cold-duct damper position" @@ -100,7 +100,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-150},{-20,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-150},{-60,-130}}))); @@ -109,7 +109,7 @@ model Controller final period=73200, final shift=18800) "Cooling supply fan status" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveHotDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveHotDam( final height=2, final duration=5000, final startTime=60000) "Override hot-duct damper position" @@ -117,7 +117,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-180},{-20,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-180},{-60,-160}}))); @@ -126,18 +126,18 @@ model Controller final period=73200, final shift=18800) "Heating supply fan status" annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VHotDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VHotDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Hot duct airflow rate" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotSupAirTem( final height=2, final duration=43200, final offset=273.15 + 24) "Hot-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set(final k=894) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set(final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/ActiveAirFlow.mo index 2ddb0f3561b..e8c06760ef2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/ActiveAirFlow.mo @@ -67,7 +67,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{40,80},{60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{100,70},{120,90}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal heaMaxFlo( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Alarms.mo index 4612747cef2..ab6cefff068 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Alarms.mo @@ -116,11 +116,11 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" annotation (Placement(transformation(extent={{240,-440},{280,-400}}), iconTransformation(extent={{100,-190},{140,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,380},{-160,400}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,410},{-100,430}}))); @@ -128,16 +128,16 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,410},{-60,430}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,330},{-160,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,280},{-100,300}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,300},{-160,320}}))); @@ -162,11 +162,11 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,330},{100,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,240},{-100,260}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,240},{-60,260}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -195,10 +195,10 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,290},{120,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) if have_duaSen "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,-90},{-180,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) if have_duaSen "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,-90},{-140,-70}}))); @@ -209,7 +209,7 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final delayTime=fanOffTim) if have_duaSen "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,-70},{40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) if have_duaSen "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); @@ -232,7 +232,7 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final delayTime=leaFloTim) if have_duaSen "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,-200},{40,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-240},{-180,-220}}))); @@ -251,11 +251,11 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final integerTrue=4) if have_duaSen "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,-200},{160,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMaxFlo( final k=VHeaMax_flow) if have_duaSen "Heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,-320},{-180,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3(final k=0.1) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3(final k=0.1) if have_duaSen "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,-320},{-140,-300}}))); @@ -266,7 +266,7 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final delayTime=fanOffTim) if have_duaSen "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,-300},{40,-280}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=floHys) if have_duaSen "Check if measured airflow is greater than threshold" @@ -290,7 +290,7 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final delayTime=leaFloTim) if have_duaSen "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{20,-430},{40,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam1( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" @@ -310,16 +310,16 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final integerTrue=4) if have_duaSen "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,-430},{160,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo1( final k=VCooMax_flow) if not have_duaSen "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-180,140},{-160,160}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai4( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai4( final k=0.1) if not have_duaSen "Percentage of the setpoint" annotation (Placement(transformation(extent={{-140,140},{-120,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre3( + Buildings.Controls.OBC.CDL.Reals.Greater gre3( final h=floHys) if not have_duaSen "Check if measured airflow is greater than threshold" @@ -371,7 +371,7 @@ block Alarms "Generate alarms of snap-acting controlled dual-duct terminal unit" final integerTrue=4) if not have_duaSen "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,20},{160,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 if have_duaSen + Buildings.Controls.OBC.CDL.Reals.Add add2 if have_duaSen "Total discharge airflow" annotation (Placement(transformation(extent={{-140,-30},{-120,-10}}))); Buildings.Controls.OBC.CDL.Logical.TrueDelay truDel8( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersDualSensors.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersDualSensors.mo index 1ceb90b3494..d7bfad56a61 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersDualSensors.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersDualSensors.mo @@ -162,10 +162,10 @@ block DampersDualSensors Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-60,190},{-40,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,240},{-140,260}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCooDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conCooDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -175,67 +175,67 @@ block DampersDualSensors final y_reset=0) "Cooling damper position controller" annotation (Placement(transformation(extent={{280,190},{300,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cold duct airflow setpoint" annotation (Placement(transformation(extent={{100,230},{120,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{40,260},{60,280}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,270},{-260,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,270},{-200,290}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-280,210},{-260,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-120,160},{-100,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,160},{-140,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooDamPos + Buildings.Controls.OBC.CDL.Reals.Switch cooDamPos "Output cooling damper position" annotation (Placement(transformation(extent={{280,20},{300,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{240,120},{260,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{240,190},{260,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer1( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,-170},{-260,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-280,-230},{-260,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne1( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,-170},{-200,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin1 + Buildings.Controls.OBC.CDL.Reals.Line lin1 "Active airflow setpoint for heating" annotation (Placement(transformation(extent={{-160,-200},{-140,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,-130},{-140,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is less than room temperature" annotation (Placement(transformation(extent={{-120,-130},{-100,-110}}))); Buildings.Controls.OBC.CDL.Logical.And and1 "Logical and" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{20,-130},{40,-110}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 @@ -261,12 +261,12 @@ block DampersDualSensors final samplePeriod=samplePeriod) "Sample the cooling loop output" annotation (Placement(transformation(extent={{-220,40},{-200,60}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-180,40},{-160,60}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-180,-50},{-160,-30}}))); @@ -276,20 +276,20 @@ block DampersDualSensors Buildings.Controls.OBC.CDL.Logical.Latch lat1 "Changing from heating state to deadband" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Cold duct airflow setpoint when it is in deadband state" annotation (Placement(transformation(extent={{20,40},{40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer2( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Hot duct airflow setpoint when it is in deadband state" annotation (Placement(transformation(extent={{20,-40},{40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "Output active hot duct airflow setpoint" annotation (Placement(transformation(extent={{80,-80},{100,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conHeaDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conHeaDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -299,16 +299,16 @@ block DampersDualSensors final y_reset=0) "Heating damper position controller" annotation (Placement(transformation(extent={{280,-110},{300,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaDamPos + Buildings.Controls.OBC.CDL.Reals.Switch heaDamPos "Output heating damper position" annotation (Placement(transformation(extent={{280,-280},{300,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor1 "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{240,-180},{260,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor1 + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor1 "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{240,-110},{260,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{80,0},{100,20}}))); @@ -317,7 +317,7 @@ block DampersDualSensors Buildings.Controls.OBC.CDL.Logical.Not not3 "Not proven on" annotation (Placement(transformation(extent={{180,-10},{200,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Make sure heating damper is closed when it is in cooling state" annotation (Placement(transformation(extent={{180,-80},{200,-60}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea( @@ -325,7 +325,7 @@ block DampersDualSensors final realFalse=1) "Ensure heating damper closed when it is in cooling state" annotation (Placement(transformation(extent={{80,-150},{100,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Make sure heating damper is closed when it is in cooling state" annotation (Placement(transformation(extent={{220,-250},{240,-230}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1( @@ -333,24 +333,24 @@ block DampersDualSensors final realFalse=1) "Ensure cooling damper closed when it is in heating state" annotation (Placement(transformation(extent={{40,140},{60,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul2 + Buildings.Controls.OBC.CDL.Reals.Multiply mul2 "Make sure cooling damper is closed when it is in heating state" annotation (Placement(transformation(extent={{160,220},{180,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul3 + Buildings.Controls.OBC.CDL.Reals.Multiply mul3 "Make sure cooling damper is closed when it is in heating state" annotation (Placement(transformation(extent={{180,50},{200,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Total discharge airflow setpoint" annotation (Placement(transformation(extent={{260,280},{280,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax1( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{140,140},{160,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax1( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{140,180},{160,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Nominal flow" annotation (Placement(transformation(extent={{180,160},{200,180}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersSingleSensors.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersSingleSensors.mo index 243d8a98e1b..3f3d11e1029 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersSingleSensors.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/DampersSingleSensors.mo @@ -122,10 +122,10 @@ block DampersSingleSensors annotation (Placement(transformation(extent={{320,-220},{360,-180}}), iconTransformation(extent={{100,-200},{140,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,200},{-140,220}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCooDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conCooDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -135,39 +135,39 @@ block DampersSingleSensors final y_reset=0) "Cooling damper position controller" annotation (Placement(transformation(extent={{110,90},{130,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,230},{-260,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,230},{-200,250}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-280,170},{-260,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch damPos "Output damper position" + Buildings.Controls.OBC.CDL.Reals.Switch damPos "Output damper position" annotation (Placement(transformation(extent={{160,0},{180,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{20,30},{40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{20,90},{40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer1( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,80},{-260,100}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-280,20},{-260,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne1( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,80},{-200,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin1 + Buildings.Controls.OBC.CDL.Reals.Line lin1 "Active airflow setpoint for heating" annotation (Placement(transformation(extent={{-160,50},{-140,70}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 @@ -193,12 +193,12 @@ block DampersSingleSensors final samplePeriod=samplePeriod) "Sample the cooling loop output" annotation (Placement(transformation(extent={{-220,-140},{-200,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-160,-140},{-140,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-160,-250},{-140,-230}}))); @@ -208,30 +208,30 @@ block DampersSingleSensors Buildings.Controls.OBC.CDL.Logical.Latch lat1 "Changing from heating state to deadband" annotation (Placement(transformation(extent={{-40,-230},{-20,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooFloSet + Buildings.Controls.OBC.CDL.Reals.Switch cooFloSet "Flow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{-40,170},{-20,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaFloSet + Buildings.Controls.OBC.CDL.Reals.Switch heaFloSet "Flow setpoint when it is in heating state" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 "Check if any air handler is proven on" annotation (Placement(transformation(extent={{80,0},{100,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{80,-170},{100,-150}}))); Buildings.Controls.OBC.CDL.Logical.Or or3 "Check if it is in cooling state or in deadband that switched from cooling state" annotation (Placement(transformation(extent={{80,-110},{100,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch cooDamPos "Cooling damper position" + Buildings.Controls.OBC.CDL.Reals.Switch cooDamPos "Cooling damper position" annotation (Placement(transformation(extent={{280,-110},{300,-90}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea( final realTrue=0, final realFalse=1) "Ensure cooling damper closed when the cooling air handler is not proven on" annotation (Placement(transformation(extent={{80,-70},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Make sure cooling damper is closed when the cooling air handler is not proven on" annotation (Placement(transformation(extent={{220,-80},{240,-60}}))); Buildings.Controls.OBC.CDL.Logical.Or or4 @@ -242,10 +242,10 @@ block DampersSingleSensors final realFalse=1) "Ensure heating damper closed when the heating air handler is not proven on" annotation (Placement(transformation(extent={{80,-270},{100,-250}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul2 + Buildings.Controls.OBC.CDL.Reals.Multiply mul2 "Make sure heating damper is closed when the heating air handler is not proven on" annotation (Placement(transformation(extent={{220,-180},{240,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch heaDamPos + Buildings.Controls.OBC.CDL.Reals.Switch heaDamPos "Heating damper position" annotation (Placement(transformation(extent={{280,-210},{300,-190}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -254,15 +254,15 @@ block DampersSingleSensors Buildings.Controls.OBC.CDL.Logical.And and4 "Check if heating damper is opening" annotation (Placement(transformation(extent={{280,-150},{300,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax1( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{-100,30},{-80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax1( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{-100,70},{-80,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Nominal flow" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Overrides.mo index 162ef726b47..5f4762d9031 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Overrides.mo @@ -95,11 +95,11 @@ block Overrides "Software switches to override setpoints" final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-40,130},{-20,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{28,150},{48,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{62,190},{82,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi "Airflow setpoint after considering override" + Buildings.Controls.OBC.CDL.Reals.Switch swi "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{100,30},{120,50}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 "Check if the airflow setpoint should be overrided" annotation (Placement(transformation(extent={{-20,50},{0,70}}))); @@ -125,12 +125,12 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-90},{100,-70}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt5( @@ -144,7 +144,7 @@ block Overrides "Software switches to override setpoints" final realTrue=VHeaMax_flow) "Force zone airflow setpoint to zone heating maximum flow" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 + Buildings.Controls.OBC.CDL.Reals.Add add4 "Add up two inputs" annotation (Placement(transformation(extent={{-6,110},{14,130}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 @@ -172,13 +172,13 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,-190},{-20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add5 + Buildings.Controls.OBC.CDL.Reals.Add add5 "Add up inputs" annotation (Placement(transformation(extent={{20,-170},{40,-150}}))); Buildings.Controls.OBC.CDL.Logical.Or or4 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,-210},{20,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,-210},{100,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/SystemRequests.mo index 78d0f4f0f83..88374ab8c02 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/SystemRequests.mo @@ -156,27 +156,27 @@ block SystemRequests "Output system requests for VAV terminal unit with reheat" iconTransformation(extent={{100,-200},{140,-160}}))); protected - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,330},{-60,350}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-80,290},{-60,310}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-160,60},{-140,80}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,240},{-60,260}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -187,18 +187,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,60},{40,80}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-140,160},{-120,180}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-140,120},{-120,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,330},{-100,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-120,290},{-100,310}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -248,35 +248,35 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-80,80},{-60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-40,190},{-20,210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr7( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr7( final t=thrTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr8( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr8( final t=twoTemDif, final h=dTHys) "Check if zone temperature is less than heating setpoint by threshold" annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr9( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr9( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-180,-340},{-160,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr10( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr10( final t=0.95, final h=looHys) "Check if heating loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-80,-160},{-60,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr11( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr11( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -287,18 +287,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt5 "Convert boolean to integer" annotation (Placement(transformation(extent={{20,-340},{40,-320}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai3( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-160,-240},{-140,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai4( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai4( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-160,-280},{-140,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-120,-70},{-100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub4 + Buildings.Controls.OBC.CDL.Reals.Subtract sub4 "Calculate difference between zone temperature and heating setpoint" annotation (Placement(transformation(extent={{-120,-110},{-100,-90}}))); Buildings.Controls.OBC.CDL.Logical.And and6 @@ -353,23 +353,23 @@ protected final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-80,-320},{-60,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu2(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu2(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-80,-240},{-60,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu3(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu3(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-80,-280},{-60,-260}}))); Buildings.Controls.OBC.CDL.Logical.And and10 "Logical and" annotation (Placement(transformation(extent={{-40,-210},{-20,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr12( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr12( final t=0.15, final h=looHys) "Check if heating loop signal is greater than 0.15" annotation (Placement(transformation(extent={{-80,-400},{-60,-380}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Hold the true input" annotation (Placement(transformation(extent={{0,-400},{20,-380}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=0.01, final h=looHys) "Check if the heating loop output is less than threshold" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/ActiveAirFlow.mo index cc379d945d4..c2b5b39bbfb 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/ActiveAirFlow.mo @@ -6,12 +6,12 @@ model ActiveAirFlow final VHeaMax_flow=0.4) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -20,7 +20,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Alarms.mo index f4cc246f3b0..7d6ca262bf3 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Alarms.mo @@ -17,17 +17,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{80,-60},{100,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-100,90},{-80,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooDisAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooDisAir( final duration=7200, final offset=0.1, final height=0.3) "Cooling duct discharge airflow rate" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -39,14 +39,14 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{-20,10},{0,30}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse colDammSta( final width=0.5, final period=7500) "Cooling duct damper open and close status" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos1( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -59,7 +59,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean input to real output" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Damper position" annotation (Placement(transformation(extent={{-20,-90},{0,-70}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse heaDammSta( @@ -67,7 +67,7 @@ model Alarms "Validation of model that generates alarms" final period=7500) "Heating duct damper open and close status" annotation (Placement(transformation(extent={{-100,-80},{-80,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaDisAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaDisAir( final duration=7200, final offset=0.1, final height=0.3) "Heating duct discharge airflow rate" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersDualSensors.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersDualSensors.mo index 238cb1fc1e0..a80410dbec2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersDualSensors.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersDualSensors.mo @@ -8,29 +8,29 @@ model DampersDualSensors final kDam=1, final samplePeriod=120) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-90},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,100},{-80,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VColDuc( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VColDuc( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) @@ -41,18 +41,18 @@ model DampersDualSensors final period=7200) "Cold air handling unit status" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSup( final k=273.15 + 25) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActHeaMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActHeaMax_flow( final k=0.07) "Active heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); @@ -62,7 +62,7 @@ model DampersDualSensors final shift=5000) "Hot air handling unit status" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VHotDuc( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VHotDuc( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersSingleSensors.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersSingleSensors.mo index d27d664a53c..35cd6f2c34d 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersSingleSensors.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/DampersSingleSensors.mo @@ -8,21 +8,21 @@ model DampersSingleSensors final kDam=1, final samplePeriod=120) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-90},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,100},{-80,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VDis( final offset=0.015, final amplitude=0.002, final freqHz=1/3600) "Discharge airflow rate" @@ -32,14 +32,14 @@ model DampersSingleSensors final period=7200) "Cold air handling unit status" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActHeaMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActHeaMax_flow( final k=0.07) "Active heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Overrides.mo index 6bc02eaaf7d..099b3f9098e 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/Overrides.mo @@ -6,17 +6,17 @@ model Overrides "Validation of model that overrides control" final VCooMax_flow=0.9, final VHeaMax_flow=0.8) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp cooDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp cooDamPos( final duration=3600, final height=0.5, final offset=0.5) "Cooling damper position setpoint" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, startTime=1000) "Override flow setpoint" @@ -24,11 +24,11 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -36,16 +36,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,0},{20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaDamPos( final duration=3600, final height=0.5, final offset=0.5) "Heating damper position setpoint" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, startTime=1000) "Override damper position" @@ -53,7 +53,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-60},{20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round3(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/SystemRequests.mo index b37dc23174b..0d7a64e585a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Subsequences/Validation/SystemRequests.mo @@ -8,7 +8,7 @@ model SystemRequests final looHys=0.01, final damPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-20},{80,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -16,30 +16,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TZonCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,120},{0,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDucAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDucAirSet( final height=0.9, final duration=7200, final offset=0.1) "Cold-duct airflow rate setpoint" annotation (Placement(transformation(extent={{-60,50},{-40,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDucAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDucAirRate( final duration=7200, final offset=0.1, final height=0.3) "Cold duct airflow rate" annotation (Placement(transformation(extent={{-20,30},{0,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colDamPos( final duration=3000, final height=-0.7, final offset=0.7) "Cold-duct damper position" @@ -51,7 +51,7 @@ model SystemRequests annotation (Placement(transformation(extent={{-60,150},{-40,170}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-20,150},{0,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine1( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine1( final freqHz=1/7200, final offset=293.15) "Generate data for setpoint" @@ -67,34 +67,34 @@ model SystemRequests annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" annotation (Placement(transformation(extent={{-40,-40},{-20,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=0.9, final duration=3600, final startTime=3600) "Heating loop signal" annotation (Placement(transformation(extent={{0,-90},{20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDucAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDucAirSet( final height=0.9, final duration=7200, final offset=0.1) "Hot-duct airflow rate setpoint" annotation (Placement(transformation(extent={{-60,-110},{-40,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDucAirRate( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDucAirRate( final duration=7200, final offset=0.1, final height=0.3) "Hot duct airflow rate" annotation (Placement(transformation(extent={{-20,-130},{0,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotDamPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotDamPos( final duration=3600, final height=0.7, startTime=3600) "Hot-duct damper position" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(final t=0.01) + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(final t=0.01) "Check if damper is open" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1(final t=0.01) + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1(final t=0.01) "Check if damper is open" annotation (Placement(transformation(extent={{-20,-170},{0,-150}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Validation/Controller.mo index 80223cea7ef..31faa3305a0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/DualDuctSnapActing/Validation/Controller.mo @@ -18,13 +18,13 @@ model Controller final VAreMin_flow=0) "Dual duct unit controller" annotation (Placement(transformation(extent={{100,40},{120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,210},{-100,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -37,11 +37,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,150},{-60,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,190},{-60,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,170},{-100,190}}))); @@ -50,7 +50,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,130},{-100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -60,27 +60,27 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp colSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp colSupAirTem( final height=2, final duration=43200, final offset=273.15 + 14) "Cold-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VColDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VColDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Cold duct airflow rate" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -89,11 +89,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveColDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveColDam( final height=2, final duration=5000, startTime=60000) "Override cold-duct damper position" @@ -101,7 +101,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-150},{-20,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-150},{-60,-130}}))); @@ -110,7 +110,7 @@ model Controller final period=73200, final shift=18800) "Cooling supply fan status" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveHotDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveHotDam( final height=2, final duration=5000, final startTime=60000) "Override hot-duct damper position" @@ -118,7 +118,7 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-180},{-20,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-180},{-60,-160}}))); @@ -127,18 +127,18 @@ model Controller final period=73200, final shift=18800) "Heating supply fan status" annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin VHotDis_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin VHotDis_flow( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Hot duct airflow rate" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp hotSupAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp hotSupAirTem( final height=2, final duration=43200, final offset=273.15 + 24) "Hot-duct supply air temperature from air handling unit" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set( final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,70},{-100,90}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/ActiveAirFlow.mo index 428a91c5e80..eb2e8d4f502 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/ActiveAirFlow.mo @@ -55,7 +55,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{20,0},{40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{80,-60},{100,-40}}))); Buildings.Controls.OBC.CDL.Integers.Equal ifOcc diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Alarms.mo index 696a4d2ee7e..6bb5f5f34f2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Alarms.mo @@ -149,11 +149,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan annotation (Placement(transformation(extent={{240,-390},{280,-350}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,370},{-160,390}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,400},{-100,420}}))); @@ -161,16 +161,16 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,400},{-60,420}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,320},{-160,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,270},{-100,290}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,290},{-160,310}}))); @@ -194,11 +194,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,320},{100,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,230},{-60,250}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -227,11 +227,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,280},{120,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,170},{-180,190}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,170},{-140,190}}))); @@ -242,7 +242,7 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{0,190},{20,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-100,190},{-80,210}}))); @@ -264,7 +264,7 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-120},{-180,-100}}))); @@ -281,19 +281,19 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,-80},{160,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-320},{-100,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-17) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-360},{-160,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les2( + Buildings.Controls.OBC.CDL.Reals.Less les2( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-390},{-100,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=-8) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-430},{-160,-410}}))); @@ -344,11 +344,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan if have_hotWatCoi "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,-430},{120,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt3( final k=hotWatRes) if have_hotWatCoi "Importance multiplier for hot water reset control" annotation (Placement(transformation(extent={{-120,-460},{-100,-440}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2 if have_hotWatCoi "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,-460},{-60,-440}}))); @@ -363,16 +363,16 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with constan final delayTime=valCloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-190},{60,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloVal( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloVal( final t=valPosHys, final h=0.5*valPosHys) "Check if valve position is near zero" annotation (Placement(transformation(extent={{-200,-170},{-180,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=3) "AHU supply temperature plus 3 degree" annotation (Placement(transformation(extent={{-200,-240},{-180,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=dTHys) "Discharge temperature greate than AHU supply temperature by a threshold" annotation (Placement(transformation(extent={{-140,-210},{-120,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/DamperValves.mo index d35449704f5..29de162a19a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/DamperValves.mo @@ -178,55 +178,55 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,170},{-140,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cooling airflow according to cooling control signal" annotation (Placement(transformation(extent={{100,160},{120,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{20,190},{40,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,200},{-260,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,200},{-200,220}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-220,140},{-200,160}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-120,60},{-100,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,60},{-140,80}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-260,-140},{-240,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-260,-30},{-240,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=dTDisZonSetMax) "Maximum heating discharge temperature" annotation (Placement(transformation(extent={{-260,-100},{-240,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal( final k=1) "Constant real value" annotation (Placement(transformation(extent={{-180,-100},{-160,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Line conTDisHeaSet + Buildings.Controls.OBC.CDL.Reals.Line conTDisHeaSet "Discharge air temperature for heating" annotation (Placement(transformation(extent={{-120,-70},{-100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conVal( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conVal( final controllerType=controllerTypeVal, final k=kVal, final Ti=TiVal, @@ -237,7 +237,7 @@ block DamperValves u_m(final unit="K", displayUnit="degC")) "Hot water valve controller" annotation (Placement(transformation(extent={{-60,-100},{-40,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Hot water valve position, close the valve when the zone is not in heating state" annotation (Placement(transformation(extent={{100,-140},{120,-120}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant unOcc( @@ -247,19 +247,19 @@ block DamperValves Buildings.Controls.OBC.CDL.Integers.Equal isUno "Output true if the operation mode is unoccupied" annotation (Placement(transformation(extent={{100,-200},{120,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 "Hot water valve position" + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Hot water valve position" annotation (Placement(transformation(extent={{280,-120},{300,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant nomFlow(final k= + Buildings.Controls.OBC.CDL.Reals.Sources.Constant nomFlow(final k= VCooMax_flow) "Nominal volume flow rate" annotation (Placement(transformation(extent={{160,110},{180,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{220,140},{240,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{220,80},{240,100}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -269,11 +269,11 @@ block DamperValves final y_reset=0) "Damper position controller" annotation (Placement(transformation(extent={{260,140},{280,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 "Air damper position" + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Air damper position" annotation (Placement(transformation(extent={{280,-10},{300,10}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Not in unoccupied mode" annotation (Placement(transformation(extent={{180,30},{200,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if the discharge airflow rate is less than minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{-260,-310},{-240,-290}}))); @@ -283,10 +283,10 @@ block DamperValves annotation (Placement(transformation(extent={{-200,-310},{-180,-290}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Hold fan On status" annotation (Placement(transformation(extent={{-100,-310},{-80,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=1.1) "Gain factor" annotation (Placement(transformation(extent={{-260,-380},{-240,-360}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre + Buildings.Controls.OBC.CDL.Reals.Greater gre "Check if the discharge airflow rate is greater than minimum outdoor airflow setpoint by 10%" annotation (Placement(transformation(extent={{-200,-350},{-180,-330}}))); Buildings.Controls.OBC.CDL.Logical.TrueDelay truDel1( @@ -334,11 +334,11 @@ block DamperValves final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-20,270},{0,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{60,290},{80,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{100,330},{120,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{160,240},{180,260}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Overrides.mo index 6ea4eb3891e..6ce27b0bf64 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Overrides.mo @@ -65,15 +65,15 @@ block Overrides "Software switches to override setpoints" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal opeDam( final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,110},{40,130}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,70},{100,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Valve position setpoint after considering override" annotation (Placement(transformation(extent={{80,-10},{100,10}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/SystemRequests.mo index 5e1aa0c03e4..d28e4337955 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/SystemRequests.mo @@ -151,34 +151,34 @@ block SystemRequests "Output system requests for parallel fan-powered terminal u iconTransformation(extent={{100,-100},{140,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-190},{-40,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,210},{-40,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,170},{-40,190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -189,18 +189,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-100,0},{-80,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,210},{-80,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,170},{-80,190}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -251,20 +251,20 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=thrTDis_1) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-150},{-120,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=thrTDis_2) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-190},{-120,-170}}))); @@ -292,7 +292,7 @@ protected final delayTime=durTimDisAir) if have_hotWatCoi "Check if it is more than threshold time" annotation (Placement(transformation(extent={{0,-190},{20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=0.95, final h=valPosHys) if have_hotWatCoi "Check if valve position is greater than 0.95" @@ -301,7 +301,7 @@ protected if have_hotWatCoi "Convert boolean to integer" annotation (Placement(transformation(extent={{0,-230},{20,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr6( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr6( final t=0.95, final h=0.85) if have_hotWatCoi "Check if valve position is greater than 0.95" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/ActiveAirFlow.mo index feb8c3d2e46..c83ebf25041 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/ActiveAirFlow.mo @@ -5,12 +5,12 @@ model ActiveAirFlow final VCooMax_flow=0.5) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -19,7 +19,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Alarms.mo index 0847d7abc8e..8540a72299d 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Alarms.mo @@ -9,17 +9,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{80,40},{100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -31,7 +31,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse damSta( @@ -42,7 +42,7 @@ model Alarms "Validation of model that generates alarms" final width=0.9, final period=7500) "Hot water plant status" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" @@ -57,17 +57,17 @@ model Alarms "Validation of model that generates alarms" final period=7500, shift=1000) "Terminal fan status" annotation (Placement(transformation(extent={{-100,30},{-80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, final startTime=3600) "Valve position" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/DamperValves.mo index 5ac0002310e..d1af0da27cf 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/DamperValves.mo @@ -7,20 +7,20 @@ model DamperValves final VCooMax_flow=0.09, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-90},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,90},{-80,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,10},{-80,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); @@ -29,43 +29,43 @@ model DamperValves final period=7200) "Cold air handling unit status" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-100,-30},{-80,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.01, final height=0.06) "Discharge airflow rate" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/3600) "Supply air temperature" annotation (Placement(transformation(extent={{-100,50},{-80,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSet( final k=273.15 + 20) "Zone heating setpoint" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TDis( final offset=273.15 + 13, final amplitude=1.2, final freqHz=1/3600) "Measured discharge air temperature" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOAMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOAMin_flow( final k=0.005) "Minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=3, final duration=90000) "Operation mode" @@ -73,14 +73,14 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-120},{0,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-20,130},{0,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, final startTime=1000) "Override flow setpoint" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Overrides.mo index 436613f6c42..7557b5b3c78 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/Overrides.mo @@ -4,12 +4,12 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.Overrides ove "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3600, final height=0.5, final offset=0.5) "Damper position setpoint" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -17,16 +17,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,90},{20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaValPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaValPos( final duration=3600, final height=0.5, final offset=0.5) "Heating valve position" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -34,7 +34,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/SystemRequests.mo index 5a2786a321f..b639174bf5f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Subsequences/Validation/SystemRequests.mo @@ -9,7 +9,7 @@ model SystemRequests final damPosHys=0.01, final valPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-50},{80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -17,30 +17,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TZonCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3000, final height=-0.7, final offset=0.7) "Damper position" @@ -50,17 +50,17 @@ model SystemRequests final period=7200) "After suppression" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Validation/Controller.mo index 19b6b78b126..964f49922e9 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanCVF/Validation/Controller.mo @@ -19,13 +19,13 @@ model Controller final VAreMin_flow=0) "Paralle-fan powered unit controller" annotation (Placement(transformation(extent={{100,70},{120,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -38,11 +38,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,210},{-60,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,190},{-100,210}}))); @@ -51,7 +51,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -61,21 +61,21 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,120},{-20,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin parFanFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin parFanFlo( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Parallel fan flow" annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -84,11 +84,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=5000, startTime=60000) "Override damper position" @@ -96,11 +96,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveTerFan( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveTerFan( final height=2, final duration=5000, final startTime=60000) "Override terminal fan control" @@ -108,11 +108,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/28800) "Supply air temperature from air handling unit" @@ -139,16 +139,16 @@ model Controller final period=7500) "AHU supply fan status" annotation (Placement(transformation(extent={{-80,-210},{-60,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin disFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin disFlo( final offset=1.3, final amplitude=0.6, final freqHz=1/28800) "Discharge airflow rate" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set(final k=894) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set(final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Controller.mo index 66456d63807..835a99d90d3 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Controller.mo @@ -508,7 +508,7 @@ block Controller Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean to real" annotation (Placement(transformation(extent={{160,210},{180,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Paralle fan airflow setpoint" annotation (Placement(transformation(extent={{200,230},{220,250}}))); Buildings.Controls.OBC.ASHRAE.G36.VentilationZones.Title24.Setpoints minFlo( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/ActiveAirFlow.mo index f827b000eff..6dc82c5b156 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/ActiveAirFlow.mo @@ -56,7 +56,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{20,0},{40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{80,-60},{100,-40}}))); Buildings.Controls.OBC.CDL.Integers.Equal ifOcc diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Alarms.mo index 52d1bacb098..a19e413c620 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Alarms.mo @@ -149,11 +149,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl annotation (Placement(transformation(extent={{240,-390},{280,-350}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,370},{-160,390}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,400},{-100,420}}))); @@ -161,16 +161,16 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,400},{-60,420}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,320},{-160,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,270},{-100,290}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,290},{-160,310}}))); @@ -194,11 +194,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,320},{100,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,230},{-60,250}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -227,11 +227,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,280},{120,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,170},{-180,190}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,170},{-140,190}}))); @@ -242,7 +242,7 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{0,190},{20,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-100,190},{-80,210}}))); @@ -264,7 +264,7 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-120},{-180,-100}}))); @@ -281,19 +281,19 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,-80},{160,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-320},{-100,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-17) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-360},{-160,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les2( + Buildings.Controls.OBC.CDL.Reals.Less les2( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-390},{-100,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(final p=-8.3) + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1(final p=-8.3) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-430},{-160,-410}}))); @@ -344,11 +344,11 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl if have_hotWatCoi "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,-430},{120,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt3( final k=hotWatRes) if have_hotWatCoi "Importance multiplier for hot water reset control" annotation (Placement(transformation(extent={{-120,-460},{-100,-440}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2 if have_hotWatCoi "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,-460},{-60,-440}}))); @@ -363,16 +363,16 @@ block Alarms "Generate alarms of parallel fan-powered terminal unit with variabl final delayTime=valCloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-190},{60,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloVal( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloVal( final t=valPosHys, final h=0.5*valPosHys) "Check if valve position is near zero" annotation (Placement(transformation(extent={{-200,-170},{-180,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=3) "AHU supply temperature plus 3 degree" annotation (Placement(transformation(extent={{-200,-240},{-180,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=dTHys) "Discharge temperature greate than AHU supply temperature by a threshold" annotation (Placement(transformation(extent={{-140,-210},{-120,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/DamperValves.mo index 77e033bd19d..f89bf52ea66 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/DamperValves.mo @@ -189,47 +189,47 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-80,250},{-60,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-180,300},{-160,320}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cooling airflow according to cooling control signal" annotation (Placement(transformation(extent={{60,290},{80,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{0,320},{20,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-300,330},{-280,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-240,330},{-220,350}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-240,270},{-220,290}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-200,190},{-180,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-240,190},{-220,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 "Hot water valve position" + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Hot water valve position" annotation (Placement(transformation(extent={{300,10},{320,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant nomFlow(final k= + Buildings.Controls.OBC.CDL.Reals.Sources.Constant nomFlow(final k= VCooMax_flow) "Nominal volume flow rate" annotation (Placement(transformation(extent={{60,240},{80,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{200,270},{220,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{200,210},{220,230}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -239,25 +239,25 @@ block DamperValves final y_reset=0) "Damper position controller" annotation (Placement(transformation(extent={{240,270},{260,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 "Air damper position" + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Air damper position" annotation (Placement(transformation(extent={{300,120},{320,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Line conTDisHeaSet + Buildings.Controls.OBC.CDL.Reals.Line conTDisHeaSet "Discharge air temperature for heating" annotation (Placement(transformation(extent={{-140,60},{-120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=dTDisZonSetMax) "Maximum heating discharge temperature" annotation (Placement(transformation(extent={{-280,30},{-260,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal( final k=0.5) "Constant real value" annotation (Placement(transformation(extent={{-200,30},{-180,50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-280,-10},{-260,10}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conVal( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conVal( final controllerType=controllerTypeVal, final k=kVal, final Ti=TiVal, @@ -268,26 +268,26 @@ block DamperValves u_m(final unit="K", displayUnit="degC")) "Hot water valve controller" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3(final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,100},{-260,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Hot water valve position, close the valve when the zone is not in heating state" annotation (Placement(transformation(extent={{80,-10},{100,10}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant occ( final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "Constant signal for occupied mode" annotation (Placement(transformation(extent={{-280,-190},{-260,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant minFan( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant minFan( final k=minRat) "Minimum fan rate" annotation (Placement(transformation(extent={{-280,-80},{-260,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "Gain factor" annotation (Placement(transformation(extent={{-240,-80},{-220,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub + Buildings.Controls.OBC.CDL.Reals.Subtract sub "Minimum outdoor airflow setpoint minus the half of minimum fan rate" annotation (Placement(transformation(extent={{-180,-60},{-160,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if primary discharge airflow rate is below threshold" annotation (Placement(transformation(extent={{-60,-100},{-40,-80}}))); @@ -300,62 +300,62 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and1 "It is in occupied mode and the zone is in cooling state" annotation (Placement(transformation(extent={{-60,-220},{-40,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if primary discharge airflow rate is above threshold" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "Parallel fan flow rate setpoint" annotation (Placement(transformation(extent={{260,-220},{280,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Fan flow rate setpoint" annotation (Placement(transformation(extent={{40,-160},{60,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 "Ensure positive value" + Buildings.Controls.OBC.CDL.Reals.Max max1 "Ensure positive value" annotation (Placement(transformation(extent={{100,-140},{120,-120}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean to real" annotation (Placement(transformation(extent={{100,-100},{120,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Parallel fan rate when the zone state is cooling" annotation (Placement(transformation(extent={{200,-120},{220,-100}}))); Buildings.Controls.OBC.CDL.Logical.Or cooHea "Cooling or heating state" annotation (Placement(transformation(extent={{-60,-310},{-40,-290}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "In deadband state" annotation (Placement(transformation(extent={{40,-310},{60,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi6 + Buildings.Controls.OBC.CDL.Reals.Switch swi6 "Parallel fan flow rate setpoint when the zone is in deadband state" annotation (Placement(transformation(extent={{220,-310},{240,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=floHys) "Check if primary discharge airflow rate setpoint is below threshold" annotation (Placement(transformation(extent={{-60,-270},{-40,-250}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean to real" annotation (Placement(transformation(extent={{40,-270},{60,-250}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Fan rate when zone is in deadband state" annotation (Placement(transformation(extent={{160,-280},{180,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Line heaFanRat + Buildings.Controls.OBC.CDL.Reals.Line heaFanRat "Parallel fan airflow setpoint when zone is in heating state" annotation (Placement(transformation(extent={{40,-420},{60,-400}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Ensure the fan flow rate setpoint is greater than minimum value" annotation (Placement(transformation(extent={{-180,-390},{-160,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal1( final k=0.5) "Constant real value" annotation (Placement(transformation(extent={{-60,-390},{-40,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal2( final k=1) "Constant real value" annotation (Placement(transformation(extent={{-180,-450},{-160,-430}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxFan( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxFan( final k=maxRat) "Maximum fan rate" annotation (Placement(transformation(extent={{-60,-450},{-40,-430}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea2 "Convert boolean to real" annotation (Placement(transformation(extent={{40,-360},{60,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul2 + Buildings.Controls.OBC.CDL.Reals.Multiply mul2 "Ensure zero rate when it is not in heating state" annotation (Placement(transformation(extent={{160,-380},{180,-360}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant uno( @@ -365,13 +365,13 @@ block DamperValves Buildings.Controls.OBC.CDL.Integers.Equal isUno "Output true if the operation mode is unoccupied" annotation (Placement(transformation(extent={{-180,-510},{-160,-490}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi7 + Buildings.Controls.OBC.CDL.Reals.Switch swi7 "Parallel fan flow rate setpoint" annotation (Placement(transformation(extent={{320,-250},{340,-230}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Not in unoccupied mode" annotation (Placement(transformation(extent={{200,150},{220,170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=floHys, final h=floHys/2) "Terminal fan command on status" @@ -409,11 +409,11 @@ block DamperValves final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-80,410},{-60,430}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{0,430},{20,450}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{40,470},{60,490}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi8 + Buildings.Controls.OBC.CDL.Reals.Switch swi8 "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{100,380},{120,400}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Overrides.mo index a43795d7dc5..d4a67916d68 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Overrides.mo @@ -65,15 +65,15 @@ block Overrides "Software switches to override setpoints" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal opeDam( final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,120},{40,140}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,80},{20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Valve position setpoint after considering override" annotation (Placement(transformation(extent={{80,0},{100,20}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/SystemRequests.mo index 1d02b142803..39efbdf54c0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/SystemRequests.mo @@ -152,34 +152,34 @@ block SystemRequests iconTransformation(extent={{100,-100},{140,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-190},{-40,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,210},{-40,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,170},{-40,190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -190,18 +190,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-100,0},{-80,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,210},{-80,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,170},{-80,190}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -252,20 +252,20 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=thrTDis_1) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-150},{-120,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=thrTDis_2) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-190},{-120,-170}}))); @@ -293,7 +293,7 @@ protected final delayTime=durTimDisAir) if have_hotWatCoi "Check if it is more than threshold time" annotation (Placement(transformation(extent={{0,-190},{20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=0.95, final h=valPosHys) if have_hotWatCoi "Check if valve position is greater than 0.95" @@ -302,7 +302,7 @@ protected if have_hotWatCoi "Convert boolean to integer" annotation (Placement(transformation(extent={{0,-230},{20,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr6( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr6( final t=0.95, final h=0.85) if have_hotWatCoi "Check if valve position is greater than 0.95" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/ActiveAirFlow.mo index c79ceb34b8d..fcbd3f06e1a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/ActiveAirFlow.mo @@ -5,12 +5,12 @@ model ActiveAirFlow final VCooMax_flow=0.5) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -19,7 +19,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Alarms.mo index d9844483be7..8414b6b0908 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Alarms.mo @@ -9,17 +9,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{80,40},{100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -31,7 +31,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse damSta( @@ -42,7 +42,7 @@ model Alarms "Validation of model that generates alarms" final width=0.9, final period=7500) "Hot water plant status" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" @@ -57,17 +57,17 @@ model Alarms "Validation of model that generates alarms" final period=7500, shift=1000) "Terminal fan status" annotation (Placement(transformation(extent={{-100,30},{-80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, final startTime=3600) "Valve position" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/DamperValves.mo index 24c4c2a99d2..99b874322aa 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/DamperValves.mo @@ -9,58 +9,58 @@ model DamperValves final maxRat=0.1, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-90},{100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,90},{-80,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-100,10},{-80,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-100,-30},{-80,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.01, final height=0.06) "Discharge airflow rate" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/3600) "Supply air temperature" annotation (Placement(transformation(extent={{-100,50},{-80,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSet( final k=273.15 + 20) "Zone heating setpoint" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TDis( final offset=273.15 + 13, final amplitude=1.2, final freqHz=1/3600) "Measured discharge air temperature" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VOAMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VOAMin_flow( final k=0.005) "Minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=3, final duration=90000) "Operation mode" @@ -68,16 +68,16 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-120},{0,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, final startTime=1000) "Override flow setpoint" annotation (Placement(transformation(extent={{-100,130},{-80,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-20,130},{0,150}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Overrides.mo index 93d426e5d64..c52f84ae70c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/Overrides.mo @@ -4,12 +4,12 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.Overrides ove "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3600, final height=0.5, final offset=0.5) "Damper position setpoint" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -17,16 +17,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,90},{20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaValPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaValPos( final duration=3600, final height=0.5, final offset=0.5) "Heating valve position" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -34,7 +34,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/SystemRequests.mo index c661aab9ff5..64d9e68fe65 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Subsequences/Validation/SystemRequests.mo @@ -9,7 +9,7 @@ model SystemRequests final damPosHys=0.01, final valPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-50},{80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -17,30 +17,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3000, final height=-0.7, final offset=0.7) "Damper position" @@ -50,17 +50,17 @@ model SystemRequests final period=7200) "After suppression" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Validation/Controller.mo index dfd1120c8a7..01d6f871b3b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/ParallelFanVVF/Validation/Controller.mo @@ -21,13 +21,13 @@ model Controller final VAreMin_flow=0) "Paralle-fan powered unit controller" annotation (Placement(transformation(extent={{100,70},{120,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -40,11 +40,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,210},{-60,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,190},{-100,210}}))); @@ -53,7 +53,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -63,21 +63,21 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,120},{-20,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin parFanFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin parFanFlo( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Parallel fan flow" annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -86,11 +86,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=5000, startTime=60000) "Override damper position" @@ -98,11 +98,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveTerFan( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveTerFan( final height=2, final duration=5000, final startTime=60000) "Override terminal fan control" @@ -110,11 +110,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/28800) "Supply air temperature from air handling unit" @@ -141,16 +141,16 @@ model Controller final period=7500) "AHU supply fan status" annotation (Placement(transformation(extent={{-80,-210},{-60,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin disFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin disFlo( final offset=1.3, final amplitude=0.6, final freqHz=1/28800) "Discharge airflow rate" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set(final k=894) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set(final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/ActiveAirFlow.mo index 8f213d1d4e3..37b8fdb7c70 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/ActiveAirFlow.mo @@ -85,10 +85,10 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{-20,120},{0,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{140,110},{160,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Maximum of inputs" annotation (Placement(transformation(extent={{-20,40},{0,60}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal heaMinFlo( @@ -103,32 +103,32 @@ protected final realTrue=VCooMax_flow) "Cooling maximum flow when input is true" annotation (Placement(transformation(extent={{40,-150},{60,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 + Buildings.Controls.OBC.CDL.Reals.Max max2 "Maximum of inputs" annotation (Placement(transformation(extent={{-20,-120},{0,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1 + Buildings.Controls.OBC.CDL.Reals.Multiply pro1 "Product of inputs" annotation (Placement(transformation(extent={{40,60},{60,80}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if it is warm-up or setback" annotation (Placement(transformation(extent={{-20,-50},{0,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up inputs" annotation (Placement(transformation(extent={{100,-30},{120,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 + Buildings.Controls.OBC.CDL.Reals.Add add1 "Active heating minimu flow setpoint" annotation (Placement(transformation(extent={{160,10},{180,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro2 + Buildings.Controls.OBC.CDL.Reals.Multiply pro2 "Product of inputs" annotation (Placement(transformation(extent={{40,-90},{60,-70}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal heaMaxFlo1( final realTrue=VHeaMax_flow) "Heating maximum flow when input is true" annotation (Placement(transformation(extent={{40,-190},{60,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{100,-170},{120,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 + Buildings.Controls.OBC.CDL.Reals.Add add4 "Active heating maximum flow setpoint" annotation (Placement(transformation(extent={{160,-130},{180,-110}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant setBacMod( @@ -154,11 +154,11 @@ protected Buildings.Controls.OBC.CDL.Integers.Equal ifSetBac "Check if current operation mode is setback mode" annotation (Placement(transformation(extent={{-120,-200},{-100,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMaxAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMaxAir( final k=VHeaMax_flow) "Heating maximum airflow" annotation (Placement(transformation(extent={{-100,-160},{-80,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMinAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMinAir( final k=VHeaMin_flow) "Heating minimum airflow" annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Alarms.mo index d96998d0a3f..63c28ab639b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Alarms.mo @@ -133,11 +133,11 @@ block Alarms "Generate alarms of terminal unit with reheat" annotation (Placement(transformation(extent={{240,-320},{280,-280}}), iconTransformation(extent={{100,-100},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,300},{-160,320}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,330},{-100,350}}))); @@ -145,15 +145,15 @@ block Alarms "Generate alarms of terminal unit with reheat" final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,330},{-60,350}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(t=floHys, + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,250},{-160,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,200},{-100,220}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,220},{-160,240}}))); @@ -178,11 +178,11 @@ block Alarms "Generate alarms of terminal unit with reheat" final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,250},{100,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,160},{-100,180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -211,11 +211,11 @@ block Alarms "Generate alarms of terminal unit with reheat" final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,210},{120,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,100},{-180,120}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,100},{-140,120}}))); @@ -226,7 +226,7 @@ block Alarms "Generate alarms of terminal unit with reheat" final delayTime=fanOffTim) "Check if the supply fan has been OFF more than threshold time" annotation (Placement(transformation(extent={{0,120},{20,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-100,120},{-80,140}}))); @@ -248,7 +248,7 @@ block Alarms "Generate alarms of terminal unit with reheat" final delayTime=leaFloTim) "Check if the air flow is above threshold by more than threshold time" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-50},{-180,-30}}))); @@ -265,19 +265,19 @@ block Alarms "Generate alarms of terminal unit with reheat" final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,-10},{160,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-250},{-100,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-17) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-290},{-160,-270}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les2( + Buildings.Controls.OBC.CDL.Reals.Less les2( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-320},{-100,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=-8) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-360},{-160,-340}}))); @@ -328,11 +328,11 @@ block Alarms "Generate alarms of terminal unit with reheat" if have_hotWatCoi "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,-360},{120,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt3( final k=hotWatRes) if have_hotWatCoi "Importance multiplier for hot water reset control" annotation (Placement(transformation(extent={{-120,-390},{-100,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2 if have_hotWatCoi "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,-390},{-60,-370}}))); @@ -347,16 +347,16 @@ block Alarms "Generate alarms of terminal unit with reheat" final delayTime=valCloTim) "Check if valve position is closed for more than threshold time" annotation (Placement(transformation(extent={{40,-120},{60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloVal( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloVal( final t=valPosHys, final h=0.5*valPosHys) "Check if valve position is near zero" annotation (Placement(transformation(extent={{-200,-100},{-180,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=3) "AHU supply temperature plus 3 degree" annotation (Placement(transformation(extent={{-200,-170},{-180,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=dTHys) "Discharge temperature greate than AHU supply temperature by a threshold" annotation (Placement(transformation(extent={{-140,-140},{-120,-120}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/DamperValves.mo index 065ede4782e..47e2124ca52 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/DamperValves.mo @@ -188,10 +188,10 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-60,140},{-40,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,190},{-140,210}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -201,10 +201,10 @@ block DamperValves final y_reset=0) "Damper position controller" annotation (Placement(transformation(extent={{280,140},{300,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cooling airflow according to cooling control signal" annotation (Placement(transformation(extent={{120,180},{140,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{20,210},{40,230}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 @@ -216,29 +216,29 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and2 "Check if current zone state is deadband" annotation (Placement(transformation(extent={{-120,40},{-100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Airflow setpoint when it is in deadband state" annotation (Placement(transformation(extent={{80,40},{100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin3 + Buildings.Controls.OBC.CDL.Reals.Line lin3 "Airflow setpoint when it is in heating state" annotation (Placement(transformation(extent={{-100,-360},{-80,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Acitive heating airflow rate" annotation (Placement(transformation(extent={{20,-330},{40,-310}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=dTHys) "Check if the discharge air temperature is greater than zone temperature by a threshold" annotation (Placement(transformation(extent={{-180,-290},{-160,-270}}))); - Buildings.Controls.OBC.CDL.Continuous.Line conTDisHeaSet + Buildings.Controls.OBC.CDL.Reals.Line conTDisHeaSet "Discharge air temperature for heating" annotation (Placement(transformation(extent={{-100,-170},{-80,-150}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Enable heating coil when it is in heating state, or the discharge air temperature is lower than minimum" annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Discharge airflow setpoint when heating coil is enabled" annotation (Placement(transformation(extent={{-40,-220},{-20,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conVal( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conVal( final controllerType=controllerTypeVal, final k=kVal, final Ti=TiVal, @@ -252,78 +252,78 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and1 "Occupied mode and discharge temperature is low" annotation (Placement(transformation(extent={{-120,-40},{-100,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,220},{-260,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,220},{-200,240}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-280,160},{-260,180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-120,110},{-100,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,110},{-140,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch watValPosUno "Output hot water valve position" + Buildings.Controls.OBC.CDL.Reals.Switch watValPosUno "Output hot water valve position" annotation (Placement(transformation(extent={{280,-110},{300,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch damPosUno "Output damper position" + Buildings.Controls.OBC.CDL.Reals.Switch damPosUno "Output damper position" annotation (Placement(transformation(extent={{280,-30},{300,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{240,70},{260,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{240,140},{260,160}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lowMin( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lowMin( final t=TDisMin, final h=dTHys) "Check if discharge air temperature is less than lowest discharge air temperature" annotation (Placement(transformation(extent={{-260,-40},{-240,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer2( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.8*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-260,-250},{-240,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal1( final k=0.5) "Constant real value" annotation (Placement(transformation(extent={{-280,-410},{-260,-390}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne2( final k=1) "Constant real value" annotation (Placement(transformation(extent={{-200,-410},{-180,-390}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=3) "Zone temperature plus threshold difference" annotation (Placement(transformation(extent={{-240,-310},{-220,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal( final k=0.5) "Constant real value" annotation (Placement(transformation(extent={{-180,-200},{-160,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-260,-140},{-240,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=dTDisZonSetMax) "Maximum heating discharge temperature" annotation (Placement(transformation(extent={{-260,-200},{-240,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant lowDisAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant lowDisAirTem( final k=TDisMin) "Lowest allowed discharge air temperature" annotation (Placement(transformation(extent={{-180,-250},{-160,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "Output hot water valve position in case of low discharge air temperature" annotation (Placement(transformation(extent={{100,-150},{120,-130}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant occMod( @@ -340,7 +340,7 @@ block DamperValves Buildings.Controls.OBC.CDL.Integers.Equal isUno "Output true if the operation mode is unoccupied" annotation (Placement(transformation(extent={{100,-450},{120,-430}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Ensure the discharge temperature being higher than the minimum" annotation (Placement(transformation(extent={{-100,-250},{-80,-230}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt(final k=1) @@ -373,13 +373,13 @@ block DamperValves final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-60,370},{-40,390}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{60,390},{80,410}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{120,430},{140,450}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi6 + Buildings.Controls.OBC.CDL.Reals.Switch swi6 "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{180,270},{200,290}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or3 @@ -396,21 +396,21 @@ block DamperValves final realTrue=VHeaMax_flow) "Force zone airflow setpoint to zone heating maximum flow" annotation (Placement(transformation(extent={{-60,330},{-40,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 + Buildings.Controls.OBC.CDL.Reals.Add add4 "Add up two inputs" annotation (Placement(transformation(extent={{0,350},{20,370}}))); Buildings.Controls.OBC.CDL.Logical.Or or1 "Check if the airflow setpoint should be overrided" annotation (Placement(transformation(extent={{0,270},{20,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMax1( final k=VCooMax_flow) "Cooling maximum flow" annotation (Placement(transformation(extent={{120,140},{140,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaMax1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaMax1( final k=VHeaMax_flow) "Heating maximum flow" annotation (Placement(transformation(extent={{120,100},{140,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max2 "Nominal flow" + Buildings.Controls.OBC.CDL.Reals.Max max2 "Nominal flow" annotation (Placement(transformation(extent={{200,120},{220,140}}))); Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol( final trueHoldDuration=600, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Overrides.mo index 759cbc93acb..56b66eadc81 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Overrides.mo @@ -53,15 +53,15 @@ block Overrides "Software switches to override setpoints" final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,60},{40,80}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,20},{100,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Valve position setpoint after considering override" annotation (Placement(transformation(extent={{80,-80},{100,-60}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/SystemRequests.mo index c0288d15b87..c6addc9da30 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/SystemRequests.mo @@ -152,34 +152,34 @@ block SystemRequests "Output system requests for VAV terminal unit with reheat" iconTransformation(extent={{100,-100},{140,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-190},{-40,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,210},{-40,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,170},{-40,190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -190,18 +190,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-120,40},{-100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-120,0},{-100,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,210},{-80,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,170},{-80,190}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -252,22 +252,22 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu( + Buildings.Controls.OBC.CDL.Reals.Greater greEqu( final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1( + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1( final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=thrTDis_1) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-150},{-120,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=thrTDis_2) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-190},{-120,-170}}))); @@ -295,7 +295,7 @@ protected final delayTime=durTimDisAir) if have_hotWatCoi "Check if it is more than threshold time" annotation (Placement(transformation(extent={{0,-190},{20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=0.95, final h=valPosHys) if have_hotWatCoi "Check if valve position is greater than 0.95" @@ -304,7 +304,7 @@ protected if have_hotWatCoi "Convert boolean to integer" annotation (Placement(transformation(extent={{0,-230},{20,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr6( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr6( final t=0.95, final h=0.85) if have_hotWatCoi "Check if valve position is greater than 0.95" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/ActiveAirFlow.mo index cad3d100fa1..94b651e7a28 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/ActiveAirFlow.mo @@ -7,12 +7,12 @@ model ActiveAirFlow final VHeaMax_flow=0.4) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -21,7 +21,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Alarms.mo index 0bf3c6cae14..d7c9c9fc4a5 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Alarms.mo @@ -9,17 +9,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{80,40},{100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -31,7 +31,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse damSta( @@ -42,22 +42,22 @@ model Alarms "Validation of model that generates alarms" final width=0.9, final period=7500) "Hot water plant status" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" annotation (Placement(transformation(extent={{-100,-110},{-80,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, final startTime=3600) "Valve position" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/DamperValves.mo index 79c76ab69fa..1c91dc2b644 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/DamperValves.mo @@ -8,54 +8,54 @@ model DamperValves final VHeaMax_flow=0.08, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-110},{100,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,100},{-80,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.01, final height=0.06) "Discharge airflow rate" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/3600) "Supply air temperature" annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSet( final k=273.15 + 20) "Zone heating setpoint" annotation (Placement(transformation(extent={{-100,-20},{-80,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TDis( final offset=273.15 + 13, final amplitude=1.2, final freqHz=1/3600) "Measured discharge air temperature" annotation (Placement(transformation(extent={{-100,-60},{-80,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=3, final duration=90000) "Operation mode" @@ -63,22 +63,22 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-160},{0,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-160},{-40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMin_flow( final k=0.015) "Active cooling minimum flow" annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActHeaMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActHeaMin_flow( final k=0.015) "Active heating minimum flow" annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActHeaMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActHeaMax_flow( final k=0.06) "Active heating maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, final startTime=1000) "Override flow setpoint" @@ -86,7 +86,7 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-20,150},{0,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,150},{-40,170}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Overrides.mo index bd2a46d1f47..8ed30bb9249 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/Overrides.mo @@ -4,12 +4,12 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.Overrides ove "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3600, final height=0.5, final offset=0.5) "Damper position setpoint" annotation (Placement(transformation(extent={{-40,20},{-20,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -17,11 +17,11 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,60},{20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaValPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaValPos( final duration=3600, final height=0.5, final offset=0.5) "Heating valve position" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/SystemRequests.mo index 85a21bd3b4a..64ea6763ca2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Subsequences/Validation/SystemRequests.mo @@ -9,7 +9,7 @@ model SystemRequests final damPosHys=0.01, final valPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-50},{80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -17,30 +17,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3000, final height=-0.7, final offset=0.7) "Damper position" @@ -50,17 +50,17 @@ model SystemRequests final period=7200) "After suppression" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Validation/Controller.mo index a77a38ecf3b..0383198bd93 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat/Validation/Controller.mo @@ -21,13 +21,13 @@ model Controller final VAreMin_flow=0) "Reheat unit controller" annotation (Placement(transformation(extent={{100,70},{120,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -40,11 +40,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,210},{-60,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,190},{-100,210}}))); @@ -53,7 +53,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -63,21 +63,21 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,120},{-20,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin parFanFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin parFanFlo( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Parallel fan flow" annotation (Placement(transformation(extent={{-120,40},{-100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -86,11 +86,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=5000, startTime=60000) "Override damper position" @@ -98,11 +98,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-110},{-20,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-110},{-60,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/28800) "Supply air temperature from air handling unit" @@ -125,16 +125,16 @@ model Controller final period=7500) "AHU supply fan status" annotation (Placement(transformation(extent={{-80,-210},{-60,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-120,-40},{-100,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin disFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin disFlo( final offset=1.3, final amplitude=0.6, final freqHz=1/28800) "Discharge airflow rate" annotation (Placement(transformation(extent={{-120,0},{-100,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set( final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,80},{-100,100}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/ActiveAirFlow.mo index ca238ed6bbc..64dee967a67 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/ActiveAirFlow.mo @@ -56,7 +56,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{20,0},{40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{80,-60},{100,-40}}))); Buildings.Controls.OBC.CDL.Integers.Equal ifOcc diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Alarms.mo index 0b3ef7768a3..03bc2491bc7 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Alarms.mo @@ -148,11 +148,11 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta annotation (Placement(transformation(extent={{240,-390},{280,-350}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,370},{-160,390}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,400},{-100,420}}))); @@ -160,16 +160,16 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,400},{-60,420}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,320},{-160,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,270},{-100,290}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,290},{-160,310}}))); @@ -193,11 +193,11 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,320},{100,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,230},{-60,250}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -226,11 +226,11 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,280},{120,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,170},{-180,190}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,170},{-140,190}}))); @@ -241,7 +241,7 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{0,190},{20,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-100,190},{-80,210}}))); @@ -263,7 +263,7 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-120},{-180,-100}}))); @@ -280,19 +280,19 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,-80},{160,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-320},{-100,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-17) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-360},{-160,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les2( + Buildings.Controls.OBC.CDL.Reals.Less les2( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-390},{-100,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(final p=-8.3) + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1(final p=-8.3) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-430},{-160,-410}}))); @@ -343,11 +343,11 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta if have_hotWatCoi "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,-430},{120,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt3( final k=hotWatRes) if have_hotWatCoi "Importance multiplier for hot water reset control" annotation (Placement(transformation(extent={{-120,-460},{-100,-440}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2 if have_hotWatCoi "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,-460},{-60,-440}}))); @@ -362,16 +362,16 @@ block Alarms "Generate alarms of parallerl fan-powered terminal unit with consta final delayTime=valCloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-190},{60,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloVal( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloVal( final t=valPosHys, final h=0.5*valPosHys) "Check if valve position is near zero" annotation (Placement(transformation(extent={{-200,-170},{-180,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=3) "AHU supply temperature plus 3 degree" annotation (Placement(transformation(extent={{-200,-240},{-180,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=dTHys) "Discharge temperature greate than AHU supply temperature by a threshold" annotation (Placement(transformation(extent={{-140,-210},{-120,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/DamperValves.mo index 7f2473f4250..833dcafdf08 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/DamperValves.mo @@ -197,55 +197,55 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-40,140},{-20,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-160,190},{-140,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cooling airflow according to cooling control signal" annotation (Placement(transformation(extent={{80,180},{100,200}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{20,210},{40,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,220},{-260,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,220},{-200,240}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-220,160},{-200,180}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-120,80},{-100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-160,80},{-140,100}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-260,-120},{-240,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-260,-10},{-240,10}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=dTDisZonSetMax) "Maximum heating discharge temperature" annotation (Placement(transformation(extent={{-260,-80},{-240,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal( final k=1) "Constant real value" annotation (Placement(transformation(extent={{-180,-80},{-160,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Line conTDisHeaSet + Buildings.Controls.OBC.CDL.Reals.Line conTDisHeaSet "Discharge air temperature for heating" annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conVal( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conVal( final controllerType=controllerTypeVal, final k=kVal, final Ti=TiVal, @@ -256,7 +256,7 @@ block DamperValves u_m(final unit="K", displayUnit="degC")) "Hot water valve controller" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Hot water valve position, close the valve when the zone is not in heating state" annotation (Placement(transformation(extent={{100,-120},{120,-100}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant unOcc( @@ -266,19 +266,19 @@ block DamperValves Buildings.Controls.OBC.CDL.Integers.Equal isUno "Output true if the operation mode is unoccupied" annotation (Placement(transformation(extent={{100,-180},{120,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 "Hot water valve position" + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Hot water valve position" annotation (Placement(transformation(extent={{280,-100},{300,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant nomFlow(final k= + Buildings.Controls.OBC.CDL.Reals.Sources.Constant nomFlow(final k= VCooMax_flow) "Nominal volume flow rate" annotation (Placement(transformation(extent={{160,130},{180,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{220,160},{240,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDis_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDis_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{220,100},{240,120}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -288,14 +288,14 @@ block DamperValves final y_reset=0) "Damper position controller" annotation (Placement(transformation(extent={{260,160},{280,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 "Air damper position" + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Air damper position" annotation (Placement(transformation(extent={{240,10},{260,30}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Not in unoccupied mode" annotation (Placement(transformation(extent={{180,50},{200,70}}))); Buildings.Controls.OBC.CDL.Logical.Latch lat "Close damper" annotation (Placement(transformation(extent={{100,-280},{120,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=damPosHys/2) "Check if the damper is fully closed before turning on fan" @@ -322,7 +322,7 @@ block DamperValves final realFalse=1) "Boolean to real" annotation (Placement(transformation(extent={{180,-280},{200,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Ensure damper is fully closed before turning on the fan" annotation (Placement(transformation(extent={{280,-10},{300,10}}))); Buildings.Controls.OBC.CDL.Logical.And and2 @@ -363,11 +363,11 @@ block DamperValves final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-60,290},{-40,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Add up two inputs" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{20,310},{40,330}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{80,350},{100,370}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi8 + Buildings.Controls.OBC.CDL.Reals.Switch swi8 "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{140,260},{160,280}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or1 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Overrides.mo index ada5ccb0c2a..12534430577 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Overrides.mo @@ -63,15 +63,15 @@ block Overrides "Software switches to override setpoints" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal opeDam( final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,120},{40,140}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,80},{20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Valve position setpoint after considering override" annotation (Placement(transformation(extent={{80,0},{100,20}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/SystemRequests.mo index 57639d5356e..d39ee177f30 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/SystemRequests.mo @@ -131,34 +131,34 @@ block SystemRequests "Output system requests for parallel fan-powered terminal u iconTransformation(extent={{100,-100},{140,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-190},{-40,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,210},{-40,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,170},{-40,190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -169,18 +169,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-100,0},{-80,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,210},{-80,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,170},{-80,190}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -231,20 +231,20 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=thrTDis_1) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-150},{-120,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=thrTDis_2) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-190},{-120,-170}}))); @@ -272,7 +272,7 @@ protected final delayTime=durTimDisAir) if have_hotWatCoi "Check if it is more than threshold time" annotation (Placement(transformation(extent={{0,-190},{20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=0.95, final h=valPosHys) if have_hotWatCoi "Check if valve position is greater than 0.95" @@ -281,7 +281,7 @@ protected if have_hotWatCoi "Convert boolean to integer" annotation (Placement(transformation(extent={{0,-230},{20,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr6( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr6( final t=0.95, final h=0.85) if have_hotWatCoi "Check if valve position is greater than 0.95" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/ActiveAirFlow.mo index 74c7d40a0bc..b30bf163efe 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/ActiveAirFlow.mo @@ -5,12 +5,12 @@ model ActiveAirFlow final VCooMax_flow=0.5) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -19,7 +19,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Alarms.mo index 46b028730f2..2ebc1eada6c 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Alarms.mo @@ -9,17 +9,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{80,40},{100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -31,7 +31,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse damSta( @@ -42,7 +42,7 @@ model Alarms "Validation of model that generates alarms" final width=0.9, final period=7500) "Hot water plant status" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" @@ -57,17 +57,17 @@ model Alarms "Validation of model that generates alarms" final period=7500, shift=1000) "Terminal fan status" annotation (Placement(transformation(extent={{-100,30},{-80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, final startTime=3600) "Valve position" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/DamperValves.mo index f62063c34cd..d67d9295440 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/DamperValves.mo @@ -7,20 +7,20 @@ model DamperValves final VCooMax_flow=0.09, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-110},{100,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,90},{-80,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-100,0},{-80,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); @@ -28,38 +28,38 @@ model DamperValves final width=0.75, final period=7200) "Terminal fan status" annotation (Placement(transformation(extent={{-100,-140},{-80,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-60,-20},{-40,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-60},{-40,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.01, final height=0.06) "Discharge airflow rate" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/3600) "Supply air temperature" annotation (Placement(transformation(extent={{-100,50},{-80,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSet( final k=273.15 + 20) "Zone heating setpoint" annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TDis( final offset=273.15 + 13, final amplitude=1.2, final freqHz=1/3600) "Measured discharge air temperature" annotation (Placement(transformation(extent={{-100,-80},{-80,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=3, final duration=90000) "Operation mode" @@ -67,17 +67,17 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-110},{0,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-110},{-40,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final height=1, final duration=3600, final offset=0, final startTime=5500) "Damper position" annotation (Placement(transformation(extent={{-60,-160},{-40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, final startTime=1000) "Override flow setpoint" @@ -85,7 +85,7 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-20,140},{0,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,140},{-40,160}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Overrides.mo index 4aa26c9b60c..db1d27f4189 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/Overrides.mo @@ -4,12 +4,12 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Overrides ove "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3600, final height=0.5, final offset=0.5) "Damper position setpoint" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -17,16 +17,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,90},{20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaValPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaValPos( final duration=3600, final height=0.5, final offset=0.5) "Heating valve position" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -34,7 +34,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/SystemRequests.mo index 58b699e3fa2..784552a021b 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Subsequences/Validation/SystemRequests.mo @@ -9,7 +9,7 @@ model SystemRequests final damPosHys=0.01, final valPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-50},{80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -17,30 +17,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3000, final height=-0.7, final offset=0.7) "Damper position" @@ -50,17 +50,17 @@ model SystemRequests final period=7200) "After suppression" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Validation/Controller.mo index 64e45f18a42..2a8f3755231 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanCVF/Validation/Controller.mo @@ -19,13 +19,13 @@ model Controller final VAreMin_flow=0) "Series-fan powered unit controller" annotation (Placement(transformation(extent={{100,70},{120,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -38,11 +38,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,210},{-60,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,190},{-100,210}}))); @@ -51,7 +51,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -61,21 +61,21 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,120},{-20,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin parFanFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin parFanFlo( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Parallel fan flow" annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -84,11 +84,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=5000, startTime=60000) "Override damper position" @@ -96,11 +96,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveTerFan( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveTerFan( final height=2, final duration=5000, final startTime=60000) "Override terminal fan control" @@ -108,11 +108,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/28800) "Supply air temperature from air handling unit" @@ -139,16 +139,16 @@ model Controller final period=7500) "AHU supply fan status" annotation (Placement(transformation(extent={{-80,-210},{-60,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin disFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin disFlo( final offset=1.3, final amplitude=0.6, final freqHz=1/28800) "Discharge airflow rate" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set(final k=894) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set(final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Controller.mo index b5befd46a28..216acd01092 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Controller.mo @@ -491,7 +491,7 @@ block Controller Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Convert boolean to real" annotation (Placement(transformation(extent={{160,210},{180,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Paralle fan airflow setpoint" annotation (Placement(transformation(extent={{200,230},{220,250}}))); Buildings.Controls.OBC.ASHRAE.G36.VentilationZones.Title24.Setpoints minFlo( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/ActiveAirFlow.mo index 118ff94b148..c3d5269abbe 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/ActiveAirFlow.mo @@ -56,7 +56,7 @@ protected final realTrue=1) "If in occupied mode, output 1" annotation (Placement(transformation(extent={{20,0},{40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Active cooling minimum, minimum airflow setpoint" annotation (Placement(transformation(extent={{80,-60},{100,-40}}))); Buildings.Controls.OBC.CDL.Integers.Equal ifOcc diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Alarms.mo index 328c438e9a5..4a0ae7b5468 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Alarms.mo @@ -147,11 +147,11 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- annotation (Placement(transformation(extent={{240,-390},{280,-350}}), iconTransformation(extent={{100,-110},{140,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.5) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,370},{-160,390}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,400},{-100,420}}))); @@ -159,16 +159,16 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- final delayTime=lowFloTim) "Check if the measured airflow has been less than threshold value for threshold time" annotation (Placement(transformation(extent={{-80,400},{-60,420}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=floHys, final h=0.5*floHys) "Check if setpoint airflow is greater than zero" annotation (Placement(transformation(extent={{-180,320},{-160,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre( + Buildings.Controls.OBC.CDL.Reals.Greater gre( final h=floHys) "Check if measured airflow is less than threshold" annotation (Placement(transformation(extent={{-120,270},{-100,290}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.7) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-180,290},{-160,310}}))); @@ -192,11 +192,11 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- final integerTrue=3) "Convert boolean true to level 3 alarm" annotation (Placement(transformation(extent={{80,320},{100,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt1( final k=staPreMul) "Importance multiplier for zone static pressure reset" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1 "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,230},{-60,250}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 @@ -225,11 +225,11 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- final message="Warning: airflow is less than 70% of the setpoint.") "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,280},{120,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooMaxFlo( final k=VCooMax_flow) "Cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-200,170},{-180,190}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.1) "Percentage of the setpoint" annotation (Placement(transformation(extent={{-160,170},{-140,190}}))); @@ -240,7 +240,7 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- final delayTime=fanOffTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{0,190},{20,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre1( + Buildings.Controls.OBC.CDL.Reals.Greater gre1( final h=floHys) "Check if measured airflow is greater than threshold" annotation (Placement(transformation(extent={{-100,190},{-80,210}}))); @@ -262,7 +262,7 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- final delayTime=leaFloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-80},{60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=0.5*damPosHys) "Check if damper position is near zero" annotation (Placement(transformation(extent={{-200,-120},{-180,-100}}))); @@ -279,19 +279,19 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- final integerTrue=4) "Convert boolean true to level 4 alarm" annotation (Placement(transformation(extent={{140,-80},{160,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-320},{-100,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-17) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-360},{-160,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les2( + Buildings.Controls.OBC.CDL.Reals.Less les2( final h=dTHys) if have_hotWatCoi "Discharge temperature lower than setpoint by a threshold" annotation (Placement(transformation(extent={{-120,-390},{-100,-370}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1(final p=-8.3) + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1(final p=-8.3) if have_hotWatCoi "Setpoint temperature minus a threshold" annotation (Placement(transformation(extent={{-180,-430},{-160,-410}}))); @@ -342,11 +342,11 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- if have_hotWatCoi "Level 3 low airflow alarm" annotation (Placement(transformation(extent={{100,-430},{120,-410}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conInt3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conInt3( final k=hotWatRes) if have_hotWatCoi "Importance multiplier for hot water reset control" annotation (Placement(transformation(extent={{-120,-460},{-100,-440}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2 + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2 if have_hotWatCoi "Check if the multiplier is greater than zero" annotation (Placement(transformation(extent={{-80,-460},{-60,-440}}))); @@ -361,16 +361,16 @@ block Alarms "Generate alarms of series fan-powered terminal unit with variable- final delayTime=valCloTim) "Check if the input has been true for more than threshold time" annotation (Placement(transformation(extent={{40,-190},{60,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloVal( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloVal( final t=valPosHys, final h=0.5*valPosHys) "Check if valve position is near zero" annotation (Placement(transformation(extent={{-200,-170},{-180,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=3) "AHU supply temperature plus 3 degree" annotation (Placement(transformation(extent={{-200,-240},{-180,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2( + Buildings.Controls.OBC.CDL.Reals.Greater gre2( final h=dTHys) "Discharge temperature greate than AHU supply temperature by a threshold" annotation (Placement(transformation(extent={{-140,-210},{-120,-190}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/DamperValves.mo index 824951bbab1..f4657b72d1f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/DamperValves.mo @@ -215,47 +215,47 @@ block DamperValves Buildings.Controls.OBC.CDL.Logical.And and4 "Logical and" annotation (Placement(transformation(extent={{-80,250},{-60,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin + Buildings.Controls.OBC.CDL.Reals.Line lin "Active airflow setpoint for cooling" annotation (Placement(transformation(extent={{-180,300},{-160,320}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Output active cooling airflow according to cooling control signal" annotation (Placement(transformation(extent={{60,290},{80,310}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "Airflow setpoint when it is in cooling state" annotation (Placement(transformation(extent={{0,320},{20,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-300,330},{-280,350}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conOne( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conOne( final k=1) "Constant one" annotation (Placement(transformation(extent={{-240,330},{-220,350}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=looHys, final h=0.5*looHys) "Check if it is cooling state" annotation (Placement(transformation(extent={{-240,270},{-220,290}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=dTHys, final h=0.5*dTHys) "Check if supply air temperature is greater than room temperature" annotation (Placement(transformation(extent={{-200,190},{-180,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate temperature difference between AHU supply air and room " annotation (Placement(transformation(extent={{-240,190},{-220,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 "Hot water valve position" + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Hot water valve position" annotation (Placement(transformation(extent={{300,10},{320,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant nomFlow(final k= + Buildings.Controls.OBC.CDL.Reals.Sources.Constant nomFlow(final k= VCooMax_flow) "Nominal volume flow rate" annotation (Placement(transformation(extent={{100,240},{120,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VDisSet_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VDisSet_flowNor "Normalized setpoint for discharge volume flow rate" annotation (Placement(transformation(extent={{200,270},{220,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide VPri_flowNor + Buildings.Controls.OBC.CDL.Reals.Divide VPri_flowNor "Normalized discharge volume flow rate" annotation (Placement(transformation(extent={{200,210},{220,230}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conDam( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conDam( final controllerType=controllerTypeDam, final k=kDam, final Ti=TiDam, @@ -265,25 +265,25 @@ block DamperValves final y_reset=0) "Damper position controller" annotation (Placement(transformation(extent={{240,270},{260,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 "Air damper position" + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Air damper position" annotation (Placement(transformation(extent={{260,120},{280,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Line conTDisHeaSet + Buildings.Controls.OBC.CDL.Reals.Line conTDisHeaSet "Discharge air temperature for heating" annotation (Placement(transformation(extent={{-140,60},{-120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=dTDisZonSetMax) "Maximum heating discharge temperature" annotation (Placement(transformation(extent={{-280,30},{-260,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal( final k=0.5) "Constant real value" annotation (Placement(transformation(extent={{-200,30},{-180,50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=looHys, final h=0.5*looHys) "Check if it is heating state" annotation (Placement(transformation(extent={{-280,-10},{-260,10}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conVal( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conVal( final controllerType=controllerTypeVal, final k=kVal, final Ti=TiVal, @@ -294,24 +294,24 @@ block DamperValves u_m(final unit="K", displayUnit="degC")) "Hot water valve controller" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conZer3(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conZer3(final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,100},{-260,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Hot water valve position, close the valve when the zone is not in heating state" annotation (Placement(transformation(extent={{80,-10},{100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Line heaFanRat + Buildings.Controls.OBC.CDL.Reals.Line heaFanRat "Parallel fan airflow setpoint when zone is in heating state" annotation (Placement(transformation(extent={{40,-260},{60,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal1( final k=0.5) "Constant real value" annotation (Placement(transformation(extent={{-20,-230},{0,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant conHal2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant conHal2( final k=1) "Constant real value" annotation (Placement(transformation(extent={{-180,-290},{-160,-270}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxFan( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxFan( final k=maxRat) "Maximum fan rate" annotation (Placement(transformation(extent={{-20,-290},{0,-270}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant uno( @@ -325,13 +325,13 @@ block DamperValves "Not in unoccupied mode" annotation (Placement(transformation(extent={{200,150},{220,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "Fan setpoint when it is in cooling state and the supply air temperture is high" annotation (Placement(transformation(extent={{40,-90},{60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Larger of minimum outdoor airflow setpoint and primary discharge airflow setpoint" annotation (Placement(transformation(extent={{-160,-110},{-140,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi6 + Buildings.Controls.OBC.CDL.Reals.Switch swi6 "Fan setpoint when it is in cooling state" annotation (Placement(transformation(extent={{240,-130},{260,-110}}))); Buildings.Controls.OBC.CDL.Logical.Or cooHea @@ -339,13 +339,13 @@ block DamperValves annotation (Placement(transformation(extent={{0,-190},{20,-170}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "In deadband state" annotation (Placement(transformation(extent={{60,-190},{80,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi7 + Buildings.Controls.OBC.CDL.Reals.Switch swi7 "Fan setpoint when it is in deadband state" annotation (Placement(transformation(extent={{180,-170},{200,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi8 + Buildings.Controls.OBC.CDL.Reals.Switch swi8 "Fan setpoint when it is in heating state" annotation (Placement(transformation(extent={{100,-310},{120,-290}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold cloDam( + Buildings.Controls.OBC.CDL.Reals.LessThreshold cloDam( final t=damPosHys, final h=damPosHys/2) "Check if the damper is fully closed before turning on fan" @@ -382,13 +382,13 @@ block DamperValves final realFalse=1) "Boolean to real" annotation (Placement(transformation(extent={{160,-380},{180,-360}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Ensure damper is fully closed before turning on the fan" annotation (Placement(transformation(extent={{320,100},{340,120}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1 "Boolean to real" annotation (Placement(transformation(extent={{160,-422},{180,-402}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul1 + Buildings.Controls.OBC.CDL.Reals.Multiply mul1 "Ensure damper is fully closed before turning on the fan" annotation (Placement(transformation(extent={{320,-190},{340,-170}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt(final k=1) @@ -418,15 +418,15 @@ block DamperValves final realTrue=VMin_flow) "Force zone airflow setpoint to zone minimum flow" annotation (Placement(transformation(extent={{-80,390},{-60,410}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 + Buildings.Controls.OBC.CDL.Reals.Add add2 "Add up two inputs" annotation (Placement(transformation(extent={{0,410},{20,430}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Add up inputs" annotation (Placement(transformation(extent={{60,450},{80,470}}))); Buildings.Controls.OBC.CDL.Logical.Or3 or1 "Check if the airflow setpoint should be overrided" annotation (Placement(transformation(extent={{40,360},{60,380}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi9 + Buildings.Controls.OBC.CDL.Reals.Switch swi9 "Airflow setpoint after considering override" annotation (Placement(transformation(extent={{120,360},{140,380}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt2(final k=3) diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Overrides.mo index 7ea786fd2e5..2f0aa1264fd 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Overrides.mo @@ -63,15 +63,15 @@ block Overrides "Software switches to override setpoints" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal opeDam( final realTrue=1) "Full open damper position" annotation (Placement(transformation(extent={{-40,100},{-20,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add up inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add up inputs" annotation (Placement(transformation(extent={{20,120},{40,140}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 "Check if the damper setpoint position should be overrided" annotation (Placement(transformation(extent={{0,80},{20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Damper setpoint position after considering override" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Valve position setpoint after considering override" annotation (Placement(transformation(extent={{80,0},{100,20}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/SystemRequests.mo index ee3b2ed4670..e28474054ab 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/SystemRequests.mo @@ -152,34 +152,34 @@ block SystemRequests iconTransformation(extent={{100,-100},{140,-60}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Less les( + Buildings.Controls.OBC.CDL.Reals.Less les( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-150},{-40,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les1( + Buildings.Controls.OBC.CDL.Reals.Less les1( final h=dTHys) if have_hotWatCoi "Check if discharge temperature is less than setpoint by a threshold" annotation (Placement(transformation(extent={{-60,-190},{-40,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=thrTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,210},{-40,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr2( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr2( final t=twoTemDif, final h=dTHys) "Check if zone temperature is greater than cooling setpoint by threshold" annotation (Placement(transformation(extent={{-60,170},{-40,190}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr3( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr3( final t=0.95, final h=damPosHys) "Check if damper position is greater than 0.95" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.95, final h=looHys) "Check if cooling loop signal is greater than 0.95" annotation (Placement(transformation(extent={{-60,120},{-40,140}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr4( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr4( final t=floHys, final h=0.5*floHys) "Check if discharge airflow setpoint is greater than 0" @@ -190,18 +190,18 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-60},{60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=0.5) "50% of setpoint" annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=0.7) "70% of setpoint" annotation (Placement(transformation(extent={{-100,0},{-80,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,210},{-80,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate difference between zone temperature and cooling setpoint" annotation (Placement(transformation(extent={{-100,170},{-80,190}}))); Buildings.Controls.OBC.CDL.Logical.And and1 @@ -252,20 +252,20 @@ protected Buildings.Controls.OBC.CDL.Logical.TrueDelay tim3( final delayTime=durTimFlo) "Check if it is more than threshold time" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu(final h=floHys) "Check if discharge airflow is less than 50% of setpoint" annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu1(final h=floHys) + Buildings.Controls.OBC.CDL.Reals.Greater greEqu1(final h=floHys) "Check if discharge airflow is less than 70% of setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); Buildings.Controls.OBC.CDL.Logical.And and5 "Logical and" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=thrTDis_1) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-150},{-120,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=thrTDis_2) if have_hotWatCoi "Discharge temperature plus threshold" annotation (Placement(transformation(extent={{-140,-190},{-120,-170}}))); @@ -293,7 +293,7 @@ protected final delayTime=durTimDisAir) if have_hotWatCoi "Check if it is more than threshold time" annotation (Placement(transformation(extent={{0,-190},{20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr5( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr5( final t=0.95, final h=valPosHys) if have_hotWatCoi "Check if valve position is greater than 0.95" @@ -302,7 +302,7 @@ protected if have_hotWatCoi "Convert boolean to integer" annotation (Placement(transformation(extent={{0,-230},{20,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr6( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr6( final t=0.95, final h=0.85) if have_hotWatCoi "Check if valve position is greater than 0.95" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/ActiveAirFlow.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/ActiveAirFlow.mo index f0dc0bc4a9c..1c35dea6044 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/ActiveAirFlow.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/ActiveAirFlow.mo @@ -5,12 +5,12 @@ model ActiveAirFlow final VCooMax_flow=0.5) "Output the active airflow setpoint for terminal unit" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin minFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin minFlo( final amplitude=0.3, final freqHz=1/3600, final offset=0.2) "Occupied zone minimum flow" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=5, final duration=3600) @@ -19,7 +19,7 @@ model ActiveAirFlow Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Alarms.mo index 7ef31e2281b..e5026b49439 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Alarms.mo @@ -9,17 +9,17 @@ model Alarms "Validation of model that generates alarms" final floHys=0.01, final damPosHys=0.01) "Block outputs system alarms" annotation (Placement(transformation(extent={{80,40},{100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,90},{-40,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-100,110},{-80,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=7200, final height=0.7, final offset=0.3) "Damper position" @@ -31,7 +31,7 @@ model Alarms "Validation of model that generates alarms" Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea "Convert boolean input to real output" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply mul + Buildings.Controls.OBC.CDL.Reals.Multiply mul "Damper position" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse damSta( @@ -42,7 +42,7 @@ model Alarms "Validation of model that generates alarms" final width=0.9, final period=7500) "Hot water plant status" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" @@ -57,17 +57,17 @@ model Alarms "Validation of model that generates alarms" final period=7500, shift=1000) "Terminal fan status" annotation (Placement(transformation(extent={{-100,30},{-80,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, final startTime=3600) "Valve position" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSup( final k=273.15 + 13) "AHU supply air temperature" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-60,-130},{-40,-110}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/DamperValves.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/DamperValves.mo index fc7f32ebb67..152c42645c8 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/DamperValves.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/DamperValves.mo @@ -8,20 +8,20 @@ model DamperValves final VCooMax_flow=0.09, final kDam=1) "Output signal for controlling damper position" annotation (Placement(transformation(extent={{80,-120},{100,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=3600, final offset=1, final startTime=900) "Cooling control signal" annotation (Placement(transformation(extent={{-100,90},{-80,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZon( final k=273.15 + 22) "Zone temperature" annotation (Placement(transformation(extent={{-100,10},{-80,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActMin_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActMin_flow( final k=0.01) "Active minimum airflow setpoint" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VActCooMax_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VActCooMax_flow( final k=0.075) "Active cooling maximum airflow setpoint" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); @@ -29,38 +29,38 @@ model DamperValves final width=0.75, final period=7200) "Terminal fan status" annotation (Placement(transformation(extent={{-100,-150},{-80,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uHea( final height=1, final duration=3600, final offset=0, final startTime=5500) "Heating control signal" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.01, final height=0.06) "Discharge airflow rate" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/3600) "Supply air temperature" annotation (Placement(transformation(extent={{-100,50},{-80,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSet( final k=273.15 + 20) "Zone heating setpoint" annotation (Placement(transformation(extent={{-100,-30},{-80,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TDis( final offset=273.15 + 13, final amplitude=1.2, final freqHz=1/3600) "Measured discharge air temperature" annotation (Placement(transformation(extent={{-100,-70},{-80,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=3, final duration=90000) "Operation mode" @@ -68,21 +68,21 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-120},{0,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,-120},{-40,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final height=1, final duration=3600, final offset=0, final startTime=5500) "Damper position" annotation (Placement(transformation(extent={{-60,-170},{-40,-150}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant VMinOut_flow( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant VMinOut_flow( final k=0.005) "Minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{-60,-90},{-40,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=3, final duration=2000, final startTime=1000) "Override flow setpoint" @@ -90,7 +90,7 @@ model DamperValves Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-20,150},{0,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(final n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-60,150},{-40,170}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Overrides.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Overrides.mo index 493ff26cb11..23515ce5429 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Overrides.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/Overrides.mo @@ -4,12 +4,12 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Overrides ove "Block outputs system requests" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3600, final height=0.5, final offset=0.5) "Damper position setpoint" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -17,16 +17,16 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,90},{20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,90},{-20,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp heaValPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp heaValPos( final duration=3600, final height=0.5, final offset=0.5) "Heating valve position" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam1( final height=2, final duration=2000, final startTime=1000) "Override damper position" @@ -34,7 +34,7 @@ model Overrides "Validation of model that overrides control" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/SystemRequests.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/SystemRequests.mo index 9e15417756b..e107db067fe 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/SystemRequests.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Subsequences/Validation/SystemRequests.mo @@ -9,7 +9,7 @@ model SystemRequests final damPosHys=0.01, final valPosHys=0.01) "Block outputs system requests" annotation (Placement(transformation(extent={{60,-50},{80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sine( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sine( final freqHz=1/7200, final offset=296.15) "Generate data for setpoint" @@ -17,30 +17,30 @@ model SystemRequests Buildings.Controls.OBC.CDL.Discrete.UnitDelay TCooSet( final samplePeriod=1800) "Cooling setpoint temperature" annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/7200, final amplitude=2, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp uCoo( final height=-1, final duration=2000, final offset=1, final startTime=1000) "Cooling loop signal" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirSet( final height=0.9, final duration=7200, final offset=0.1) "Discharge airflow rate setpoint" annotation (Placement(transformation(extent={{-60,0},{-40,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAir( final duration=7200, final offset=0.1, final height=0.3) "Discharge airflow rate" annotation (Placement(transformation(extent={{-20,-20},{0,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp damPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp damPos( final duration=3000, final height=-0.7, final offset=0.7) "Damper position" @@ -50,17 +50,17 @@ model SystemRequests final period=7200) "After suppression" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDis( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDis( final duration=3600, final offset=273.15 + 20, final height=-5) "Discharge air temperature" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDisSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDisSet( final k=273.15 + 30) "Discharge airflow temperature setpoint" annotation (Placement(transformation(extent={{-80,-80},{-60,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp valPos( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp valPos( final duration=2000, final height=-0.7, final offset=0.7, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Validation/Controller.mo b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Validation/Controller.mo index 83de6281874..f91fe9a7362 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Validation/Controller.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/TerminalUnits/SeriesFanVVF/Validation/Controller.mo @@ -20,13 +20,13 @@ model Controller final VAreMin_flow=0) "Series-fan powered unit controller" annotation (Placement(transformation(extent={{100,70},{120,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TZon( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TZon( final freqHz=1/86400, final amplitude=4, final offset=299.15) "Zone temperature" annotation (Placement(transformation(extent={{-120,230},{-100,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp disAirTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp disAirTem( final height=2, final duration=43200, final offset=273.15 + 15, @@ -39,11 +39,11 @@ model Controller final shift=43200) "Window opening status" annotation (Placement(transformation(extent={{-80,170},{-60,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSet( final k=273.15 + 24) "Zone cooling setpoint temperature" annotation (Placement(transformation(extent={{-80,210},{-60,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSet( final k=273.15 + 20) "Zone heating setpoint temperature" annotation (Placement(transformation(extent={{-120,190},{-100,210}}))); @@ -52,7 +52,7 @@ model Controller final period=43200, final shift=28800) "Occupancy status" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp opeMod( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp opeMod( final offset=1, final height=2, final duration=28800, @@ -62,21 +62,21 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-40,120},{-20,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,120},{-60,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=400, final freqHz=1/28800, final offset=600) "CO2 concentration" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin parFanFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin parFanFlo( final offset=1.2, final amplitude=0.6, final freqHz=1/28800) "Parallel fan flow" annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveFlo( final height=2, final duration=10000, final startTime=35000) @@ -85,11 +85,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveDam( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveDam( final height=2, final duration=5000, startTime=60000) "Override damper position" @@ -97,11 +97,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt3 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp oveTerFan( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp oveTerFan( final height=2, final duration=5000, final startTime=60000) "Override terminal fan control" @@ -109,11 +109,11 @@ model Controller Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt4 "Convert real to integer" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round4( + Buildings.Controls.OBC.CDL.Reals.Round round4( final n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-80,-120},{-60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin TSup( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin TSup( final offset=273.15 + 13, final amplitude=1, final freqHz=1/28800) "Supply air temperature from air handling unit" @@ -140,16 +140,16 @@ model Controller final period=7500) "AHU supply fan status" annotation (Placement(transformation(extent={{-80,-210},{-60,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TSupSet( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet( final k=273.15 + 13) "AHU supply air temperature setpoint" annotation (Placement(transformation(extent={{-120,-30},{-100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin disFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin disFlo( final offset=1.3, final amplitude=0.6, final freqHz=1/28800) "Discharge airflow rate" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set(final k=894) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set(final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Alarms.mo index fde821e21e3..8c176f6e6ad 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Alarms.mo @@ -68,28 +68,28 @@ block Alarms "Zone level alarms" annotation (Placement(transformation(extent={{240,-200},{280,-160}}), iconTransformation(extent={{100,-60},{140,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract lowTem + Buildings.Controls.OBC.CDL.Reals.Subtract lowTem "Zone temperature below the heating setpoint" annotation (Placement(transformation(extent={{-170,90},{-150,110}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold twoDegLow( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold twoDegLow( final t=2, final h=dTHys) "Check if the zone temperature is 2 degC lower than the heating setpoint" annotation (Placement(transformation(extent={{-120,90},{-100,110}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold thrDegLow( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold thrDegLow( final t=3, final h=dTHys) "Check if the zone temperature is 3 degC lower than the heating setpoint" annotation (Placement(transformation(extent={{-120,50},{-100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract higTem + Buildings.Controls.OBC.CDL.Reals.Subtract higTem "Zone temperature above the cooling setpoint" annotation (Placement(transformation(extent={{-170,210},{-150,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold twoDegHig( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold twoDegHig( final t=2, final h=dTHys) "Check if the zone temperature is 2 degC higher than the cooling setpoint" annotation (Placement(transformation(extent={{-120,210},{-100,230}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold thrDegHig( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold thrDegHig( final t=3, final h=dTHys) "Check if the zone temperature is 3 degC higher than the cooling setpoint" @@ -159,12 +159,12 @@ block Alarms "Zone level alarms" Buildings.Controls.OBC.CDL.Integers.Equal levTwoLow "Check if generating level 2 low temperature alarm" annotation (Placement(transformation(extent={{120,50},{140,70}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold lesThr( + Buildings.Controls.OBC.CDL.Reals.LessThreshold lesThr( final t=300, final h=ppmHys) if have_CO2Sen "Check if the CO2 concentration is less than threshold" annotation (Placement(transformation(extent={{-40,-190},{-20,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=600, final h=ppmHys) if have_CO2Sen "Check if the CO2 concentration is greater than threshold" @@ -178,7 +178,7 @@ block Alarms "Zone level alarms" annotation (Placement(transformation(extent={{200,-130},{220,-110}}))); Buildings.Controls.OBC.CDL.Logical.Not not5 if have_CO2Sen "Logical not" annotation (Placement(transformation(extent={{160,-130},{180,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr1( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1( final t=1.1*CO2Set, final h=ppmHys) if have_CO2Sen "Check if the CO2 concentration exceeds setpoint plus 10%" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ControlLoops.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ControlLoops.mo index 1688c236e64..3b8fe79e14d 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ControlLoops.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ControlLoops.mo @@ -53,14 +53,14 @@ block ControlLoops "Heating and cooling control loops" final unit="1") "Heating control signal" annotation (Placement(transformation(extent={{160,-90},{200,-50}}), iconTransformation(extent={{100,-80},{140,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conCoo( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conCoo( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI, final k=kCooCon, final Ti=TiCooCon, final reverseActing=false) "Cooling controller" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); - Buildings.Controls.OBC.CDL.Continuous.PIDWithReset conHea( + Buildings.Controls.OBC.CDL.Reals.PIDWithReset conHea( final controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI, final k=kHeaCon, final Ti=TiHeaCon) @@ -68,11 +68,11 @@ block ControlLoops "Heating and cooling control loops" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Less enaHeaLoo( + Buildings.Controls.OBC.CDL.Reals.Less enaHeaLoo( final h=dTHys) "Check if heating control loop should be enabled" annotation (Placement(transformation(extent={{-120,-130},{-100,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Less enaCooLoo( + Buildings.Controls.OBC.CDL.Reals.Less enaCooLoo( final h=dTHys) "Check if cooling control loop should be enabled" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); @@ -88,7 +88,7 @@ protected final realFalse=1) "Output zero control signal when the cooling loop should be disabled" annotation (Placement(transformation(extent={{80,50},{100,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply cooConSig + Buildings.Controls.OBC.CDL.Reals.Multiply cooConSig "Cooling control loop signal" annotation (Placement(transformation(extent={{120,60},{140,80}}))); Buildings.Controls.OBC.CDL.Logical.Not holZon @@ -103,14 +103,14 @@ protected final realFalse=1) "Output zero control signal when the heating loop should be disabled" annotation (Placement(transformation(extent={{80,-90},{100,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply heaConSig + Buildings.Controls.OBC.CDL.Reals.Multiply heaConSig "Heating control loop signal" annotation (Placement(transformation(extent={{120,-80},{140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold zerCon( + Buildings.Controls.OBC.CDL.Reals.LessThreshold zerCon( final t=looHys, final h=0.8*looHys) "Check if the controller output is near zero" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.LessThreshold zerCon1( + Buildings.Controls.OBC.CDL.Reals.LessThreshold zerCon1( final t=looHys, final h=0.8*looHys) "Check if the controller output is near zero" annotation (Placement(transformation(extent={{-40,-90},{-20,-70}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo index bb10227c14e..462bf702894 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo @@ -179,28 +179,28 @@ block Setpoints annotation (Placement(transformation(extent={{-40,140},{-20,160}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logic not" annotation (Placement(transformation(extent={{0,140},{20,160}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar3( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar3( final p=incTSetDem_3) "Increase cooling setpoint when at demand limit level 3" annotation (Placement(transformation(extent={{40,20},{60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar1( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar1( final p=incTSetDem_2) "Increase cooling setpoint when at demand limit level 2" annotation (Placement(transformation(extent={{40,60},{60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar2( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar2( final p=incTSetDem_1) "Increase cooling setpoint when at demand limit level 1" annotation (Placement(transformation(extent={{40,100},{60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro6 + Buildings.Controls.OBC.CDL.Reals.Multiply pro6 "Output product of the two inputs" annotation (Placement(transformation(extent={{80,140},{100,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Output product of the two inputs" annotation (Placement(transformation(extent={{80,100},{100,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1 + Buildings.Controls.OBC.CDL.Reals.Multiply pro1 "Output product of the two inputs" annotation (Placement(transformation(extent={{80,60},{100,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro2 + Buildings.Controls.OBC.CDL.Reals.Multiply pro2 "Output product of the two inputs" annotation (Placement(transformation(extent={{80,20},{100,40}}))); Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler heaSetFre @@ -210,28 +210,28 @@ block Setpoints annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" annotation (Placement(transformation(extent={{0,-80},{20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro7 + Buildings.Controls.OBC.CDL.Reals.Multiply pro7 "Output product of the two inputs" annotation (Placement(transformation(extent={{80,-80},{100,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar6( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar6( final p=-decTSetDem_1) "Decrease heating setpoint when at demand limit level 1" annotation (Placement(transformation(extent={{40,-120},{60,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar5( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar5( final p=-decTSetDem_2) "Decrease heating setpoint when at demand limit level 2" annotation (Placement(transformation(extent={{40,-160},{60,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar4( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar4( final p=-decTSetDem_3) "Decrease heating setpoint when at demand limit level 3" annotation (Placement(transformation(extent={{40,-200},{60,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro5 + Buildings.Controls.OBC.CDL.Reals.Multiply pro5 "Output product of the two inputs" annotation (Placement(transformation(extent={{80,-200},{100,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro4 + Buildings.Controls.OBC.CDL.Reals.Multiply pro4 "Output product of the two inputs" annotation (Placement(transformation(extent={{80,-160},{100,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro3 + Buildings.Controls.OBC.CDL.Reals.Multiply pro3 "Output product of the two inputs" annotation (Placement(transformation(extent={{80,-120},{100,-100}}))); Buildings.Controls.OBC.CDL.Logical.Timer tim( @@ -245,11 +245,11 @@ block Setpoints Buildings.Controls.OBC.CDL.Logical.Edge edg1 "Instant when the zone becomes more than 5 minutes" annotation (Placement(transformation(extent={{-40,-280},{-20,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter heaSetDec( + Buildings.Controls.OBC.CDL.Reals.AddParameter heaSetDec( final p=-0.5) "Heating setpoint decrease due to continuously unpopulated under occupied mode" annotation (Placement(transformation(extent={{100,-320},{120,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter cooSetInc( + Buildings.Controls.OBC.CDL.Reals.AddParameter cooSetInc( final p=0.5) "Cooling setpoint increase due to continuously unpopulated under occupied mode" annotation (Placement(transformation(extent={{100,-280},{120,-260}}))); @@ -259,21 +259,21 @@ block Setpoints Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler heaSetSam "Sample current heating setpoint when zone becomes unpopulated by 5 minutes" annotation (Placement(transformation(extent={{40,-320},{60,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add1 "Adjusted heating setpoint" + Buildings.Controls.OBC.CDL.Reals.Add add1 "Adjusted heating setpoint" annotation (Placement(transformation(extent={{140,240},{160,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add2 "Adjusted cooling setpoint" + Buildings.Controls.OBC.CDL.Reals.Add add2 "Adjusted cooling setpoint" annotation (Placement(transformation(extent={{-200,340},{-180,360}}))); - Buildings.Controls.OBC.CDL.Continuous.Limiter cooSetLim( + Buildings.Controls.OBC.CDL.Reals.Limiter cooSetLim( final uMax=TActCoo_max, final uMin=TActCoo_min) "Limit occupied zone cooling setpoint" annotation (Placement(transformation(extent={{-240,-530},{-220,-510}}))); - Buildings.Controls.OBC.CDL.Continuous.Limiter heaSetLim( + Buildings.Controls.OBC.CDL.Reals.Limiter heaSetLim( final uMax=TActHea_max, final uMin=TActHea_min) "Limit occupied zone heating setpoint" annotation (Placement(transformation(extent={{-240,-590},{-220,-570}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-0.5) "Cooling setpoint minus the minimum difference between cooling and heating setpoints" annotation (Placement(transformation(extent={{160,-590},{180,-570}}))); @@ -307,14 +307,14 @@ protected final k=have_locAdj) "Cooling setpoint adjustable" annotation (Placement(transformation(extent={{-340,320},{-320,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0) "Zero adjustment" annotation (Placement(transformation(extent={{-340,280},{-320,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con3( final k=0) if not have_locAdj "Zero adjustment" annotation (Placement(transformation(extent={{-340,360},{-320,380}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con4( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con4( final k=0) if not have_locAdj "Zero adjustment" annotation (Placement(transformation(extent={{-60,280},{-40,300}}))); @@ -322,7 +322,7 @@ protected final k=have_locAdj) "Heating setpoint adjustable" annotation (Placement(transformation(extent={{-60,240},{-40,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=0) "Zero adjustment" annotation (Placement(transformation(extent={{-60,200},{-40,220}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant con2( @@ -345,19 +345,19 @@ protected final k=have_occSen) "Check if there is occupancy sensor" annotation (Placement(transformation(extent={{160,-360},{180,-340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSetWinOpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSetWinOpe( final k=TWinOpeCooSet) "Cooling setpoint when window is open" annotation (Placement(transformation(extent={{-240,-480},{-220,-460}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSetWinOpe( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSetWinOpe( final k=TWinOpeHeaSet) "Heating setpoint when window is open" annotation (Placement(transformation(extent={{-120,-480},{-100,-460}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant alaZer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant alaZer( final k=-0.2) "Alarm level 0" annotation (Placement(transformation(extent={{-180,-400},{-160,-380}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant alaFou( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant alaFou( final k=3.8) "Alarm level 4" annotation (Placement(transformation(extent={{-140,-400},{-120,-380}}))); @@ -393,79 +393,79 @@ protected annotation (Placement(transformation(extent={{-220,-420},{-200,-400}}))); Buildings.Controls.OBC.CDL.Logical.Not not5 "Other than occupied mode" annotation (Placement(transformation(extent={{-280,-400},{-260,-380}}))); - Buildings.Controls.OBC.CDL.Continuous.Less les + Buildings.Controls.OBC.CDL.Reals.Less les "Check if occupied cooling setpoint is less than unoccupied one" annotation (Placement(transformation(extent={{20,-550},{40,-530}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre + Buildings.Controls.OBC.CDL.Reals.Greater gre "Check if occupied heating setpoint is greater than unoccupied one" annotation (Placement(transformation(extent={{20,-610},{40,-590}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater gre2 + Buildings.Controls.OBC.CDL.Reals.Greater gre2 "Check if the difference between cooling and heating setpoints is less than the minimum value" annotation (Placement(transformation(extent={{220,-590},{240,-570}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Switch between occupied and unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-300,520},{-280,540}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Switch between occupied and unoccupied heating setpoint" annotation (Placement(transformation(extent={{-300,440},{-280,460}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Adjustment shall only affect occupied set point" annotation (Placement(transformation(extent={{-120,360},{-100,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "Setpoint can only be adjusted in occupied mode" annotation (Placement(transformation(extent={{220,260},{240,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "If there is no cooling adjustment, zero adjust" annotation (Placement(transformation(extent={{-280,320},{-260,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi6 + Buildings.Controls.OBC.CDL.Reals.Switch swi6 "If there is no heating adjustment, zero adjust" annotation (Placement(transformation(extent={{80,240},{100,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi7 + Buildings.Controls.OBC.CDL.Reals.Switch swi7 "Ensure heating setpoint being not higher than cooling setpoint minus 0.5 degC" annotation (Placement(transformation(extent={{280,-590},{300,-570}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi8 + Buildings.Controls.OBC.CDL.Reals.Switch swi8 "Ensure unoccupied heating setppint being lower than occupied one" annotation (Placement(transformation(extent={{100,-610},{120,-590}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi9 + Buildings.Controls.OBC.CDL.Reals.Switch swi9 "Ensure unoccupied cooling setppint being higher than occupied one" annotation (Placement(transformation(extent={{100,-550},{120,-530}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi10 + Buildings.Controls.OBC.CDL.Reals.Switch swi10 "Switch between occupied and unoccupied cooling setpoint" annotation (Placement(transformation(extent={{220,80},{240,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi11 + Buildings.Controls.OBC.CDL.Reals.Switch swi11 "Switch between occupied and unoccupied cooling setpoint" annotation (Placement(transformation(extent={{220,-140},{240,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi12 + Buildings.Controls.OBC.CDL.Reals.Switch swi12 "Increase cooling setpoint when the zone is continuously unpopulated" annotation (Placement(transformation(extent={{160,-280},{180,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi13 + Buildings.Controls.OBC.CDL.Reals.Switch swi13 "Decrease heating setpoint when the zone is continuously unpopulated" annotation (Placement(transformation(extent={{160,-320},{180,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi14 + Buildings.Controls.OBC.CDL.Reals.Switch swi14 "Switch to TWinOpeCooSet when window is open" annotation (Placement(transformation(extent={{-180,-460},{-160,-440}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi15 + Buildings.Controls.OBC.CDL.Reals.Switch swi15 "Switch to TWinOpeHeaSet when window is open" annotation (Placement(transformation(extent={{-60,-460},{-40,-440}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi16 + Buildings.Controls.OBC.CDL.Reals.Switch swi16 "Generate level 4 alarm when window is open during modes other than occupied" annotation (Placement(transformation(extent={{-100,-420},{-80,-400}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi17 + Buildings.Controls.OBC.CDL.Reals.Switch swi17 "If it is occupied mode, cooling setpoint should be limited" annotation (Placement(transformation(extent={{-180,-550},{-160,-530}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi18 + Buildings.Controls.OBC.CDL.Reals.Switch swi18 "If it is occupied mode, heating setpoint should be limited" annotation (Placement(transformation(extent={{-180,-610},{-160,-590}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi19 + Buildings.Controls.OBC.CDL.Reals.Switch swi19 "If there is occupancy sensor, update heating setpoint according to the occupancy" annotation (Placement(transformation(extent={{220,-320},{240,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi20 + Buildings.Controls.OBC.CDL.Reals.Switch swi20 "If there is occupancy sensor, update cooling setpoint according to the occupancy" annotation (Placement(transformation(extent={{220,-280},{240,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi21 + Buildings.Controls.OBC.CDL.Reals.Switch swi21 "If there is window status sensor, update heating setpoint according to the window status" annotation (Placement(transformation(extent={{160,-480},{180,-460}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi22 + Buildings.Controls.OBC.CDL.Reals.Switch swi22 "If there is window status sensor, update cooling setpoint according to the window status" annotation (Placement(transformation(extent={{100,-460},{120,-440}}))); Buildings.Controls.OBC.CDL.Integers.Equal intEqu7 @@ -521,17 +521,17 @@ protected Buildings.Controls.OBC.CDL.Integers.Equal intEqu5 "Check if the cooling demand limit level is level 3" annotation (Placement(transformation(extent={{-100,20},{-80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add3 "Add real inputs" + Buildings.Controls.OBC.CDL.Reals.Add add3 "Add real inputs" annotation (Placement(transformation(extent={{120,118},{140,138}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add4 "Add real inputs" + Buildings.Controls.OBC.CDL.Reals.Add add4 "Add real inputs" annotation (Placement(transformation(extent={{120,40},{140,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add5 "Add real inputs" + Buildings.Controls.OBC.CDL.Reals.Add add5 "Add real inputs" annotation (Placement(transformation(extent={{160,80},{180,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add6 "Add real inputs" + Buildings.Controls.OBC.CDL.Reals.Add add6 "Add real inputs" annotation (Placement(transformation(extent={{120,-100},{140,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add7 "Add real inputs" + Buildings.Controls.OBC.CDL.Reals.Add add7 "Add real inputs" annotation (Placement(transformation(extent={{120,-180},{140,-160}}))); - Buildings.Controls.OBC.CDL.Continuous.Add add8 "Add real inputs" + Buildings.Controls.OBC.CDL.Reals.Add add8 "Add real inputs" annotation (Placement(transformation(extent={{160,-140},{180,-120}}))); Buildings.Controls.OBC.CDL.Logical.Not winOpe if have_winSen "Window is open" annotation (Placement(transformation(extent={{-380,-420},{-360,-400}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Alarms.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Alarms.mo index 3e80c9ad76a..1c2acbef392 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Alarms.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Alarms.mo @@ -5,10 +5,10 @@ model Alarms "Validate block for generating alarms" final have_CO2Sen=true) "Block that generates alarms" annotation (Placement(transformation(extent={{100,20},{120,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram( final duration=7200) "Generate ramp output" annotation (Placement(transformation(extent={{-120,-70},{-100,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(t=0.75) + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(t=0.75) "Check if input is greater than 0.75" annotation (Placement(transformation(extent={{-80,-70},{-60,-50}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt( @@ -18,15 +18,15 @@ model Alarms "Validate block for generating alarms" annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSetOcc( final k=295.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSetOcc( final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin zonTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin zonTem( final amplitude=8, final freqHz=1/7200, final offset=273.15 + 15) "Zone temperature" @@ -36,7 +36,7 @@ model Alarms "Validate block for generating alarms" final width=0.05) "Generate signal indicating suppressing status" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin CO2( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin CO2( final amplitude=500, final freqHz=1/7200, final offset=600) "CO2 concentration" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ControlLoops.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ControlLoops.mo index bb7aaf2648b..33a4a1f48a0 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ControlLoops.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ControlLoops.mo @@ -4,15 +4,15 @@ model ControlLoops Buildings.Controls.OBC.ASHRAE.G36.ThermalZones.ControlLoops conLoo "Heating and cooling loop" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSetOcc( final k=297.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-60,30},{-40,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSetOcc( final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-60,-50},{-40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin zonTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin zonTem( final amplitude=8, final freqHz=1/7200, final offset=273.15 + 18) "Zone temperature" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Setpoints.mo index 4422af0b942..4f0bf29dea1 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Setpoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/Setpoints.mo @@ -6,26 +6,26 @@ model Setpoints "Validate block for zone set point" final have_winSen=true) "Block that determines the thermal zone setpoints" annotation (Placement(transformation(extent={{110,40},{130,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSetOcc( final k=297.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-80,80},{-60,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSetOcc( final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-40,80},{-20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSetUno( final k=303.15) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSetUno( final k=287.15) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-40,40},{-20,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin cooSetAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin cooSetAdj( final freqHz=1/28800) "Cooling setpoint adjustment" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin heaSetAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin heaSetAdj( final freqHz=1/28800, final amplitude=0.5) "Heating setpoint adjustment" @@ -38,11 +38,11 @@ model Setpoints "Validate block for zone set point" final k=0) "Heating demand limit level" annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram( final duration=28800) "Generate ramp output" annotation (Placement(transformation(extent={{-120,-100},{-100,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr(t=0.75) + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(t=0.75) "Check if input is greater than 0.75" annotation (Placement(transformation(extent={{-80,-100},{-60,-80}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt( @@ -61,13 +61,13 @@ model Setpoints "Validate block for zone set point" annotation (Placement(transformation(extent={{60,10},{80,30}}))); Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not" annotation (Placement(transformation(extent={{-40,-100},{-20,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerAdj( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerAdj( final k=0) "Zero adjustment" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Switch to zero adjustment when window is open" annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "Switch to zero adjustment when window is open" annotation (Placement(transformation(extent={{-20,10},{0,30}}))); Buildings.Controls.OBC.CDL.Logical.Not not2 diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ZoneStates.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ZoneStates.mo index 8499623fc82..b24d1ee9a81 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ZoneStates.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Validation/ZoneStates.mo @@ -2,13 +2,13 @@ within Buildings.Controls.OBC.ASHRAE.G36.ThermalZones.Validation; model ZoneStates "Validation models of determining zone state" Buildings.Controls.OBC.ASHRAE.G36.ThermalZones.ZoneStates zonSta "Zone state" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse uCoo( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse uCoo( final period=2, final shift=1, final offset=0, final amplitude=1) "Cooling control signal" annotation (Placement(transformation(extent={{-80,-40},{-60,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse uHea( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse uHea( final period=2, final shift=2, final offset=0, diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ZoneStates.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ZoneStates.mo index e0e9532c23b..98a7f4f54c8 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ZoneStates.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/ZoneStates.mo @@ -40,22 +40,22 @@ protected annotation (Placement(transformation(extent={{70,-80},{90,-60}}))); Buildings.Controls.OBC.CDL.Logical.And isHea "In heating state if both conditions are true" annotation (Placement(transformation(extent={{-72,30},{-52,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysUHea( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysUHea( final uLow=uLow, final uHigh=uHigh) "Check if it is in heating state" annotation (Placement(transformation(extent={{-120,60},{-100,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysUCoo( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysUCoo( final uLow=uLow, final uHigh=uHigh) "Check if it is in cooling state" annotation (Placement(transformation(extent={{-100,-50},{-80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract uHeaMinUCoo + Buildings.Controls.OBC.CDL.Reals.Subtract uHeaMinUCoo "Difference between uHea and uCoo" annotation (Placement(transformation(extent={{-130,0},{-110,20}}))); Buildings.Controls.OBC.CDL.Logical.And isCoo "In cooling state if both inputs are true" annotation (Placement(transformation(extent={{-10,-30},{10,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysU( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hysU( final uLow=-uLow, final uHigh=uLow) "Check if heating control signal is bigger than cooling control signal" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Setpoints.mo index 5e4d0e11d9c..70d16027469 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Setpoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Setpoints.mo @@ -139,17 +139,17 @@ protected final realFalse=zonDisEff_heat) "Air distribution effectiveness" annotation (Placement(transformation(extent={{-180,-320},{-160,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin if have_CO2Sen + Buildings.Controls.OBC.CDL.Reals.Line lin if have_CO2Sen "CO2 control loop" annotation (Placement(transformation(extent={{-160,-70},{-140,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer( final k=0) if have_CO2Sen "Constant zero" annotation (Placement(transformation(extent={{-280,-100},{-260,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one( final k=1) if have_CO2Sen "Constant one" annotation (Placement(transformation(extent={{-220,-100},{-200,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar( + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar( final p=-200) if have_CO2Sen "Lower threshold of CO2 setpoint" annotation (Placement(transformation(extent={{-220,-50},{-200,-30}}))); @@ -159,30 +159,30 @@ protected Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea if have_CO2Sen "Convert boolean to real" annotation (Placement(transformation(extent={{-160,20},{-140,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply co2Con if have_CO2Sen + Buildings.Controls.OBC.CDL.Reals.Multiply co2Con if have_CO2Sen "Corrected CO2 control loop output" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Line occMinAirSet if have_CO2Sen and not have_SZVAV + Buildings.Controls.OBC.CDL.Reals.Line occMinAirSet if have_CO2Sen and not have_SZVAV "Modified occupied minimum airflow setpoint" annotation (Placement(transformation(extent={{-20,-130},{0,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonMinFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonMinFlo( final k=VMin_flow) if not have_SZVAV "Zone minimum airflow setpoint Vmin" annotation (Placement(transformation(extent={{-280,60},{-260,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonCooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonCooMaxFlo( final k=VCooMax_flow) if have_CO2Sen and not have_SZVAV "Maximum cooling airflow setpoint" annotation (Placement(transformation(extent={{-280,-160},{-260,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Line popBreOutAir if have_CO2Sen + Buildings.Controls.OBC.CDL.Reals.Line popBreOutAir if have_CO2Sen "Modified population componenet of the required breathing zone outdoor airflow" annotation (Placement(transformation(extent={{-20,-190},{0,-170}}))); Buildings.Controls.OBC.CDL.Integers.Equal inCooSta if have_CO2Sen and have_parFanPowUni "Check if it is in cooling state" annotation (Placement(transformation(extent={{-220,-230},{-200,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch maxFloCO2 if have_CO2Sen and have_parFanPowUni + Buildings.Controls.OBC.CDL.Reals.Switch maxFloCO2 if have_CO2Sen and have_parFanPowUni "Maximum airflow set point for CO2" annotation (Placement(transformation(extent={{-160,-230},{-140,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract difCooMax if have_CO2Sen and have_parFanPowUni + Buildings.Controls.OBC.CDL.Reals.Subtract difCooMax if have_CO2Sen and have_parFanPowUni "Maximum cooling airflw set point minus parallel fan airflow" annotation (Placement(transformation(extent={{-220,-270},{-200,-250}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 @@ -198,22 +198,22 @@ protected final k=permit_occStandby) if have_occSen "Permit occupied-standby mode" annotation (Placement(transformation(extent={{-260,120},{-240,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer1( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-20,270},{0,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch modPopBreAir + Buildings.Controls.OBC.CDL.Reals.Switch modPopBreAir "Modified popuplation component of the breathing zone airflow" annotation (Placement(transformation(extent={{180,280},{200,300}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch modAreBreAir + Buildings.Controls.OBC.CDL.Reals.Switch modAreBreAir "Modified area component of the breathing zone airflow" annotation (Placement(transformation(extent={{140,250},{160,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch occMinAir if not + Buildings.Controls.OBC.CDL.Reals.Switch occMinAir if not have_SZVAV "Occupied minimum airflow setpoint" annotation (Placement(transformation(extent={{80,220},{100,240}}))); Buildings.Controls.OBC.CDL.Logical.Not notOcc if have_occSen "Not occupied" annotation (Placement(transformation(extent={{-280,160},{-260,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch unpPopBreAir + Buildings.Controls.OBC.CDL.Reals.Switch unpPopBreAir "Population component of the required breathing zone outdoor airflow when it is unpopulated" annotation (Placement(transformation(extent={{140,160},{160,180}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1( @@ -221,34 +221,34 @@ protected final realFalse=1) if have_occSen "Convert boolean to real" annotation (Placement(transformation(extent={{-220,120},{-200,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply unPopAreBreAir if have_occSen + Buildings.Controls.OBC.CDL.Reals.Multiply unPopAreBreAir if have_occSen "Area component of the required breathing zone outdoor airflow when it is unpopulated" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply unpMinZonFlo if have_occSen and not have_SZVAV + Buildings.Controls.OBC.CDL.Reals.Multiply unpMinZonFlo if have_occSen and not have_SZVAV "Minimum zone airflow when it is unpopulated" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch unpAreBreAir + Buildings.Controls.OBC.CDL.Reals.Switch unpAreBreAir "Area component of the required breathing zone outdoor airflow when it is unpopulated" annotation (Placement(transformation(extent={{80,130},{100,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch unpMinZonAir if not have_SZVAV + Buildings.Controls.OBC.CDL.Reals.Switch unpMinZonAir if not have_SZVAV "Minimum zone airflow when it is unpopulated" annotation (Placement(transformation(extent={{20,100},{40,120}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant con1( final k=false) if not have_occSen "Constant false" annotation (Placement(transformation(extent={{-40,180},{-20,200}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=1) if not have_CO2Sen and not have_SZVAV "Dummy gain for conditional input" annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=1) if not have_CO2Sen "Dummy gain for conditional input" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Add reqBreAir + Buildings.Controls.OBC.CDL.Reals.Add reqBreAir "Required breathing zone outdoor airflow" annotation (Placement(transformation(extent={{220,260},{240,280}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide minOA "Minimum outdoor airflow setpoint" + Buildings.Controls.OBC.CDL.Reals.Divide minOA "Minimum outdoor airflow setpoint" annotation (Placement(transformation(extent={{260,0},{280,20}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant occMod( final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) @@ -259,28 +259,28 @@ protected if have_CO2Sen and have_parFanPowUni "Cooling state" annotation (Placement(transformation(extent={{-280,-250},{-260,-230}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer2( final k=0) if not have_occSen "Constant zero" annotation (Placement(transformation(extent={{-80,140},{-60,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer3( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer3( final k=0) if not have_occSen or have_SZVAV "Constant zero" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater cooSup( + Buildings.Controls.OBC.CDL.Reals.Greater cooSup( final h=dTHys) "Check if it is supplying cooling" annotation (Placement(transformation(extent={{-220,-320},{-200,-300}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai2( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2( final k=1) if have_CO2Sen and not have_SZVAV and not have_parFanPowUni "Dummy gain for conditional input" annotation (Placement(transformation(extent={{-160,-160},{-140,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant desAreAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant desAreAir( final k=VAreBreZon_flow) "Design area component of the breathing zone outdoor airflow" annotation (Placement(transformation(extent={{-180,250},{-160,270}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant desPopAir( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant desPopAir( final k=VPopBreZon_flow) "Design population component of the breathing zone outdoor airflow" annotation (Placement(transformation(extent={{-180,290},{-160,310}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Validation/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Validation/Setpoints.mo index 44a306dc1f5..7878e44c25a 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Validation/Setpoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/ASHRAE62_1/Validation/Setpoints.mo @@ -48,11 +48,11 @@ model Setpoints "Validate the outdoor airflow setpoint according to the ASHRAE 6 final VMin_flow=0.018) "Setpoints of a zone with CO2 sensor and single zone VAV AHU" annotation (Placement(transformation(extent={{180,-20},{200,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram( final duration=7200) "Generate ramp output" annotation (Placement(transformation(extent={{-200,100},{-180,120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.75) "Check if input is greater than 0.75" annotation (Placement(transformation(extent={{-160,100},{-140,120}}))); @@ -63,12 +63,12 @@ model Setpoints "Validate the outdoor airflow setpoint according to the ASHRAE 6 final integerFalse=2) "Convert boolean input to integer output" annotation (Placement(transformation(extent={{-80,100},{-60,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin zonTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin zonTem( final amplitude=8, final freqHz=1/7200, final offset=273.15 + 15) "Zone temperature" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin disTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin disTem( final amplitude=-5, final freqHz=1/7200, final offset=273.15 + 20) "Discharge air temperature" @@ -82,12 +82,12 @@ model Setpoints "Validate the outdoor airflow setpoint according to the ASHRAE 6 final width=0.8) "Occupancy status" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp co2Con( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp co2Con( final height=300, final duration=7200, offset=800) "CO2 concentration" annotation (Placement(transformation(extent={{-80,-140},{-60,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram1( final height=2.6, final duration=7200, offset=0.6) "Generate ramp output" @@ -95,12 +95,12 @@ model Setpoints "Validate the outdoor airflow setpoint according to the ASHRAE 6 Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real input to integer output" annotation (Placement(transformation(extent={{80,120},{100,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin parFanFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin parFanFlo( final amplitude=0.01, final freqHz=1/7200, final offset=0.008) "Parallel fan flow rate" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set( final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Setpoints.mo index 633cdb4bb57..5c8870313e1 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Setpoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Setpoints.mo @@ -98,50 +98,50 @@ block Setpoints iconTransformation(extent={{100,-110},{140,-70}}))); protected - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=0.25) "Gain factor" annotation (Placement(transformation(extent={{-100,220},{-80,240}}))); - Buildings.Controls.OBC.CDL.Continuous.Max max1 + Buildings.Controls.OBC.CDL.Reals.Max max1 "Find the larger input value" annotation (Placement(transformation(extent={{-180,80},{-160,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonOccOAMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonOccOAMin( final k=VOccMin_flow) "Zone minimum outdoor airflow for occupants" annotation (Placement(transformation(extent={{-280,320},{-260,340}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonAreOAMin( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonAreOAMin( final k=VAreMin_flow) "Zone minimum outdoor airflow for building area" annotation (Placement(transformation(extent={{-280,270},{-260,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch zonAbsMin + Buildings.Controls.OBC.CDL.Reals.Switch zonAbsMin "Zone absolute outdoor air minimum flow" annotation (Placement(transformation(extent={{40,240},{60,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer1( final k=0) "Constant zero" annotation (Placement(transformation(extent={{-100,270},{-80,290}}))); Buildings.Controls.OBC.CDL.Logical.Not notOcc "Not occupied" annotation (Placement(transformation(extent={{-180,200},{-160,220}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch zonAbsMin1 + Buildings.Controls.OBC.CDL.Reals.Switch zonAbsMin1 "Zone absolute outdoor air minimum flow" annotation (Placement(transformation(extent={{-20,200},{0,220}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant havCO2Sen( final k=have_CO2Sen) "Check if the zone has CO2 sensor" annotation (Placement(transformation(extent={{-260,160},{-240,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch zonAbsMin2 + Buildings.Controls.OBC.CDL.Reals.Switch zonAbsMin2 "Zone absolute outdoor air minimum flow" annotation (Placement(transformation(extent={{-80,160},{-60,180}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch zonDesMin + Buildings.Controls.OBC.CDL.Reals.Switch zonDesMin "Zone design outdoor air minimum flow" annotation (Placement(transformation(extent={{40,120},{60,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch zonDesMin1 + Buildings.Controls.OBC.CDL.Reals.Switch zonDesMin1 "Zone design outdoor air minimum flow" annotation (Placement(transformation(extent={{-20,100},{0,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch zonOccMin if not have_SZVAV + Buildings.Controls.OBC.CDL.Reals.Switch zonOccMin if not have_SZVAV "Zone occupied minimum flow" annotation (Placement(transformation(extent={{240,50},{260,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch zonOccMin1 if not have_SZVAV + Buildings.Controls.OBC.CDL.Reals.Switch zonOccMin1 if not have_SZVAV "Zone occupied minimum flow" annotation (Placement(transformation(extent={{180,30},{200,50}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant occMod( @@ -152,39 +152,39 @@ protected Buildings.Controls.OBC.CDL.Integers.Equal inOccMod if have_CO2Sen "Check if it is in occupied mode" annotation (Placement(transformation(extent={{-220,10},{-200,30}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter addPar(final p=-200) + Buildings.Controls.OBC.CDL.Reals.AddParameter addPar(final p=-200) if have_CO2Sen "Lower threshold of CO2 setpoint" annotation (Placement(transformation(extent={{-220,-60},{-200,-40}}))); - Buildings.Controls.OBC.CDL.Continuous.Line lin if have_CO2Sen + Buildings.Controls.OBC.CDL.Reals.Line lin if have_CO2Sen "CO2 control loop" annotation (Placement(transformation(extent={{-160,-80},{-140,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(final k=0) "Constant zero" annotation (Placement(transformation(extent={{-280,-110},{-260,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one(final k=1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(final k=1) "Constant one" annotation (Placement(transformation(extent={{-220,-110},{-200,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply co2Con if have_CO2Sen + Buildings.Controls.OBC.CDL.Reals.Multiply co2Con if have_CO2Sen "Corrected CO2 control loop output" annotation (Placement(transformation(extent={{-80,-60},{-60,-40}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea if have_CO2Sen "Convert boolean to real" annotation (Placement(transformation(extent={{-160,10},{-140,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Line zonOccMin2 + Buildings.Controls.OBC.CDL.Reals.Line zonOccMin2 if have_CO2Sen and have_typTerUni "Zone occupied minimum flow when the system has typical terminal units" annotation (Placement(transformation(extent={{120,-150},{140,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonMinFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonMinFlo( final k=VMin_flow) "Zone minimum airflow" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonCooMaxFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonCooMaxFlo( final k=VCooMax_flow) if have_CO2Sen and (have_typTerUni or have_parFanPowUni) "Zone cooling maximum airflow" annotation (Placement(transformation(extent={{-280,-158},{-260,-138}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant hal( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant hal( final k=0.5) if have_CO2Sen and (have_typTerUni or have_parFanPowUni) "Constant value" annotation (Placement(transformation(extent={{-160,-110},{-140,-90}}))); @@ -197,19 +197,19 @@ protected if have_CO2Sen and have_parFanPowUni "Check if it is in cooling state" annotation (Placement(transformation(extent={{-220,-220},{-200,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract difCooMax + Buildings.Controls.OBC.CDL.Reals.Subtract difCooMax if have_CO2Sen and have_parFanPowUni "Maximum cooling airflw set point minus parallel fan airflow" annotation (Placement(transformation(extent={{-220,-260},{-200,-240}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch maxFloCO2 + Buildings.Controls.OBC.CDL.Reals.Switch maxFloCO2 if have_CO2Sen and have_parFanPowUni "Maximum airflow set point for CO2" annotation (Placement(transformation(extent={{-160,-220},{-140,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Line zonOccMin3 + Buildings.Controls.OBC.CDL.Reals.Line zonOccMin3 if have_CO2Sen and have_parFanPowUni "Zone occupied minimum flow when the system has parallel fan-powered terminal unit" annotation (Placement(transformation(extent={{120,-200},{140,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Line zonOccMin4 if have_SZVAV + Buildings.Controls.OBC.CDL.Reals.Line zonOccMin4 if have_SZVAV "Zone minimum outdoor flow when it is the single zone VAV system" annotation (Placement(transformation(extent={{120,-310},{140,-290}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant con( @@ -221,15 +221,15 @@ protected final k=true) if not have_occSen "Constant true" annotation (Placement(transformation(extent={{-280,220},{-260,240}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai1( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1( final k=1) if not have_CO2Sen "Dummy gain for conditional input" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant one2(final k=1) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant one2(final k=1) if not have_CO2Sen "Constant one" annotation (Placement(transformation(extent={{-80,-270},{-60,-250}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zer3(final k=0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer3(final k=0) if not have_CO2Sen "Constant zero" annotation (Placement(transformation(extent={{200,-90},{220,-70}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Validation/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Validation/Setpoints.mo index 314ae985830..c0a283c12c5 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Validation/Setpoints.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/VentilationZones/Title24/Validation/Setpoints.mo @@ -48,11 +48,11 @@ model Setpoints "Validate the outdoor airflow setpoint according to the Title 24 final VMin_flow=0.018) "Setpoints of a zone with CO2 sensor and single zone VAV AHU" annotation (Placement(transformation(extent={{180,-20},{200,0}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram( final duration=7200) "Generate ramp output" annotation (Placement(transformation(extent={{-200,100},{-180,120}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=0.75) "Check if input is greater than 0.75" annotation (Placement(transformation(extent={{-160,100},{-140,120}}))); @@ -72,12 +72,12 @@ model Setpoints "Validate the outdoor airflow setpoint according to the Title 24 final width=0.8) "Occupancy status" annotation (Placement(transformation(extent={{-80,-90},{-60,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp co2Con( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp co2Con( final height=300, final duration=7200, offset=800) "CO2 concentration" annotation (Placement(transformation(extent={{-80,-140},{-60,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram1( final height=2.6, final duration=7200, offset=0.6) "Generate ramp output" @@ -85,12 +85,12 @@ model Setpoints "Validate the outdoor airflow setpoint according to the Title 24 Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real input to integer output" annotation (Placement(transformation(extent={{80,120},{100,140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin parFanFlo( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin parFanFlo( final amplitude=0.01, final freqHz=1/7200, final offset=0.008) "Parallel fan flow rate" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant CO2Set( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant CO2Set( final k=894) "CO2 concentration setpoint" annotation (Placement(transformation(extent={{-120,-10},{-100,10}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/GroupStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/GroupStatus.mo index b6e345e9de9..369e216cc49 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/GroupStatus.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/GroupStatus.mo @@ -166,11 +166,11 @@ block GroupStatus "Block that outputs the zone group status" Buildings.Controls.OBC.CDL.Logical.Not not1[nGroZon] "Logical not" annotation (Placement(transformation(extent={{-60,-310},{-40,-290}}))); protected - Buildings.Controls.OBC.CDL.Continuous.MultiMax cooDowTim( + Buildings.Controls.OBC.CDL.Reals.MultiMax cooDowTim( final nin=nGroZon) "Longest cooldown time" annotation (Placement(transformation(extent={{60,170},{80,190}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMax warUpTim( + Buildings.Controls.OBC.CDL.Reals.MultiMax warUpTim( final nin=nGroZon) "Longest warm up time" annotation (Placement(transformation(extent={{60,130},{80,150}}))); @@ -182,11 +182,11 @@ protected final nin=nGroZon) "Check if there is any zone that the zone temperature is higher than its occupied cooling setpoint" annotation (Placement(transformation(extent={{60,50},{80,70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMax maxTem( + Buildings.Controls.OBC.CDL.Reals.MultiMax maxTem( final nin=nGroZon) "Maximum zone temperature in the zone group" annotation (Placement(transformation(extent={{20,-230},{40,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMin minTem( + Buildings.Controls.OBC.CDL.Reals.MultiMin minTem( final nin=nGroZon) "Minimum zone temperature in the zone group" annotation (Placement(transformation(extent={{20,-270},{40,-250}}))); @@ -210,44 +210,44 @@ protected final nin=nGroZon) "Check if all zones have ended the setup mode" annotation (Placement(transformation(extent={{18,-190},{38,-170}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum sumUnoHea( + Buildings.Controls.OBC.CDL.Reals.MultiSum sumUnoHea( final nin=nGroZon) "Sum of all zones unoccupied heating setpoint" annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract difUnoHea + Buildings.Controls.OBC.CDL.Reals.Subtract difUnoHea "Difference between unoccupied heating setpoint and zone temperature" annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div1 "Average difference" + Buildings.Controls.OBC.CDL.Reals.Divide div1 "Average difference" annotation (Placement(transformation(extent={{40,-30},{60,-10}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant totZon( final k=nBuiZon) "Total number of zones" annotation (Placement(transformation(extent={{-60,110},{-40,130}}))); Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea "Convert integer to real" annotation (Placement(transformation(extent={{-20,110},{0,130}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum sumUnoCoo( + Buildings.Controls.OBC.CDL.Reals.MultiSum sumUnoCoo( final nin=nGroZon) "Sum of all zones unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-60,-160},{-40,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiSum sumTem( + Buildings.Controls.OBC.CDL.Reals.MultiSum sumTem( final nin=nGroZon) "Sum of all zones temperature" annotation (Placement(transformation(extent={{-60,-210},{-40,-190}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract difUnoCoo + Buildings.Controls.OBC.CDL.Reals.Subtract difUnoCoo "Difference between unoccupied cooling setpoint and zone temperature" annotation (Placement(transformation(extent={{-10,-130},{10,-110}}))); - Buildings.Controls.OBC.CDL.Continuous.Divide div2 "Average difference" + Buildings.Controls.OBC.CDL.Reals.Divide div2 "Average difference" annotation (Placement(transformation(extent={{40,-140},{60,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys( final uLow=uLow, final uHigh=uHigh) "Hysteresis that outputs if the group should run in setback mode" annotation (Placement(transformation(extent={{80,-30},{100,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys1( final uLow=uLow, final uHigh=uHigh) "Hysteresis that outputs if the group should run in setup mode" annotation (Placement(transformation(extent={{80,-140},{100,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMin minToNexOcc( + Buildings.Controls.OBC.CDL.Reals.MultiMin minToNexOcc( final nin=nGroZon) "Minimum time to next occupied period" annotation (Placement(transformation(extent={{-40,210},{-20,230}}))); @@ -274,7 +274,7 @@ protected final realFalse=1) "When any zone becomes occpuied, output zero" annotation (Placement(transformation(extent={{20,230},{40,250}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "When it is occupied, output zero" annotation (Placement(transformation(extent={{80,210},{100,230}}))); Buildings.Controls.OBC.CDL.Routing.BooleanVectorFilter zonOccFil( diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/OperationMode.mo index f70f933665c..2c186397ac5 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/OperationMode.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/OperationMode.mo @@ -89,16 +89,16 @@ block OperationMode "Block that outputs the operation mode" iconTransformation(extent={{100,-20},{140,20}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant occModInd( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant occModInd( final k=Buildings.Controls.OBC.ASHRAE.G36.Types.OperationModes.occupied) "Occupied mode " annotation (Placement(transformation(extent={{100,340},{120,360}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant unoPerInd(final k=0.0) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant unoPerInd(final k=0.0) "Index to indicate unoccupied period" annotation (Placement(transformation(extent={{0,340},{20,360}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch corCooDowTim "Corrected cool down period" + Buildings.Controls.OBC.CDL.Reals.Switch corCooDowTim "Corrected cool down period" annotation (Placement(transformation(extent={{-220,240},{-200,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch corWarUpTim "Corrected warm-up period" + Buildings.Controls.OBC.CDL.Reals.Switch corWarUpTim "Corrected warm-up period" annotation (Placement(transformation(extent={{-200,140},{-180,160}}))); Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr( final t=4) "Check if the number of cold zones is not less than than 5" @@ -112,49 +112,49 @@ protected Buildings.Controls.OBC.CDL.Logical.Latch lat2 "If all zone temperature are lower than unoccupied cooling setpoint by a given limit, then the setup mode should be off" annotation (Placement(transformation(extent={{-100,-200},{-80,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys2( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys2( final pre_y_start=true, final uHigh=0, final uLow=-60) "Hysteresis that outputs if the maximum cool-down time is more than the allowed cool-down time" annotation (Placement(transformation(extent={{-260,240},{-240,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys3( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys3( final pre_y_start=true, final uHigh=0, final uLow=-60) "Hysteresis that outputs if the maximum warm-up time is more than allowed warm-up time" annotation (Placement(transformation(extent={{-260,140},{-240,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub5 + Buildings.Controls.OBC.CDL.Reals.Subtract sub5 "Calculate differential between time-to-next-occupancy and the cool-down time" annotation (Placement(transformation(extent={{-160,240},{-140,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys4( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys4( final pre_y_start=false, final uHigh=0, final uLow=-60) "Hysteresis to check if the cooldown mode could be activated" annotation (Placement(transformation(extent={{-120,240},{-100,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys5( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys5( final pre_y_start=false, final uHigh=0, final uLow=-60) "Hysteresis to activate the warm-up model" annotation (Placement(transformation(extent={{-120,150},{-100,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub6 + Buildings.Controls.OBC.CDL.Reals.Subtract sub6 "Calculate differential between time-to-next-occupancy and the warm-up time" annotation (Placement(transformation(extent={{-160,150},{-140,170}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys9( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys9( final pre_y_start=false, final uLow=-0.1, final uHigh=0.1) "Hysteresis that outputs if any zone temperature is lower than freeze protection threshold temperature" annotation (Placement(transformation(extent={{-180,-100},{-160,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys10( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys10( final pre_y_start=false, final uLow=-0.1, final uHigh=0.1) "Hysteresis that outputs if all zone temperature are higher than threshold temperature of ending freeze protection" annotation (Placement(transformation(extent={{-180,-140},{-160,-120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant maxWarCooTime( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxWarCooTime( final k=preWarCooTim) "Allowed maximum warm-up or cool-down time" annotation (Placement(transformation(extent={{-340,190},{-320,210}}))); @@ -249,16 +249,16 @@ protected Buildings.Controls.OBC.CDL.Logical.Or or6 "Check if it is in any of the 6 modes except unoccupied mode" annotation (Placement(transformation(extent={{40,-370},{60,-350}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi + Buildings.Controls.OBC.CDL.Reals.Switch swi "Switch between occupied mode index and unoccupied period index" annotation (Placement(transformation(extent={{160,310},{180,330}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi3 + Buildings.Controls.OBC.CDL.Reals.Switch swi3 "If the Cool-down, warm-up, or Occupied mode is on, then setback mode should not be activated." annotation (Placement(transformation(extent={{60,20},{80,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi4 + Buildings.Controls.OBC.CDL.Reals.Switch swi4 "If the Cool-down, warm-up, or Occupied mode is on, then freeze protection setback mode should not be activated." annotation (Placement(transformation(extent={{60,-100},{80,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi5 + Buildings.Controls.OBC.CDL.Reals.Switch swi5 "If the Cool-down, warm-up, or Occupied mode is on, then setup mode should not be activated." annotation (Placement(transformation(extent={{60,-200},{80,-180}}))); Buildings.Controls.OBC.CDL.Logical.Not not5 "Logical not" @@ -276,13 +276,13 @@ protected final message="Level 4 alarm: window open during modes other than occupied mode") "Generate alarm message when window open during modes other than occupied mode" annotation (Placement(transformation(extent={{240,80},{260,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi1 + Buildings.Controls.OBC.CDL.Reals.Switch swi1 "If occupied mode is on, then cool down mode should not be activated" annotation (Placement(transformation(extent={{140,270},{160,290}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger setBacMod1 "Convert Real number to Integer number" annotation (Placement(transformation(extent={{180,270},{200,290}}))); - Buildings.Controls.OBC.CDL.Continuous.Switch swi2 + Buildings.Controls.OBC.CDL.Reals.Switch swi2 "If occupied mode is on, then warm-up mode should not be activated." annotation (Placement(transformation(extent={{140,180},{160,200}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger setBacMod2 @@ -302,18 +302,18 @@ protected Buildings.Controls.OBC.CDL.Integers.Equal allHot "Check if all zones are hot zone" annotation (Placement(transformation(extent={{-280,-230},{-260,-210}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant actFreProTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant actFreProTem( final k=TZonFreProOn) "Threshold temperature to activate the freeze protection mode" annotation (Placement(transformation(extent={{-280,-110},{-260,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant endFreProTem( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant endFreProTem( final k=TZonFreProOff) "Threshold temperature to end the freeze protection mode" annotation (Placement(transformation(extent={{-280,-150},{-260,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate differential between minimum zone temperature and freeze protection threshold temperature" annotation (Placement(transformation(extent={{-220,-100},{-200,-80}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate differential between maximum zone temperature and threshold temperature of ending freeze protection" annotation (Placement(transformation(extent={{-220,-140},{-200,-120}}))); Buildings.Controls.OBC.CDL.Logical.Or or2 @@ -322,10 +322,10 @@ protected Buildings.Controls.OBC.CDL.Logical.Or or7 "Enough hot zone or the high average zone temperature" annotation (Placement(transformation(extent={{-160,-200},{-140,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate the difference between maximum cool down time and the allowed maximum cool down time" annotation (Placement(transformation(extent={{-300,240},{-280,260}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub4 + Buildings.Controls.OBC.CDL.Reals.Subtract sub4 "Calculate the differential between maximum warm-up time and the allowed maximum warm-up time" annotation (Placement(transformation(extent={{-300,140},{-280,160}}))); Buildings.Controls.OBC.CDL.Logical.Edge endSetBac diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/GroupStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/GroupStatus.mo index 00207ff0a3b..36a7df02bf2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/GroupStatus.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/GroupStatus.mo @@ -7,11 +7,11 @@ model GroupStatus final nGroZon=2, final zonGroMsk={true,false,true}) "Calculate zone group status" annotation (Placement(transformation(extent={{120,-60},{140,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim[3]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant warUpTim[3]( final k={1800,1700,1900}) "Warm-up time" annotation (Placement(transformation(extent={{-100,-30},{-80,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim[3]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooDowTim[3]( final k={1600,1700,1800}) "Cooling down time" annotation (Placement(transformation(extent={{-140,-10},{-120,10}}))); @@ -21,19 +21,19 @@ model GroupStatus final shift={150,130,120}) "Window status" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-50,-300}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( final offset=0, final height=6.2831852, final duration=24*3600) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-140,-220},{-120,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin2 + Buildings.Controls.OBC.CDL.Reals.Sin sin2 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-100,-220},{-80,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=6) "Current zone temperature" annotation (Placement(transformation(extent={{-60,-220},{-40,-200}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem( + Buildings.Controls.OBC.CDL.Reals.AddParameter zonTem( final p=273.15 + 22.5) "Current zone temperature" annotation (Placement(transformation(extent={{-20,-220},{0,-200}}))); @@ -60,10 +60,10 @@ model GroupStatus annotation (Placement(transformation(extent={{-20,130},{0,150}}))); Buildings.Controls.OBC.CDL.Logical.Timer tim3 "Time after input becomes true" annotation (Placement(transformation(extent={{-20,10},{0,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract addPar1 + Buildings.Controls.OBC.CDL.Reals.Subtract addPar1 "Time to occupied period" annotation (Placement(transformation(extent={{20,130},{40,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract addPar3 + Buildings.Controls.OBC.CDL.Reals.Subtract addPar3 "Time to occupied period" annotation (Placement(transformation(extent={{20,10},{40,30}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse lowOccHea[3]( @@ -84,7 +84,7 @@ model GroupStatus final period=fill(3600, 3)) "Lower than unoccupied heating setpoint" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-130,-80}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant heaSetOff[3]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant heaSetOff[3]( final k={285.15,282.15,283.15}) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-100,-110},{-80,-90}}))); @@ -97,7 +97,7 @@ model GroupStatus final k=fill(false, 3)) "HIgher than unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-90,-140}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooSetOff[3]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooSetOff[3]( final k={303.15,304.15,305.15}) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-140,-170},{-120,-150}}))); @@ -105,12 +105,12 @@ model GroupStatus final k=fill(false,3)) "End setup mode" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-90,-180}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse zonTem3( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse zonTem3( final amplitude=7, final period=600, final offset=273.15 + 19) "Zone 3 temperature" annotation (Placement(transformation(extent={{-80,-280},{-60,-260}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zonTem2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant zonTem2( final k=273.15 + 20) "Zone 2 temperature" annotation (Placement(transformation(extent={{-120,-260},{-100,-240}}))); @@ -121,14 +121,14 @@ model GroupStatus Buildings.Controls.OBC.CDL.Logical.Not not2 "Logical not" annotation (Placement(transformation(extent={{-60,70},{-40,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant tNexOcc2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant tNexOcc2( final k=0) "Zone 2 next occupancy time" annotation (Placement(transformation(extent={{40,60},{60,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=1800) "Constant" annotation (Placement(transformation(extent={{-20,170},{0,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( final k=2100) "Constant" annotation (Placement(transformation(extent={{-20,60},{0,80}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/OperationMode.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/OperationMode.mo index 9a31abb9c1f..62a4e58f06f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/OperationMode.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/OperationMode.mo @@ -5,73 +5,73 @@ model OperationMode "Validate block for selecting operation mode" opeModSel(final nZon=1) "Operation mode selection" annotation (Placement(transformation(extent={{120,80},{140,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( final height=6.2831852, final duration=172800) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-160,40},{-140,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin1 + Buildings.Controls.OBC.CDL.Reals.Sin sin1 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-120,40},{-100,60}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem( + Buildings.Controls.OBC.CDL.Reals.AddParameter zonTem( final p=295.65) "Zone temperarure" annotation (Placement(transformation(extent={{-48,40},{-28,60}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSetUno( final k=285.15) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-120,-40},{-100,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSetUno( final k=303.15) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-120,-110},{-100,-90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonHeaSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonHeaSetOcc( final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-160,70},{-140,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TZonCooSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TZonCooSetOcc( final k=297.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-120,10},{-100,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant warUpTim( final k=1800) "Warm-up time" annotation (Placement(transformation(extent={{-120,100},{-100,120}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooDowTim( final k=1800) "Cooling down time" annotation (Placement(transformation(extent={{-160,120},{-140,140}}))); Buildings.Controls.OBC.CDL.Integers.Sources.Constant cloWin( final k=0) "No window is open" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={-150,0}))); - Buildings.Controls.OBC.CDL.Continuous.Greater lowThaHeaSet + Buildings.Controls.OBC.CDL.Reals.Greater lowThaHeaSet "True when the zone temperature is lower than the occupied heating setpoint" annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater higThaCooSet + Buildings.Controls.OBC.CDL.Reals.Greater higThaCooSet "True when the zone temperature is higher than the occupied cooling setpoint" annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu2 + Buildings.Controls.OBC.CDL.Reals.Greater greEqu2 "True when the zone temperature is lower than unoccupied heating setpoint" annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-40},{60,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Greater greEqu3 + Buildings.Controls.OBC.CDL.Reals.Greater greEqu3 "True when the zone temperature is lower than unoccupied heating setpoint" annotation (Placement(transformation(extent={{0,-110},{20,-90}}))); Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1 "Convert boolean to integer" annotation (Placement(transformation(extent={{40,-110},{60,-90}}))); Buildings.Controls.SetPoints.OccupancySchedule occSch "Occupancy schedule" annotation (Placement(transformation(extent={{-120,140},{-100,160}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract dif2 + Buildings.Controls.OBC.CDL.Reals.Subtract dif2 "Calculate zone temperature difference to unoccupied heating setpoint" annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys3( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys3( final uLow=-0.5, final uHigh=0.5) "Hysteresis that outputs if the zone temperature is higher than its unoccupied heating setpoint by a given limit" annotation (Placement(transformation(extent={{40,-70},{60,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract dif1 + Buildings.Controls.OBC.CDL.Reals.Subtract dif1 "Calculate zone temperature difference to unoccupied cooling setpoint" annotation (Placement(transformation(extent={{0,-150},{20,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys1( final uLow=-0.5, final uHigh=0.5) "Hysteresis that outputs if the zone temperature is lower than its unoccupied cooling setpoint by a given limit" annotation (Placement(transformation(extent={{40,-150},{60,-130}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=14.5) "Gain factor" annotation (Placement(transformation(extent={{-80,40},{-60,60}}))); equation diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatus.mo index 64e3356305d..78638701e46 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatus.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatus.mo @@ -10,10 +10,10 @@ model ZoneStatus final have_winSen=true) "Status of zone when there is window operation sensor" annotation (Placement(transformation(extent={{80,-20},{100,8}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant warUpTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant warUpTim( final k=1800) "Warm-up time" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cooDowTim( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cooDowTim( final k=1800) "Cooling down time" annotation (Placement(transformation(extent={{-80,90},{-60,110}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse uWinSta( @@ -22,34 +22,34 @@ model ZoneStatus final shift=1800) "Window on/off status" annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={-70,-10}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( final offset=0, final height=6.2831852, final duration=24*3600) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-110,10},{-90,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin2 + Buildings.Controls.OBC.CDL.Reals.Sin sin2 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-70,10},{-50,30}}))); - Buildings.Controls.OBC.CDL.Continuous.AddParameter zonTem( + Buildings.Controls.OBC.CDL.Reals.AddParameter zonTem( final p=273.15 + 22.5) "Current zone temperature" annotation (Placement(transformation(extent={{-10,10},{10,30}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter gai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai( final k=12.5) "Gain factor" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSetOcc( final k=293.15) "Occupied heating setpoint" annotation (Placement(transformation(extent={{-100,-50},{-80,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSetOcc( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSetOcc( final k=297.15) "Occupied cooling setpoint" annotation (Placement(transformation(extent={{-60,-70},{-40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant THeaSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaSetUno( final k=285.15) "Unoccupied heating setpoint" annotation (Placement(transformation(extent={{-100,-90},{-80,-70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TCooSetUno( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TCooSetUno( final k=303.15) "Unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-60,-110},{-40,-90}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatusDuplicator.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatusDuplicator.mo index 0c512adfdb5..f27b765c839 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatusDuplicator.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/Validation/ZoneStatusDuplicator.mo @@ -5,7 +5,7 @@ model ZoneStatusDuplicator Buildings.Controls.OBC.ASHRAE.G36.ZoneGroups.ZoneStatusDuplicator zonStaDup( final nZon=5, final nZonGro=2) "Zone status duplicator" annotation (Placement(transformation(extent={{0,-40},{40,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant reaInp[6,5]( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant reaInp[6,5]( final k=fill({1,2,3,4,5}, 6)) "Real inputs" annotation (Placement(transformation(extent={{-80,20},{-60,40}}))); diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneGroupSystem.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneGroupSystem.mo index a62fea43f03..dedc80239d2 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneGroupSystem.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneGroupSystem.mo @@ -12,7 +12,7 @@ block ZoneGroupSystem Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea[nGro] "Convert integer to real" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiMin mulMin(nin=nGro) + Buildings.Controls.OBC.CDL.Reals.MultiMin mulMin(nin=nGro) "Find the highest priotity operating mode" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger ahuMod diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneStatus.mo b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneStatus.mo index 7e32edd1081..8b995a51f21 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneStatus.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/ZoneGroups/ZoneStatus.mo @@ -104,42 +104,42 @@ block ZoneStatus "Block that outputs zone temperature status" iconTransformation(extent={{100,-150},{140,-110}}))); protected - Buildings.Controls.OBC.CDL.Continuous.Multiply pro + Buildings.Controls.OBC.CDL.Reals.Multiply pro "Decide if the cool down time of one zone should be ignored: if window is open, then output zero, otherwise, output cool-down time from optimal cool-down block" annotation (Placement(transformation(extent={{120,210},{140,230}}))); - Buildings.Controls.OBC.CDL.Continuous.Multiply pro1 + Buildings.Controls.OBC.CDL.Reals.Multiply pro1 "Decide if the warm-up time of one zone should be ignored: if window is open, then output zero, otherwise, output warm-up time from optimal warm-up block" annotation (Placement(transformation(extent={{120,170},{140,190}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub + Buildings.Controls.OBC.CDL.Reals.Subtract sub "Calculate difference between zone temperature and the occupied heating setpoint" annotation (Placement(transformation(extent={{-40,80},{-20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys( final uLow=uLow, final uHigh=uHigh) "Hysteresis that outputs if the system should run in warm-up mode" annotation (Placement(transformation(extent={{0,80},{20,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub1 + Buildings.Controls.OBC.CDL.Reals.Subtract sub1 "Calculate difference between zone temperature and the occupied cooling setpoint" annotation (Placement(transformation(extent={{-40,0},{-20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys1( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys1( final uLow=uLow, final uHigh=uHigh) "Hysteresis that outputs if the system should run in cool-down mode" annotation (Placement(transformation(extent={{0,0},{20,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub2 + Buildings.Controls.OBC.CDL.Reals.Subtract sub2 "Calculate zone temperature difference to unoccupied heating setpoint" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys2( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys2( final uLow=uLow, final uHigh=uHigh) "Hysteresis that outputs if the zone temperature is lower than unoccupied heating setpoint" annotation (Placement(transformation(extent={{0,-80},{20,-60}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub5 + Buildings.Controls.OBC.CDL.Reals.Subtract sub5 "Calculate zone temperature difference to unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-40,-200},{-20,-180}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys5( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys5( final uLow=uLow, final uHigh=uHigh) "Hysteresis that outputs if the zone temperature is higher than unoccupied cooling setpoint" @@ -152,18 +152,18 @@ protected final k=false) if not have_winSen "Constant false" annotation (Placement(transformation(extent={{-140,190},{-120,210}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub3 + Buildings.Controls.OBC.CDL.Reals.Subtract sub3 "Calculate zone temperature difference to unoccupied heating setpoint" annotation (Placement(transformation(extent={{-40,-120},{-20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys3( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys3( final uLow=0, final uHigh=bouLim) "Hysteresis that outputs if the zone temperature is higher than its unoccupied heating setpoint by a given limit" annotation (Placement(transformation(extent={{0,-120},{20,-100}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub4 + Buildings.Controls.OBC.CDL.Reals.Subtract sub4 "Calculate zone temperature difference to unoccupied cooling setpoint" annotation (Placement(transformation(extent={{-40,-240},{-20,-220}}))); - Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys4( + Buildings.Controls.OBC.CDL.Reals.Hysteresis hys4( final uLow=0, final uHigh=bouLim) "Hysteresis that outputs if the zone temperature is lower than its unoccupied cooling setpoint by a given limit" diff --git a/Buildings/Controls/OBC/ASHRAE/G36/package.mo b/Buildings/Controls/OBC/ASHRAE/G36/package.mo index 97f98fd3eaf..1e777dafa1f 100644 --- a/Buildings/Controls/OBC/ASHRAE/G36/package.mo +++ b/Buildings/Controls/OBC/ASHRAE/G36/package.mo @@ -39,8 +39,8 @@ actuator signals for the terminal unit dampers.

    Implementation of PID controllers

    For the PID controllers, the implementation in - -Buildings.Controls.OBC.CDL.Continuous.PID + +Buildings.Controls.OBC.CDL.Reals.PID is used. Hence, the PID controllers are in the standard form

    diff --git a/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo index 78e15cdb4e8..453ebd5ded9 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo @@ -4,13 +4,13 @@ model IntegerToReal Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea "Block that converts Integer to Real signal" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Conversions/Validation/RealToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/Validation/RealToInteger.mo index 59820bf8d36..0ad4bd5b034 100644 --- a/Buildings/Controls/OBC/CDL/Conversions/Validation/RealToInteger.mo +++ b/Buildings/Controls/OBC/CDL/Conversions/Validation/RealToInteger.mo @@ -4,7 +4,7 @@ model RealToInteger Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Block that converts Real to Integer signal" annotation (Placement(transformation(extent={{30,-10},{50,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=7.0) diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/FirstOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/FirstOrderHold.mo index 29763d814f6..73b47e0d3df 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Examples/FirstOrderHold.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/FirstOrderHold.mo @@ -5,13 +5,13 @@ model FirstOrderHold samplePeriod=0.2) "Block that first order hold of a sampled-data system" annotation (Placement(transformation(extent={{30,-10},{50,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=0, height=6.2831852) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Cos cos1 + Buildings.Controls.OBC.CDL.Reals.Cos cos1 "Block that outputs the cosine of the input" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/Sampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/Sampler.mo index e709c312833..853c987c01e 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Examples/Sampler.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/Sampler.mo @@ -5,13 +5,13 @@ model Sampler samplePeriod=0.2) "Ideal sampler of a continuous signal" annotation (Placement(transformation(extent={{30,-10},{50,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=0, height=6.2831852) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin1 + Buildings.Controls.OBC.CDL.Reals.Sin sin1 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMax.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMax.mo index 542dbfd73b8..237eed24174 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMax.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMax.mo @@ -4,13 +4,13 @@ model TriggeredMax Buildings.Controls.OBC.CDL.Discrete.TriggeredMax triggeredMax "Output the maximum, absolute value of a continuous signal at trigger instants" annotation (Placement(transformation(extent={{30,-10},{50,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=0, height=6.2831852) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin1 + Buildings.Controls.OBC.CDL.Reals.Sin sin1 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul( diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo index 43f4a860adb..02c6b52f522 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredMovingMean.mo @@ -1,7 +1,7 @@ within Buildings.Controls.OBC.CDL.Discrete.Examples; model TriggeredMovingMean "Validation model for the TriggeredMovingMean block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sin( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin( freqHz=1/8, phase=0.5235987755983, startTime=-0.5) diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredSampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredSampler.mo index 2d8756bbe92..26f4db7c507 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredSampler.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/TriggeredSampler.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Discrete.Examples; model TriggeredSampler "Example model for the TriggeredSampler block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=0, height=6.2831852) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin1 + Buildings.Controls.OBC.CDL.Reals.Sin sin1 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul( diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/UnitDelay.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/UnitDelay.mo index 50e915656f2..9e8fb3b0492 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Examples/UnitDelay.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/UnitDelay.mo @@ -5,13 +5,13 @@ model UnitDelay samplePeriod=0.2) "Sample period of component" annotation (Placement(transformation(extent={{30,-10},{50,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=0, height=6.2831852) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin1 + Buildings.Controls.OBC.CDL.Reals.Sin sin1 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Discrete/Examples/ZeroOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/Examples/ZeroOrderHold.mo index bdfb0d5074c..784553d085e 100644 --- a/Buildings/Controls/OBC/CDL/Discrete/Examples/ZeroOrderHold.mo +++ b/Buildings/Controls/OBC/CDL/Discrete/Examples/ZeroOrderHold.mo @@ -5,13 +5,13 @@ model ZeroOrderHold samplePeriod=0.2) "Output the input signal with a zero order hold" annotation (Placement(transformation(extent={{30,-10},{50,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=0, height=6.2831852) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Cos cos1 + Buildings.Controls.OBC.CDL.Reals.Cos cos1 "Block that outputs the cosine of the input" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Abs.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Abs.mo index 3a0e7eeef3e..92608e2a937 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Abs.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Abs.mo @@ -4,13 +4,13 @@ model Abs Buildings.Controls.OBC.CDL.Integers.Abs abs1 "Block that outputs the absolute value of the input" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Add.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Add.mo index a222930fe47..1c0a812ce97 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Add.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Add.mo @@ -4,26 +4,26 @@ model Add Buildings.Controls.OBC.CDL.Integers.Add add1 "Block that outputs the sum of the two inputs" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=1, offset=-0.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/AddParameter.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/AddParameter.mo index aadc5c5d529..1c7fb962b8e 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/AddParameter.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/AddParameter.mo @@ -4,13 +4,13 @@ model AddParameter "Validation model for the AddParameter block" "Block that outputs the sum of an input plus a parameter" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo index 2c15d8d88ae..f364ed1e606 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Change.mo @@ -4,7 +4,7 @@ model Change Buildings.Controls.OBC.CDL.Integers.Change cha "Check if the integer input changes value" annotation (Placement(transformation(extent={{0,-50},{20,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( offset=0, height=20, duration=1) @@ -16,7 +16,7 @@ model Change Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,-1; diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Equal.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Equal.mo index e1e6fe65b1b..9e61eea8653 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Equal.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Equal.mo @@ -10,7 +10,7 @@ model Equal Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,0; @@ -20,7 +20,7 @@ model Equal 1,0]) "Time table with smoothness method of constant segments" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin1( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin1( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,0; diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Greater.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Greater.mo index 897404f2596..cd3eb2fbd88 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Greater.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Greater.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers.Validation; model Greater "Validation model for the Greater block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=1, offset=-1.5, height=5.0) @@ -16,14 +16,14 @@ model Greater Buildings.Controls.OBC.CDL.Integers.Greater intGre "Block output true if input 1 is greater than input 2" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqual.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqual.mo index 5c6bcd06131..667984a13d3 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqual.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqual.mo @@ -10,7 +10,7 @@ model GreaterEqual Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,-1; @@ -20,7 +20,7 @@ model GreaterEqual 1,0]) "Time table with smoothness method of constant segments" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin1( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin1( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,0; diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo index c7ca7486082..59690b3a36d 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterEqualThreshold.mo @@ -1,7 +1,7 @@ within Buildings.Controls.OBC.CDL.Integers.Validation; model GreaterEqualThreshold "Validation model for the GreaterEqualThreshold block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) @@ -11,7 +11,7 @@ model GreaterEqualThreshold t=2) "Block output true if input is greater or equal to threshold value" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo index 788bd5e7e82..b5234d81abf 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/GreaterThreshold.mo @@ -1,7 +1,7 @@ within Buildings.Controls.OBC.CDL.Integers.Validation; model GreaterThreshold "Validation model for the GreaterThreshold block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) @@ -11,7 +11,7 @@ model GreaterThreshold t=2) "Block output true if input is greater than threshold value" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Less.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Less.mo index b685323626f..9171c806996 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Less.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Less.mo @@ -10,7 +10,7 @@ model Less Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,-1; @@ -20,7 +20,7 @@ model Less 1,0]) "Time table with smoothness method of constant segments" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin1( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin1( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,0; diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqual.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqual.mo index 62c2bad4ed4..5a2a0068097 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqual.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqual.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Integers.Validation; model LessEqual "Validation model for the LessEqual block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=1, offset=-1.5, height=5.0) @@ -16,14 +16,14 @@ model LessEqual Buildings.Controls.OBC.CDL.Integers.LessEqual intLesEqu "Block output true if input 1 is less or equal to input 2" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo index 1b02d11e3f1..39e38575395 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/LessEqualThreshold.mo @@ -1,7 +1,7 @@ within Buildings.Controls.OBC.CDL.Integers.Validation; model LessEqualThreshold "Validation model for the LessEqualThreshold block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) @@ -11,7 +11,7 @@ model LessEqualThreshold t=2) "Block output true if input is less or equal to threshold value" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo index dfe6762a628..7d253b9ca91 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/LessThreshold.mo @@ -1,7 +1,7 @@ within Buildings.Controls.OBC.CDL.Integers.Validation; model LessThreshold "Validation model for the LessThreshold block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) @@ -11,7 +11,7 @@ model LessThreshold t=2) "Block output true if input is less than threshold value" annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Max.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Max.mo index ced0a21b652..3191477bef3 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Max.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Max.mo @@ -4,26 +4,26 @@ model Max Buildings.Controls.OBC.CDL.Integers.Max max1 "Block that outputs the largest inputs" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=1, offset=-1.5, height=5.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Min.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Min.mo index 496606ebba7..0d0c31a1915 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Min.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Min.mo @@ -4,26 +4,26 @@ model Min Buildings.Controls.OBC.CDL.Integers.Min min1 "Block that outputs the smallest inputs" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=10.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=1, offset=-1.5, height=5.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/MultiSum.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/MultiSum.mo index 06d7d4ca57d..79298f4ec7c 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/MultiSum.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/MultiSum.mo @@ -5,39 +5,39 @@ model MultiSum nin=3) "Block that outputs the sum of the inputs" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,30},{-60,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=1, offset=-0.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp3( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp3( duration=1, height=7.0, offset=-1.5) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1( + Buildings.Controls.OBC.CDL.Reals.Round round1( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,30},{-20,50}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{0,30},{20,50}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2( + Buildings.Controls.OBC.CDL.Reals.Round round2( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-10},{-20,10}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 "Convert real to integer" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round3( + Buildings.Controls.OBC.CDL.Reals.Round round3( n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-50},{-20,-30}}))); diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Multiply.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Multiply.mo index 89a60ec9f54..b47c8e793bf 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Multiply.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Multiply.mo @@ -9,7 +9,7 @@ model Multiply "Validation model for the Multiply block" Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt2 "Convert real to integer" annotation (Placement(transformation(extent={{-20,-30},{0,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,-1; @@ -19,7 +19,7 @@ model Multiply "Validation model for the Multiply block" 1,0]) "Time table with smoothness method of constant segments" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin1( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin1( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,0; diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Stage.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Stage.mo index 07ea92da8d6..7d29190738e 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Stage.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Stage.mo @@ -23,13 +23,13 @@ model Stage "Total number of enabled stages, with a hold duration of 1 second" annotation (Placement(transformation(extent={{20,-70},{40,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( final duration=10, final height=1, final startTime=1) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sin( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin( final amplitude=0.5, final freqHz=1/5, final offset=0.5) diff --git a/Buildings/Controls/OBC/CDL/Integers/Validation/Subtract.mo b/Buildings/Controls/OBC/CDL/Integers/Validation/Subtract.mo index 683595ae54c..3f5c6fc5dbf 100644 --- a/Buildings/Controls/OBC/CDL/Integers/Validation/Subtract.mo +++ b/Buildings/Controls/OBC/CDL/Integers/Validation/Subtract.mo @@ -4,25 +4,25 @@ model Subtract "Validation model for the Subtract block" "Block that outputs the difference of the two inputs" annotation (Placement(transformation(extent={{60,-10},{80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=1, offset=-3.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=1, offset=-0.5, height=7.0) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round1(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round1(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt "Convert real to integer" annotation (Placement(transformation(extent={{0,10},{20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Round round2(n=0) + Buildings.Controls.OBC.CDL.Reals.Round round2(n=0) "Round real number to given digits" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt1 diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTrigger.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTrigger.mo index 4e99228f833..c8a7fbab3ce 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTrigger.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTrigger.mo @@ -5,7 +5,7 @@ model SampleTrigger period=0.5) "Block that generates sample trigger signal" annotation (Placement(transformation(extent={{-30,20},{-10,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp( duration=5, offset=0, height=20) diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerNegativeStartTime.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerNegativeStartTime.mo index 20d65e9787a..7b57f15cfb4 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerNegativeStartTime.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerNegativeStartTime.mo @@ -5,7 +5,7 @@ model SampleTriggerNegativeStartTime period=0.5) "Block that generates sample trigger signal" annotation (Placement(transformation(extent={{-30,20},{-10,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp( duration=5, offset=0, height=20, diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerPositiveStartTime.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerPositiveStartTime.mo index ca4364bd077..ffee36e43f7 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerPositiveStartTime.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Validation/SampleTriggerPositiveStartTime.mo @@ -5,7 +5,7 @@ model SampleTriggerPositiveStartTime period=0.5) "Block that generates sample trigger signal" annotation (Placement(transformation(extent={{-30,20},{-10,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp( duration=5, offset=0, height=20, diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Change.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Change.mo index f25df1b4ee7..7355c3666bc 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Validation/Change.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Change.mo @@ -9,7 +9,7 @@ model Change Buildings.Controls.OBC.CDL.Logical.Change change "Outputs true if the input changes" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=5, offset=0, height=20) diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/Edge.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/Edge.mo index 20e65b90bb0..20c1aa79d01 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Validation/Edge.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Validation/Edge.mo @@ -9,7 +9,7 @@ model Edge Buildings.Controls.OBC.CDL.Logical.Edge edge1 "Outputs true if the input has a rising edge" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=5, offset=0, height=20) diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo index 496785b2901..6868effbe92 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Validation/FallingEdge.mo @@ -9,7 +9,7 @@ model FallingEdge Buildings.Controls.OBC.CDL.Logical.FallingEdge falEdg "Output true when input changes from true to false" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=5, offset=0, height=20) diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/OnOffController.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/OnOffController.mo index 0cd46b8b221..2171d1e786d 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Validation/OnOffController.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Validation/OnOffController.mo @@ -1,16 +1,16 @@ within Buildings.Controls.OBC.CDL.Logical.Validation; model OnOffController "Validation model for the OnOffController block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=5, offset=0, height=31.415926) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-76,-16},{-56,4}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin1 + Buildings.Controls.OBC.CDL.Reals.Sin sin1 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-32,-16},{-12,4}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant cons2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant cons2( k=0.7) "Constant as source term" annotation (Placement(transformation(extent={{-32,18},{-12,38}}))); diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulse.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulse.mo index 8809d76e6e8..14159457a50 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulse.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulse.mo @@ -25,32 +25,32 @@ model VariablePulse period=900) "Variable pulse with width input changing between different positive values" annotation (Placement(transformation(extent={{60,-30},{80,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse conPul( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse conPul( amplitude=0.65, width=0.8, period=4000) "Continuous pulse signal" annotation (Placement(transformation(extent={{20,50},{40,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( k=0.75) "Constant" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con1( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1( k=0) "Constant value" annotation (Placement(transformation(extent={{-80,50},{-60,70}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse conPul1( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse conPul1( amplitude=0.65, width=0.85, period=3600, shift=360) "Continuous pulse signal" annotation (Placement(transformation(extent={{20,10},{40,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con2( k=1) "Constant value" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse conPul2( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse conPul2( amplitude=0.5, width=0.5, period=3600, @@ -62,7 +62,7 @@ model VariablePulse period=900) "Variable pulse with constantly changing pulse width " annotation (Placement(transformation(extent={{-40,-70},{-20,-50}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram( height=0.8, duration=900, startTime=300) diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulseMinHold.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulseMinHold.mo index 9769802a449..81dc19537a8 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulseMinHold.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Validation/VariablePulseMinHold.mo @@ -7,7 +7,7 @@ model VariablePulseMinHold minTruFalHol=1) "Variable pulse with constantly changing pulse width " annotation (Placement(transformation(extent={{10,-10},{30,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse conPul1( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse conPul1( amplitude=0.4, width=0.4, period=4, diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/ZeroCrossing.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/ZeroCrossing.mo index b8d4069c603..a5e34c7b5ed 100644 --- a/Buildings/Controls/OBC/CDL/Logical/Validation/ZeroCrossing.mo +++ b/Buildings/Controls/OBC/CDL/Logical/Validation/ZeroCrossing.mo @@ -1,13 +1,13 @@ within Buildings.Controls.OBC.CDL.Logical.Validation; model ZeroCrossing "Validation model for the zero crossing block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1( duration=5, offset=0, height=31.415926) "Block that generates ramp signal" annotation (Placement(transformation(extent={{-82,-10},{-62,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sin sin1 + Buildings.Controls.OBC.CDL.Reals.Sin sin1 "Block that outputs the sine of the input" annotation (Placement(transformation(extent={{-38,-10},{-18,10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1( @@ -18,7 +18,7 @@ model ZeroCrossing Buildings.Controls.OBC.CDL.Logical.ZeroCrossing zeroCrossing "Zero crossing block" annotation (Placement(transformation(extent={{0,-10},{20,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2( duration=5, offset=0, height=31.415926) diff --git a/Buildings/Controls/OBC/CDL/Logical/VariablePulse.mo b/Buildings/Controls/OBC/CDL/Logical/VariablePulse.mo index a3d87e55261..ff40dd040d3 100644 --- a/Buildings/Controls/OBC/CDL/Logical/VariablePulse.mo +++ b/Buildings/Controls/OBC/CDL/Logical/VariablePulse.mo @@ -38,13 +38,13 @@ protected Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triSam "Sample the input when there is value change" annotation (Placement(transformation(extent={{-100,60},{-80,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract sub + Buildings.Controls.OBC.CDL.Reals.Subtract sub "Output the difference before and after sampling" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Abs abs1 + Buildings.Controls.OBC.CDL.Reals.Abs abs1 "Output the absolute value change" annotation (Placement(transformation(extent={{-20,20},{0,40}}))); - Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold greThr( + Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr( final t=deltaU, final h=0) "Check if there is a sufficiently large change in input value" diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mo index b86064ec5b9..a9d3687e0fc 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/DewPoint_TDryBulPhi.mo @@ -7,23 +7,23 @@ model DewPoint_TDryBulPhi Buildings.Controls.OBC.CDL.Psychrometrics.DewPoint_TDryBulPhi dewBulPhi1 "Model for dew point temperature" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp phi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp phi( duration=1, height=1, offset=0.001) "Relative humidity" annotation (Placement(transformation(extent={{-60,10},{-40,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDryBul( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDryBul( k=273.15+29.4) "Dry bulb temperature" annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDryBul2( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDryBul2( duration=1, height=35, offset=273.15+2.0) "Dry bulb temperature" annotation (Placement(transformation(extent={{-60,-30},{-40,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant phi2( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant phi2( k=0.4) "Relative humidity" annotation (Placement(transformation(extent={{-60,-80},{-40,-60}}))); diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/SpecificEnthalpy_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/SpecificEnthalpy_TDryBulPhi.mo index 35f82b8659e..62e2c9678ed 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/SpecificEnthalpy_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/SpecificEnthalpy_TDryBulPhi.mo @@ -4,13 +4,13 @@ model SpecificEnthalpy_TDryBulPhi Buildings.Controls.OBC.CDL.Psychrometrics.SpecificEnthalpy_TDryBulPhi hBulPhi "Model for specific enthalpy computation" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp phi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp phi( duration=1, height=1, offset=0.001) "Relative humidity" annotation (Placement(transformation(extent={{-60,-40},{-40,-20}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDryBul( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDryBul( k=273.15+29.4) "Dry bulb temperature" annotation (Placement(transformation(extent={{-64,24},{-44,44}}))); diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mo index 6e713881510..850951a87a1 100644 --- a/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mo +++ b/Buildings/Controls/OBC/CDL/Psychrometrics/Validation/WetBulb_TDryBulPhi.mo @@ -8,20 +8,20 @@ model WetBulb_TDryBulPhi Buildings.Controls.OBC.CDL.Psychrometrics.WetBulb_TDryBulPhi wetBulPhi1 "Model for wet bulb temperature" annotation (Placement(transformation(extent={{20,-50},{40,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp phi( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp phi( duration=1, height=0.95, offset=0.05) "Relative humidity" annotation (Placement(transformation(extent={{-40,10},{-20,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TDryBul( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDryBul( k=273.15+29.4) "Dry bulb temperature" annotation (Placement(transformation(extent={{-40,60},{-20,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp TDryBul1( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TDryBul1( duration=1, height=40, offset=273.15) "Dry bulb temperature" annotation (Placement(transformation(extent={{-40,-30},{-20,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant phi2(k=0.6) + Buildings.Controls.OBC.CDL.Reals.Sources.Constant phi2(k=0.6) "Relative humidity" annotation (Placement(transformation(extent={{-40,-80},{-20,-60}}))); diff --git a/Buildings/Controls/OBC/CDL/Continuous/Abs.mo b/Buildings/Controls/OBC/CDL/Reals/Abs.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Abs.mo rename to Buildings/Controls/OBC/CDL/Reals/Abs.mo index c83f446aca1..ce1a9cd8f98 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Abs.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Abs.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Abs "Output the absolute value of the input" Interfaces.RealInput u diff --git a/Buildings/Controls/OBC/CDL/Continuous/Acos.mo b/Buildings/Controls/OBC/CDL/Reals/Acos.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Acos.mo rename to Buildings/Controls/OBC/CDL/Reals/Acos.mo index 871fe77f8cc..76b2657afbf 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Acos.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Acos.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Acos "Output the arc cosine of the input" Interfaces.RealInput u "Connector of Real input signal" @@ -52,7 +52,7 @@ Documentation(info=" Block that outputs y = acos(u), where u is an input.

    -\"acos.png\"

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Add.mo b/Buildings/Controls/OBC/CDL/Reals/Add.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Add.mo rename to Buildings/Controls/OBC/CDL/Reals/Add.mo index 89e21032f5a..8d06ccfa3c8 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Add.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Add.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Add "Output the sum of the two inputs" Interfaces.RealInput u1 diff --git a/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo b/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo rename to Buildings/Controls/OBC/CDL/Reals/AddParameter.mo index 0ad84aba366..55d72c8402f 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/AddParameter.mo +++ b/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block AddParameter "Output the sum of an input plus a parameter" parameter Real p diff --git a/Buildings/Controls/OBC/CDL/Continuous/Asin.mo b/Buildings/Controls/OBC/CDL/Reals/Asin.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Asin.mo rename to Buildings/Controls/OBC/CDL/Reals/Asin.mo index 48b30b9bdf4..8d7c6f14cfd 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Asin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Asin.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Asin "Output the arc sine of the input" Interfaces.RealInput u "Connector of Real input signal" @@ -52,7 +52,7 @@ Documentation(info=" Block that outputs y = asin(u), where u is an input.

    -\"asin.png\"

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Atan.mo b/Buildings/Controls/OBC/CDL/Reals/Atan.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Atan.mo rename to Buildings/Controls/OBC/CDL/Reals/Atan.mo index 19398619d37..d4717d7345e 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Atan.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Atan.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Atan "Output the arc tangent of the input" Interfaces.RealInput u @@ -61,7 +61,7 @@ equation Block that outputs y = atan(u), where u is an input.

    -\"atan.png\"

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Atan2.mo b/Buildings/Controls/OBC/CDL/Reals/Atan2.mo similarity index 94% rename from Buildings/Controls/OBC/CDL/Continuous/Atan2.mo rename to Buildings/Controls/OBC/CDL/Reals/Atan2.mo index bbf29b76cf9..df3c3e227ca 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Atan2.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Atan2.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Atan2 "Output atan(u1/u2) of the inputs u1 and u2" Interfaces.RealInput u1 @@ -28,14 +28,14 @@ of the input u1 divided by the input u2. Atan2 uses the sign of u1 and u2 in order to construct the solution in the range -π ≤ y ≤ π, whereas - -Buildings.Controls.OBC.CDL.Continuous.Atan + +Buildings.Controls.OBC.CDL.Reals.Atan gives a solution in the range -π/2 ≤ y ≤ π/2.

    -\"atan2.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Average.mo b/Buildings/Controls/OBC/CDL/Reals/Average.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Average.mo rename to Buildings/Controls/OBC/CDL/Reals/Average.mo index 643c403b66c..65da68559a9 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Average.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Average.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Average "Output the average of its two inputs" Interfaces.RealInput u1 diff --git a/Buildings/Controls/OBC/CDL/Continuous/Cos.mo b/Buildings/Controls/OBC/CDL/Reals/Cos.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Cos.mo rename to Buildings/Controls/OBC/CDL/Reals/Cos.mo index 9673cc4d461..a755ce9b6d2 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Cos.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Cos.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Cos "Output the cosine of the input" Interfaces.RealInput u(unit="rad") @@ -64,7 +64,7 @@ where

    -\"cos.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo b/Buildings/Controls/OBC/CDL/Reals/Derivative.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Derivative.mo rename to Buildings/Controls/OBC/CDL/Reals/Derivative.mo index 5ac07e449ba..eb2efdc5ad8 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Derivative.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Derivative.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Derivative "Block that approximates the derivative of the input" parameter Real y_start=0 diff --git a/Buildings/Controls/OBC/CDL/Continuous/Divide.mo b/Buildings/Controls/OBC/CDL/Reals/Divide.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Divide.mo rename to Buildings/Controls/OBC/CDL/Reals/Divide.mo index 1165ee65155..c1712cc2298 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Divide.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Divide.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Divide "Output first input divided by second input" Interfaces.RealInput u1 "Connector for dividend" diff --git a/Buildings/Controls/OBC/CDL/Continuous/Exp.mo b/Buildings/Controls/OBC/CDL/Reals/Exp.mo similarity index 96% rename from Buildings/Controls/OBC/CDL/Continuous/Exp.mo rename to Buildings/Controls/OBC/CDL/Reals/Exp.mo index 1a96cfb81a5..a547924b093 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Exp.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Exp.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Exp "Output the exponential (base e) of the input" Interfaces.RealInput u @@ -54,7 +54,7 @@ base-e exponential function.

    -\"exp.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Greater.mo b/Buildings/Controls/OBC/CDL/Reals/Greater.mo similarity index 99% rename from Buildings/Controls/OBC/CDL/Continuous/Greater.mo rename to Buildings/Controls/OBC/CDL/Reals/Greater.mo index 93eaf88b024..ffa00faf6f7 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Greater.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Greater.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Greater "Output y is true, if input u1 is greater than input u2" parameter Real h( diff --git a/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo similarity index 99% rename from Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo rename to Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo index b9518f722ae..bc239f17f49 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/GreaterThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block GreaterThreshold "Output y is true, if input u is greater than threshold" parameter Real t=0 diff --git a/Buildings/Controls/OBC/CDL/Continuous/Hysteresis.mo b/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Hysteresis.mo rename to Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo index f4833ce890f..fc8ba95c9bc 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Hysteresis.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Hysteresis "Transform Real to Boolean signal with Hysteresis" parameter Real uLow @@ -127,7 +127,7 @@ The start value of the output is defined via parameter The default value of this parameter is false.

    -\"Hysteresis.png\"

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo b/Buildings/Controls/OBC/CDL/Reals/IntegratorWithReset.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo rename to Buildings/Controls/OBC/CDL/Reals/IntegratorWithReset.mo index 4de131bec78..df436b6a0bf 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/IntegratorWithReset.mo +++ b/Buildings/Controls/OBC/CDL/Reals/IntegratorWithReset.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block IntegratorWithReset "Output the integral of the input signal" parameter Real k=1 @@ -48,7 +48,7 @@ equation horizontalAlignment=TextAlignment.Left), Bitmap( extent={{-54,-50},{60,50}}, - fileName="modelica://Buildings/Resources/Images/Controls/OBC/CDL/Continuous/int.png"), + fileName="modelica://Buildings/Resources/Images/Controls/OBC/CDL/Reals/int.png"), Text( extent={{-88,56},{206,92}}, textColor={0,0,0}, diff --git a/Buildings/Controls/OBC/CDL/Continuous/Less.mo b/Buildings/Controls/OBC/CDL/Reals/Less.mo similarity index 99% rename from Buildings/Controls/OBC/CDL/Continuous/Less.mo rename to Buildings/Controls/OBC/CDL/Reals/Less.mo index 9ecce953384..29553c0eb6a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Less.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Less.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Less "Output y is true, if input u1 is less than input u2" parameter Real h( diff --git a/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo similarity index 99% rename from Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo rename to Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo index 2be98a0caeb..6e94a5320b8 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/LessThreshold.mo +++ b/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block LessThreshold "Output y is true, if input u is less than threshold" parameter Real t=0 diff --git a/Buildings/Controls/OBC/CDL/Continuous/LimitSlewRate.mo b/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/LimitSlewRate.mo rename to Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo index 0d44c5c2ba4..2786b55475c 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/LimitSlewRate.mo +++ b/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block LimitSlewRate "Limit the increase or decrease rate of input" parameter Real raisingSlewRate( min=Constants.small, diff --git a/Buildings/Controls/OBC/CDL/Continuous/Limiter.mo b/Buildings/Controls/OBC/CDL/Reals/Limiter.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Limiter.mo rename to Buildings/Controls/OBC/CDL/Reals/Limiter.mo index 816fd0317ba..6cb9e0a5170 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Limiter.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Limiter.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Limiter "Limit the range of a signal" parameter Real uMax diff --git a/Buildings/Controls/OBC/CDL/Continuous/Line.mo b/Buildings/Controls/OBC/CDL/Reals/Line.mo similarity index 99% rename from Buildings/Controls/OBC/CDL/Continuous/Line.mo rename to Buildings/Controls/OBC/CDL/Reals/Line.mo index 13c6fff06dc..12e8e87a267 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Line.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Line.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Line "Output the value of the input x along a line specified by two points" parameter Boolean limitBelow=true diff --git a/Buildings/Controls/OBC/CDL/Continuous/Log.mo b/Buildings/Controls/OBC/CDL/Reals/Log.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Log.mo rename to Buildings/Controls/OBC/CDL/Reals/Log.mo index 2d5a733a68e..8212bd9196a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Log.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Log.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Log "Output the natural (base e) logarithm of the input (input > 0 required)" Interfaces.RealInput u @@ -64,7 +64,7 @@ zero or negative.

    -\"log.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Log10.mo b/Buildings/Controls/OBC/CDL/Reals/Log10.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Log10.mo rename to Buildings/Controls/OBC/CDL/Reals/Log10.mo index 90a3fdb1015..acb5333c3e2 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Log10.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Log10.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Log10 "Output the base 10 logarithm of the input (input > 0 required)" Interfaces.RealInput u @@ -64,7 +64,7 @@ zero or negative.

    -\"log10.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixGain.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/MatrixGain.mo rename to Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo index 07c385ab928..3aa8e689cc3 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MatrixGain.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MatrixGain "Output the product of a gain matrix with the input signal vector" parameter Real K[:,:]=[ diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo rename to Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo index f054c138fe4..d6f6b1560c2 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MatrixMax.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MatrixMax "Output vector of row- or column-wise maximum of the input matrix" parameter Boolean rowMax=true diff --git a/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo rename to Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo index ddf75f2eb04..cfe998dce73 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MatrixMin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MatrixMin "Output vector of row- or column-wise minimum values" parameter Boolean rowMin=true diff --git a/Buildings/Controls/OBC/CDL/Continuous/Max.mo b/Buildings/Controls/OBC/CDL/Reals/Max.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Max.mo rename to Buildings/Controls/OBC/CDL/Reals/Max.mo index 9c170523dcc..87d65efb369 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Max.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Max.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Max "Pass through the largest signal" Interfaces.RealInput u1 diff --git a/Buildings/Controls/OBC/CDL/Continuous/Min.mo b/Buildings/Controls/OBC/CDL/Reals/Min.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Min.mo rename to Buildings/Controls/OBC/CDL/Reals/Min.mo index f74ea7ee9d6..ad1ac1690d4 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Min.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Min.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Min "Pass through the smallest signal" Interfaces.RealInput u1 diff --git a/Buildings/Controls/OBC/CDL/Continuous/Modulo.mo b/Buildings/Controls/OBC/CDL/Reals/Modulo.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Modulo.mo rename to Buildings/Controls/OBC/CDL/Reals/Modulo.mo index 62a73624004..d6e2d8d59cb 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Modulo.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Modulo.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Modulo "Output the remainder of first input divided by second input (~=0)" Interfaces.RealInput u1 diff --git a/Buildings/Controls/OBC/CDL/Continuous/MovingAverage.mo b/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo similarity index 93% rename from Buildings/Controls/OBC/CDL/Continuous/MovingAverage.mo rename to Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo index a6b5d203a38..a24d2632c44 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MovingAverage.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MovingAverage "Block to output moving average" parameter Real delta( final quantity="Time", @@ -125,11 +125,11 @@ average of a noisy measurement signal.

    See - -Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage + +Buildings.Controls.OBC.CDL.Reals.Validation.MovingAverage and - -Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage_nonZeroStart + +Buildings.Controls.OBC.CDL.Reals.Validation.MovingAverage_nonZeroStart for example.

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo b/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo rename to Buildings/Controls/OBC/CDL/Reals/MultiMax.mo index 015c1bc4bf7..78cf8fcaf63 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MultiMax.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MultiMax "Output the maximum element of the input vector" parameter Integer nin( diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo b/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo rename to Buildings/Controls/OBC/CDL/Reals/MultiMin.mo index d9537dff603..8205c09f9b0 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MultiMin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MultiMin "Output the minimum element of the input vector" parameter Integer nin( diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiSum.mo b/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo similarity index 93% rename from Buildings/Controls/OBC/CDL/Continuous/MultiSum.mo rename to Buildings/Controls/OBC/CDL/Reals/MultiSum.mo index ff37016f8db..a52c7817e52 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MultiSum.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MultiSum "Sum of Reals, y = k[1]*u[1] + k[2]*u[2] + ... + k[n]*u[n]" parameter Integer nin( @@ -77,8 +77,8 @@ the output is y=0.

    See - -Buildings.Controls.OBC.CDL.Continuous.Validation.MultiSum + +Buildings.Controls.OBC.CDL.Reals.Validation.MultiSum for an example.

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Multiply.mo b/Buildings/Controls/OBC/CDL/Reals/Multiply.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Multiply.mo rename to Buildings/Controls/OBC/CDL/Reals/Multiply.mo index 6a32ee81789..76b7e6a6b39 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Multiply.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Multiply.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Multiply "Output product of the two inputs" Interfaces.RealInput u1 "Connector of Real input signal 1" diff --git a/Buildings/Controls/OBC/CDL/Continuous/MultiplyByParameter.mo b/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/MultiplyByParameter.mo rename to Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo index 189f652c755..795b6e2e43b 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/MultiplyByParameter.mo +++ b/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block MultiplyByParameter "Output the product of a gain value with the input signal" parameter Real k diff --git a/Buildings/Controls/OBC/CDL/Continuous/PID.mo b/Buildings/Controls/OBC/CDL/Reals/PID.mo similarity index 94% rename from Buildings/Controls/OBC/CDL/Continuous/PID.mo rename to Buildings/Controls/OBC/CDL/Reals/PID.mo index 8c1f9c14c61..a4c9131963a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/PID.mo +++ b/Buildings/Controls/OBC/CDL/Reals/PID.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block PID "P, PI, PD, and PID controller" parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI @@ -53,33 +53,33 @@ block PID Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of actuator output signal" annotation (Placement(transformation(extent={{220,-20},{260,20}}),iconTransformation(extent={{100,-20},{140,20}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract controlError "Control error (set point - measurement)" + Buildings.Controls.OBC.CDL.Reals.Subtract controlError "Control error (set point - measurement)" annotation (Placement(transformation(extent={{-200,-16},{-180,4}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter P(final k=k) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter P(final k=k) "Gain for proportional control action" annotation (Placement(transformation(extent={{-50,130},{-30,150}}))); - Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset I( + Buildings.Controls.OBC.CDL.Reals.IntegratorWithReset I( final k=k/Ti, final y_start=xi_start) if with_I "Integral term" annotation (Placement(transformation(extent={{-50,-10},{-30,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Derivative D( + Buildings.Controls.OBC.CDL.Reals.Derivative D( final y_start=yd_start) if with_D "Derivative term" annotation (Placement(transformation(extent={{-50,60},{-30,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errP + Buildings.Controls.OBC.CDL.Reals.Subtract errP "P error" annotation (Placement(transformation(extent={{-140,130},{-120,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errD if with_D + Buildings.Controls.OBC.CDL.Reals.Subtract errD if with_D "D error" annotation (Placement(transformation(extent={{-140,60},{-120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errI1 if with_I + Buildings.Controls.OBC.CDL.Reals.Subtract errI1 if with_I "I error (before anti-windup compensation)" annotation (Placement(transformation(extent={{-140,-4},{-120,16}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errI2 if with_I + Buildings.Controls.OBC.CDL.Reals.Subtract errI2 if with_I "I error (after anti-windup compensation)" annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Limiter lim( + Buildings.Controls.OBC.CDL.Reals.Limiter lim( final uMax=yMax, final uMin=yMin) "Limiter" @@ -104,27 +104,27 @@ protected Sources.Constant TDer(k=Td/Nd) if with_D "Time constant for approximation in derivative block" annotation (Placement(transformation(extent={{-100,80},{-80,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant Dzero( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant Dzero( final k=0) if not with_D "Zero input signal" annotation (Evaluate=true,HideResult=true,Placement(transformation(extent={{-50,90}, {-30,110}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter uS_revAct( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter uS_revAct( final k=revAct/r) "Set point multiplied by reverse action sign" annotation (Placement(transformation(extent={{-200,30},{-180,50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter uMea_revAct( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter uMea_revAct( final k=revAct/r) "Set point multiplied by reverse action sign" annotation (Placement(transformation(extent={{-200,-50},{-180,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Add addPD + Buildings.Controls.OBC.CDL.Reals.Add addPD "Outputs P and D gains added" annotation (Placement(transformation(extent={{20,124},{40,144}}))); - Buildings.Controls.OBC.CDL.Continuous.Add addPID + Buildings.Controls.OBC.CDL.Reals.Add addPID "Outputs P, I and D gains added" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract antWinErr if with_I + Buildings.Controls.OBC.CDL.Reals.Subtract antWinErr if with_I "Error for anti-windup compensation" annotation (Placement(transformation(extent={{160,50},{180,70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter antWinGai(k=1/(k*Ni)) + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter antWinGai(k=1/(k*Ni)) if with_I "Gain for anti-windup compensation" annotation (Placement(transformation(extent={{180,-30},{160,-10}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant cheYMinMax( @@ -136,11 +136,11 @@ protected "Assertion on yMin and yMax" annotation (Placement(transformation(extent={{160,-160},{180,-140}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant Izero( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant Izero( final k=0) if not with_I "Zero input signal" annotation (Placement(transformation(extent={{-50,20},{-30,40}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( final k=0) if with_I "Constant zero" annotation (Placement(transformation(extent={{-100,-50},{-80,-30}}))); @@ -413,8 +413,8 @@ where the equipment control input should continuously increase as the equipment switched on, such as a light dimmer that may slowly increase the luminance, or a variable speed drive of a motor that should continuously increase the speed. In this case, the controller - -Buildings.Controls.OBC.CDL.Continuous.PIDWithReset + +Buildings.Controls.OBC.CDL.Reals.PIDWithReset that can reset the output should be used.

    Approximation of the derivative term

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/PIDWithReset.mo b/Buildings/Controls/OBC/CDL/Reals/PIDWithReset.mo similarity index 95% rename from Buildings/Controls/OBC/CDL/Continuous/PIDWithReset.mo rename to Buildings/Controls/OBC/CDL/Reals/PIDWithReset.mo index a22df2df714..d8dbc5384e1 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/PIDWithReset.mo +++ b/Buildings/Controls/OBC/CDL/Reals/PIDWithReset.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block PIDWithReset "P, PI, PD, and PID controller with output reset" parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI @@ -59,33 +59,33 @@ block PIDWithReset Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger "Resets the controller output when trigger becomes true" annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,origin={-160,-220}),iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={-60,-120}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract controlError + Buildings.Controls.OBC.CDL.Reals.Subtract controlError "Control error (set point - measurement)" annotation (Placement(transformation(extent={{-200,-16},{-180,4}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter P(final k=k) "Proportional action" + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter P(final k=k) "Proportional action" annotation (Placement(transformation(extent={{-50,130},{-30,150}}))); - Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset I( + Buildings.Controls.OBC.CDL.Reals.IntegratorWithReset I( final k=k/Ti, final y_start=xi_start) if with_I "Integral term" annotation (Placement(transformation(extent={{-50,-10},{-30,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Derivative D( + Buildings.Controls.OBC.CDL.Reals.Derivative D( final y_start=yd_start) if with_D "Derivative term" annotation (Placement(transformation(extent={{-50,60},{-30,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errP + Buildings.Controls.OBC.CDL.Reals.Subtract errP "P error" annotation (Placement(transformation(extent={{-140,130},{-120,150}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errD if with_D + Buildings.Controls.OBC.CDL.Reals.Subtract errD if with_D "D error" annotation (Placement(transformation(extent={{-140,60},{-120,80}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errI1 if with_I + Buildings.Controls.OBC.CDL.Reals.Subtract errI1 if with_I "I error (before anti-windup compensation)" annotation (Placement(transformation(extent={{-140,-4},{-120,16}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract errI2 if with_I + Buildings.Controls.OBC.CDL.Reals.Subtract errI2 if with_I "I error (after anti-windup compensation)" annotation (Placement(transformation(extent={{-100,-10},{-80,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Limiter lim( + Buildings.Controls.OBC.CDL.Reals.Limiter lim( final uMax=yMax, final uMin=yMin) "Limiter" @@ -109,41 +109,41 @@ protected Sources.Constant TDer(k=Td/Nd) if with_D "Time constant for approximation in derivative block" annotation (Placement(transformation(extent={{-100,80},{-80,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant Dzero( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant Dzero( final k=0) if not with_D "Zero input signal" annotation (Evaluate=true,HideResult=true,Placement(transformation(extent={{-50,90}, {-30,110}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant Izero( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant Izero( final k=0) if not with_I "Zero input signal" annotation (Placement(transformation(extent={{-50,20},{-30,40}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter uS_revAct( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter uS_revAct( final k=revAct/r) "Set point multiplied by reverse action sign" annotation (Placement(transformation(extent={{-200,30},{-180,50}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter uMea_revAct( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter uMea_revAct( final k=revAct/r) "Set point multiplied by reverse action sign" annotation (Placement(transformation(extent={{-200,-50},{-180,-30}}))); - Buildings.Controls.OBC.CDL.Continuous.Add addPD + Buildings.Controls.OBC.CDL.Reals.Add addPD "Outputs P and D gains added" annotation (Placement(transformation(extent={{20,124},{40,144}}))); - Buildings.Controls.OBC.CDL.Continuous.Add addPID + Buildings.Controls.OBC.CDL.Reals.Add addPID "Outputs P, I and D gains added" annotation (Placement(transformation(extent={{80,80},{100,100}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract antWinErr if with_I + Buildings.Controls.OBC.CDL.Reals.Subtract antWinErr if with_I "Error for anti-windup compensation" annotation (Placement(transformation(extent={{160,50},{180,70}}))); - Buildings.Controls.OBC.CDL.Continuous.MultiplyByParameter antWinGai( + Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter antWinGai( k=1/(k*Ni)) if with_I "Gain for anti-windup compensation" annotation (Placement(transformation(extent={{180,-30},{160,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant yResSig( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant yResSig( final k=y_reset) if with_I "Signal for y_reset" annotation (Placement(transformation(extent={{-140,-84},{-120,-64}}))); - Buildings.Controls.OBC.CDL.Continuous.Subtract addRes if with_I + Buildings.Controls.OBC.CDL.Reals.Subtract addRes if with_I "Adder for integrator reset" annotation (Placement(transformation(extent={{-100,-90},{-80,-70}}))); Buildings.Controls.OBC.CDL.Logical.Sources.Constant cheYMinMax( diff --git a/Buildings/Controls/OBC/CDL/Continuous/Ramp.mo b/Buildings/Controls/OBC/CDL/Reals/Ramp.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Ramp.mo rename to Buildings/Controls/OBC/CDL/Reals/Ramp.mo index 90be1c02351..a18dff2b141 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Ramp.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Ramp.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Ramp "Limit the changing rate of the input" parameter Real raisingSlewRate( diff --git a/Buildings/Controls/OBC/CDL/Continuous/Round.mo b/Buildings/Controls/OBC/CDL/Reals/Round.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Round.mo rename to Buildings/Controls/OBC/CDL/Reals/Round.mo index df3ca483e12..7fa2ff02887 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Round.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Round.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Round "Round real number to given digits" parameter Integer n diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sin.mo b/Buildings/Controls/OBC/CDL/Reals/Sin.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Sin.mo rename to Buildings/Controls/OBC/CDL/Reals/Sin.mo index c3d0a4a8937..b1ce423a2df 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sin.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Sin "Output the sine of the input" Interfaces.RealInput u(unit="rad") @@ -64,7 +64,7 @@ where

    -\"sin.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sort.mo b/Buildings/Controls/OBC/CDL/Reals/Sort.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Sort.mo rename to Buildings/Controls/OBC/CDL/Reals/Sort.mo index b908d1cb617..371d9802bf5 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sort.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sort.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Sort "Sort elements of input vector in ascending or descending order" parameter Integer nin( diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo similarity index 99% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo index adae91da1cb..902254b2dc3 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; model CalendarTime "Computes the unix time stamp and calendar time from the simulation time" parameter Buildings.Controls.OBC.CDL.Types.ZeroTime zerTim diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo similarity index 96% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo index 5751ce88762..1c936f09c7a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Constant.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; block Constant "Output constant signal of type Real" parameter Real k @@ -60,7 +60,7 @@ Block that outputs a constant signal y = k, where k is a real-valued parameter.

    -\"Constant.png\"

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/ModelTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/ModelTime.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/ModelTime.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/ModelTime.mo index 3548814653b..9e0362e3ea4 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/ModelTime.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/ModelTime.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; block ModelTime "Standard time" Interfaces.RealOutput y( diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo index 2ab28514710..e60cee12bf4 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Pulse.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; block Pulse "Generate pulse signal of type Real" parameter Real amplitude=1.0 @@ -123,7 +123,7 @@ equation Block that outputs a pulse signal as shown below.

    -\"Pulse.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Ramp.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Ramp.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo index d45db5eed63..4288ffefb1c 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Ramp.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; block Ramp "Generate ramp signal" parameter Real height=1 @@ -80,7 +80,7 @@ The Real output y is a ramp signal:

    -\"Ramp.png\"

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Sin.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Sin.mo similarity index 94% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Sin.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Sin.mo index 5fd0fd4c9f8..4b34abb3df5 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Sin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Sin.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; block Sin "Generate sine signal" parameter Real amplitude=1 @@ -81,7 +81,7 @@ equation Block that outputs a sine.

    -\"Sin.png\"/

    ", @@ -91,8 +91,8 @@ Block that outputs a sine. April 13, 2023, by Michael Wetter:
    Renamed block from Sine to Sin to use consistent naming with - -Buildings.Controls.OBC.CDL.Continuous.Sin.
    + +Buildings.Controls.OBC.CDL.Reals.Sin.
    This is for #3339
    • diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo similarity index 99% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo index e3bbb13da96..f9ea8c44bc1 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/TimeTable.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; block TimeTable "Table look-up with respect to time and linear or periodic extrapolation" parameter Real table[:,:] diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonths.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonths.mo similarity index 78% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonths.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonths.mo index d83fcc29ab8..4ee7ecb6a48 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonths.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonths.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model CalendarTimeMonths "Validation model for the calendar time model" - Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime calTim( + Buildings.Controls.OBC.CDL.Reals.Sources.CalendarTime calTim( zerTim=Buildings.Controls.OBC.CDL.Types.ZeroTime.NY2017) "Computes date and time assuming time=0 corresponds to new year 2017" annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); @@ -11,13 +11,13 @@ model CalendarTimeMonths Tolerance=1e-6, StopTime=345600), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonths.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonths.mos" "Simulate and plot"), Documentation( info="

    This model validates the use of the - -Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime + +Buildings.Controls.OBC.CDL.Reals.Sources.CalendarTime block for a period of a couple of months. This shorter simulation time has been selected to store the reference results that are used in the regression tests diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsMinus.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsMinus.mo similarity index 52% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsMinus.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsMinus.mo index 785d5e33d21..d701939ae7e 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsMinus.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsMinus.mo @@ -1,23 +1,23 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model CalendarTimeMonthsMinus "Validation model for the calendar time model with start time slightly below the full hour" - extends Buildings.Controls.OBC.CDL.Continuous.Sources.Validation.CalendarTimeMonths; + extends Buildings.Controls.OBC.CDL.Reals.Sources.Validation.CalendarTimeMonths; annotation ( experiment( StartTime=172799, Tolerance=1e-6, StopTime=345599), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsMinus.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsMinus.mos" "Simulate and plot"), Documentation( info="

    This model validates the use of the - -Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime. + +Buildings.Controls.OBC.CDL.Reals.Sources.CalendarTime. It is identical to - -Buildings.Controls.OBC.CDL.Continuous.Sources.Validation.CalendarTimeMonths + +Buildings.Controls.OBC.CDL.Reals.Sources.Validation.CalendarTimeMonths except that the start and end time are different.

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsPlus.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsPlus.mo similarity index 52% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsPlus.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsPlus.mo index 5e65c91efb8..4377a5d2bf6 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsPlus.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsPlus.mo @@ -1,23 +1,23 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model CalendarTimeMonthsPlus "Validation model for the calendar time model with start time slightly higher than the full hour" - extends Buildings.Controls.OBC.CDL.Continuous.Sources.Validation.CalendarTimeMonths; + extends Buildings.Controls.OBC.CDL.Reals.Sources.Validation.CalendarTimeMonths; annotation ( experiment( StartTime=172801, Tolerance=1e-6, StopTime=345601), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/CalendarTimeMonthsPlus.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/CalendarTimeMonthsPlus.mos" "Simulate and plot"), Documentation( info="

    This model validates the use of the - -Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime. + +Buildings.Controls.OBC.CDL.Reals.Sources.CalendarTime. It is identical to - -Buildings.Controls.OBC.CDL.Continuous.Sources.Validation.CalendarTimeMonths + +Buildings.Controls.OBC.CDL.Reals.Sources.Validation.CalendarTimeMonths except that the start and end time are different.

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Constant.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Constant.mo similarity index 73% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Constant.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Constant.mo index 6c6e890ba5b..d4b183212b5 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Constant.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Constant.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model Constant "Validate the Constant block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con( + Buildings.Controls.OBC.CDL.Reals.Sources.Constant con( k=2.5) "Block output real constant value" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); @@ -10,13 +10,13 @@ model Constant StopTime=1.0, Tolerance=1e-06), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/Constant.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/Constant.mos" "Simulate and plot"), Documentation( info="

    Validation test for the block - -Buildings.Controls.OBC.CDL.Continuous.Sources.Constant. + +Buildings.Controls.OBC.CDL.Reals.Sources.Constant.

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Pulse.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Pulse.mo similarity index 75% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Pulse.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Pulse.mo index e9d15830a03..62f9fe7750b 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Pulse.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Pulse.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model Pulse "Validation model for the Pulse block" - Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse pulse( + Buildings.Controls.OBC.CDL.Reals.Sources.Pulse pulse( amplitude=2.0, width=0.5, offset=0.2, @@ -13,13 +13,13 @@ model Pulse StopTime=5.0, Tolerance=1e-06), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/Pulse.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/Pulse.mos" "Simulate and plot"), Documentation( info="

    Validation test for the block - -Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse. + +Buildings.Controls.OBC.CDL.Reals.Sources.Pulse.

    ", diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Ramp.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Ramp.mo similarity index 75% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Ramp.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Ramp.mo index 1602ce96816..d0b2e0c7c37 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Ramp.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Ramp.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model Ramp "Validation model for the Ramp" - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ram( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ram( height=2, duration=3, offset=0.5, @@ -13,13 +13,13 @@ model Ramp StopTime=5.0, Tolerance=1e-06), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/Ramp.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/Ramp.mos" "Simulate and plot"), Documentation( info="

    Validation test for the block - -Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp. + +Buildings.Controls.OBC.CDL.Reals.Sources.Ramp.

    ", revisions=" diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Sin.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Sin.mo similarity index 75% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Sin.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Sin.mo index 5c765f53e86..d7b2a6016a0 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/Sin.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/Sin.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model Sin "Validation model for Sin" - Buildings.Controls.OBC.CDL.Continuous.Sources.Sin sin( + Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin( amplitude=5, freqHz=1/60, phase=0, @@ -14,13 +14,13 @@ model Sin StopTime=130.0, Tolerance=1e-06), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/Sin.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/Sin.mos" "Simulate and plot"), Documentation( info="

    Validation test for the block - -Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp. + +Buildings.Controls.OBC.CDL.Reals.Sources.Ramp.

    ", revisions=" diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/StandardTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/StandardTime.mo similarity index 82% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/StandardTime.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/StandardTime.mo index 1c4e876176b..5a52c94f1b2 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/StandardTime.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/StandardTime.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model StandardTime "Test model for the StandardTime block" - Buildings.Controls.OBC.CDL.Continuous.Sources.ModelTime staTim + Buildings.Controls.OBC.CDL.Reals.Sources.ModelTime staTim "Standard time" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); annotation ( @@ -10,7 +10,7 @@ model StandardTime Tolerance=1e-6, StopTime=1), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/StandardTime.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/StandardTime.mos" "Simulate and plot"), Documentation( info="

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTable.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/TimeTable.mo similarity index 88% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTable.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/TimeTable.mo index 33c0cb1e2d6..bcb0f45ef17 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTable.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/TimeTable.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model TimeTable "Validation model for TimeTable block" - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, table=[ 0,0; @@ -10,7 +10,7 @@ model TimeTable 24*3600,0]) "Time table with smoothness method of linear segments" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLinHol( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLinHol( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.HoldLastPoint, table=[ @@ -20,7 +20,7 @@ model TimeTable 24*3600,0]) "Time table with smoothness method of linear segments, hold first and last value" annotation (Placement(transformation(extent={{-10,10},{10,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLinDer( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLinDer( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.LastTwoPoints, table=[ @@ -30,7 +30,7 @@ model TimeTable 24*3600,0]) "Time table with smoothness method of linear segments, extrapolate with der" annotation (Placement(transformation(extent={{50,10},{70,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabCon( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabCon( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,0; @@ -39,7 +39,7 @@ model TimeTable 24*3600,0]) "Time table with smoothness method of constant segments" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLinCon( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLinCon( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, table=[ 0,0; @@ -54,7 +54,7 @@ model TimeTable Tolerance=1e-6, StopTime=172800), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTable.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/TimeTable.mos" "Simulate and plot"), Documentation( info="

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/TimeTableNegativeStartTime.mo similarity index 76% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/TimeTableNegativeStartTime.mo index 68f646c4d30..70cbd025eab 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/TimeTableNegativeStartTime.mo @@ -1,7 +1,7 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources.Validation; +within Buildings.Controls.OBC.CDL.Reals.Sources.Validation; model TimeTableNegativeStartTime "Validation model for TimeTable block with negative start time" - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLin( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, table=[ 0,0; @@ -10,7 +10,7 @@ model TimeTableNegativeStartTime 24*3600,0]) "Time table with smoothness method of linear segments" annotation (Placement(transformation(extent={{-80,10},{-60,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLinHol( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLinHol( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.HoldLastPoint, table=[ @@ -20,7 +20,7 @@ model TimeTableNegativeStartTime 24*3600,0]) "Time table with smoothness method of linear segments, hold first and last value" annotation (Placement(transformation(extent={{-10,10},{10,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLinDer( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLinDer( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, extrapolation=Buildings.Controls.OBC.CDL.Types.Extrapolation.LastTwoPoints, table=[ @@ -30,7 +30,7 @@ model TimeTableNegativeStartTime 24*3600,0]) "Time table with smoothness method of linear segments, extrapolate with der" annotation (Placement(transformation(extent={{50,10},{70,30}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabCon( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabCon( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments, table=[ 0,0; @@ -39,7 +39,7 @@ model TimeTableNegativeStartTime 24*3600,0]) "Time table with smoothness method of constant segments" annotation (Placement(transformation(extent={{-80,-30},{-60,-10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable timTabLinCon( + Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLinCon( smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.LinearSegments, table=[ 0,0; @@ -55,16 +55,16 @@ model TimeTableNegativeStartTime StartTime=-129600.0, StopTime=172800), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Sources/Validation/TimeTableNegativeStartTime.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Sources/Validation/TimeTableNegativeStartTime.mos" "Simulate and plot"), Documentation( info="

    This model validates the block - -Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable. + +Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable. The model is identical to - -Buildings.Controls.OBC.CDL.Continuous.Sources.Validation.TimeTable + +Buildings.Controls.OBC.CDL.Reals.Sources.Validation.TimeTable except that the start time is negative, and not a multiple of a full day. ", revisions=" diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/package.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/package.mo similarity index 86% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/package.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/package.mo index bd14db929d3..f443805244a 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/package.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/package.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous.Sources; +within Buildings.Controls.OBC.CDL.Reals.Sources; package Validation "Collection of models that validate the continuous sources blocks of the CDL" annotation ( preferredView="info", @@ -6,8 +6,8 @@ package Validation "Collection of models that validate the continuous sources bl info="

    This package contains models that validate the blocks in - -Buildings.Controls.OBC.CDL.Continuous.Sources. + +Buildings.Controls.OBC.CDL.Reals.Sources.

    The examples plot various outputs, which have been verified against diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/package.order b/Buildings/Controls/OBC/CDL/Reals/Sources/Validation/package.order similarity index 100% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/Validation/package.order rename to Buildings/Controls/OBC/CDL/Reals/Sources/Validation/package.order diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/package.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/package.mo similarity index 95% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/package.mo rename to Buildings/Controls/OBC/CDL/Reals/Sources/package.mo index 8b2bb520f36..b15b5c7478e 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/package.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sources/package.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; package Sources "Package with blocks that generate source signals" annotation ( Documentation( diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/package.order b/Buildings/Controls/OBC/CDL/Reals/Sources/package.order similarity index 100% rename from Buildings/Controls/OBC/CDL/Continuous/Sources/package.order rename to Buildings/Controls/OBC/CDL/Reals/Sources/package.order diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo b/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo rename to Buildings/Controls/OBC/CDL/Reals/Sqrt.mo index d386eebfd75..f7b94c0be9d 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sqrt.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Sqrt "Output the square root of the input (input >= 0 required)" Interfaces.RealInput u diff --git a/Buildings/Controls/OBC/CDL/Continuous/Subtract.mo b/Buildings/Controls/OBC/CDL/Reals/Subtract.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Subtract.mo rename to Buildings/Controls/OBC/CDL/Reals/Subtract.mo index 7ecdf9e11a2..b30a2853a57 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Subtract.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Subtract.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Subtract "Output the difference of the two inputs" Interfaces.RealInput u1 "Connector of Real input signal 1" diff --git a/Buildings/Controls/OBC/CDL/Continuous/Switch.mo b/Buildings/Controls/OBC/CDL/Reals/Switch.mo similarity index 98% rename from Buildings/Controls/OBC/CDL/Continuous/Switch.mo rename to Buildings/Controls/OBC/CDL/Reals/Switch.mo index 379621e19c7..5a6be85162c 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Switch.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Switch.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Switch "Switch between two Real signals" Interfaces.RealInput u1 diff --git a/Buildings/Controls/OBC/CDL/Continuous/Tan.mo b/Buildings/Controls/OBC/CDL/Reals/Tan.mo similarity index 97% rename from Buildings/Controls/OBC/CDL/Continuous/Tan.mo rename to Buildings/Controls/OBC/CDL/Reals/Tan.mo index 770c480460b..d124116616e 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Tan.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Tan.mo @@ -1,4 +1,4 @@ -within Buildings.Controls.OBC.CDL.Continuous; +within Buildings.Controls.OBC.CDL.Reals; block Tan "Output the tangent of the input" Interfaces.RealInput u(unit="rad") @@ -64,7 +64,7 @@ where

    -\"tan.png\"

    diff --git a/Buildings/Controls/OBC/CDL/Continuous/Validation/Abs.mo b/Buildings/Controls/OBC/CDL/Reals/Validation/Abs.mo similarity index 77% rename from Buildings/Controls/OBC/CDL/Continuous/Validation/Abs.mo rename to Buildings/Controls/OBC/CDL/Reals/Validation/Abs.mo index afd0955c7e3..ad9b16f29ff 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Validation/Abs.mo +++ b/Buildings/Controls/OBC/CDL/Reals/Validation/Abs.mo @@ -1,10 +1,10 @@ -within Buildings.Controls.OBC.CDL.Continuous.Validation; +within Buildings.Controls.OBC.CDL.Reals.Validation; model Abs "Validation model for the absolute block" - Buildings.Controls.OBC.CDL.Continuous.Abs abs1 + Buildings.Controls.OBC.CDL.Reals.Abs abs1 "Block that outputs the absolute value of the input" annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); - Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp( + Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp( height=2, duration=1, offset=-1) @@ -19,13 +19,13 @@ equation StopTime=1.0, Tolerance=1e-06), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Continuous/Validation/Abs.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Abs.mos" "Simulate and plot"), Documentation( info="

    Validation test for the block - -Buildings.Controls.OBC.CDL.Continuous.Abs. + +Buildings.Controls.OBC.CDL.Reals.Abs. The input varies from -1 to +1.

    ", @@ -33,8 +33,8 @@ The input varies from -1 to +1.