Skip to content

Commit

Permalink
Rename CDL.*Switch blocks (#2654)
Browse files Browse the repository at this point in the history
* changed block names for #2650
  • Loading branch information
JayHuLBL authored Oct 5, 2021
1 parent 4a6285f commit b65beff
Show file tree
Hide file tree
Showing 87 changed files with 427 additions and 414 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ model ControllerChillerDXHeatingEconomizer
final reverseActing=false)
"Cooling coil valve controller"
annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.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
Expand All @@ -210,7 +210,7 @@ model ControllerChillerDXHeatingEconomizer
Buildings.Controls.OBC.CDL.Continuous.Sources.Constant con(k=0)
"Zero outside air fraction"
annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
Buildings.Controls.OBC.CDL.Logical.Switch swiFan "Switch fan on"
Buildings.Controls.OBC.CDL.Continuous.Switch swiFan "Switch fan on"
annotation (Placement(transformation(extent={{70,120},{90,140}})));
Buildings.Controls.OBC.CDL.Continuous.Hysteresis hysHea(
final uLow=0.01,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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.Logical.Switch switch1
Buildings.Controls.OBC.CDL.Continuous.Switch switch1
"Switch to select control output"
annotation (Placement(transformation(extent={{40,-10},{60,10}})));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ 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.Logical.Switch switch1
Buildings.Controls.OBC.CDL.Continuous.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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ protected
final uHigh=hOutHigLimCutHig) if use_enthalpy
"Outdoor air enthalpy hysteresis for both fixed and differential enthalpy cutoff conditions"
annotation (Placement(transformation(extent={{-100,160},{-80,180}})));
Buildings.Controls.OBC.CDL.Logical.Switch outDamSwitch
Buildings.Controls.OBC.CDL.Continuous.Switch outDamSwitch
"Set maximum OA damper position to minimum at disable (after a given time delay)"
annotation (Placement(transformation(extent={{62,-60},{82,-40}})));
Buildings.Controls.OBC.CDL.Logical.Switch retDamSwitch "Set minimum RA damper position to maximum at disable"
Buildings.Controls.OBC.CDL.Continuous.Switch retDamSwitch "Set minimum RA damper position to maximum at disable"
annotation (Placement(transformation(extent={{-40,-162},{-20,-142}})));
Buildings.Controls.OBC.CDL.Logical.Switch maxRetDamSwitch
Buildings.Controls.OBC.CDL.Continuous.Switch maxRetDamSwitch
"Keep maximum RA damper position at physical maximum for a short time period after disable signal"
annotation (Placement(transformation(extent={{40,-120},{60,-100}})));
Buildings.Controls.OBC.CDL.Logical.Switch minRetDamSwitch
Buildings.Controls.OBC.CDL.Continuous.Switch minRetDamSwitch
"Keep minimum RA damper position at physical maximum for a short time period after disable"
annotation (Placement(transformation(extent={{40,-160},{60,-140}})));
Buildings.Controls.OBC.CDL.Logical.Nor nor1 "Logical nor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ protected
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.Logical.Switch retDamPosMinSwitch
Buildings.Controls.OBC.CDL.Continuous.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.Logical.Switch outDamPosMaxSwitch
Buildings.Controls.OBC.CDL.Continuous.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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ block ExhaustDamper
final r=dpBuiSet)
"Building static pressure controller"
annotation (Placement(transformation(extent={{20,50},{40,70}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.Switch swi
"Check if exhaust damper should be activated"
annotation (Placement(transformation(extent={{40,-40},{60,-20}})));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ protected
Buildings.Controls.OBC.CDL.Logical.And and1 "Logical and"
annotation (Placement(transformation(extent={{120,-150},{140,-130}})));

Buildings.Controls.OBC.CDL.Logical.Switch swi4
Buildings.Controls.OBC.CDL.Continuous.Switch swi4
"Ensuring the system efficiency will not be negative"
annotation (Placement(transformation(extent={{60,-70},{80,-50}})));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ protected
"Outdoor air per person"
annotation (Placement(transformation(extent={{-100,30},{-80,50}})));

Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.Switch swi
"If there is occupancy sensor, then using the real time occupancy; otherwise, using the default occupancy"
annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));

Buildings.Controls.OBC.CDL.Logical.Switch swi1
Buildings.Controls.OBC.CDL.Continuous.Switch swi1
"Switch between cooling or heating distribution effectiveness"
annotation (Placement(transformation(extent={{-20,-160},{0,-140}})));

Expand Down Expand Up @@ -248,11 +248,11 @@ protected
"Closed window status when there is no window sensor"
annotation (Placement(transformation(extent={{-100,-80},{-80,-60}})));

Buildings.Controls.OBC.CDL.Logical.Switch swi4
Buildings.Controls.OBC.CDL.Continuous.Switch swi4
"If window is open, the required outdoor airflow rate should be zero"
annotation (Placement(transformation(extent={{60,-60},{80,-40}})));

Buildings.Controls.OBC.CDL.Logical.Switch swi5
Buildings.Controls.OBC.CDL.Continuous.Switch swi5
"If supply fan is off or it is not in occupied mode, then outdoor airflow rate should be zero"
annotation (Placement(transformation(extent={{120,-100},{140,-80}})));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ block ReturnFanDirectPressure
Buildings.Controls.OBC.CDL.Continuous.Line linRetFanStaPre
"Return fan static pressure setpoint"
annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi1
Buildings.Controls.OBC.CDL.Continuous.Switch swi1
"Exhaust air damper position"
annotation (Placement(transformation(extent={{80,10},{100,30}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.Switch swi
"Return fan discharge static pressure setpoint"
annotation (Placement(transformation(extent={{80,-100},{100,-80}})));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected
Buildings.Controls.OBC.CDL.Continuous.Sources.Constant zerSpe(k=0)
"Zero fan speed when it becomes OFF"
annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected
final reverseActing=false)
"Controller for supply air temperature control signal (to be used by heating coil, cooling coil and economizer)"
annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,18 +160,18 @@ protected
TSupWarUpSetBac)
"Supply temperature setpoint under warm-up and setback mode"
annotation (Placement(transformation(extent={{20,-130},{40,-110}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi1
Buildings.Controls.OBC.CDL.Continuous.Switch swi1
"If operation mode is setup or cool-down, setpoint shall be 35 degC"
annotation (Placement(transformation(extent={{80,-60},{100,-40}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi2
Buildings.Controls.OBC.CDL.Continuous.Switch swi2
"If operation mode is setup or cool-down, setpoint shall be TSupSetMin"
annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
Buildings.Controls.OBC.CDL.Continuous.Limiter TDea(
uMax=297.15,
uMin=294.15)
"Limiter that outputs the dead band value for the supply air temperature"
annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi3
Buildings.Controls.OBC.CDL.Continuous.Switch swi3
"Check output regarding supply fan status"
annotation (Placement(transformation(extent={{80,-10},{100,10}})));
Buildings.Controls.OBC.CDL.Integers.LessThreshold intLesThr(t=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.OperationModes.warmUp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected
final k=Buildings.Controls.OBC.ASHRAE.G36_PR1.Types.ZoneStates.cooling)
"Cooling state value"
annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
Buildings.Controls.OBC.CDL.Logical.Switch switch "Switch to assign cooling coil control signal"
Buildings.Controls.OBC.CDL.Continuous.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"
annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ protected
Buildings.Controls.OBC.CDL.Continuous.Add add1(final k2=-1)
"Add block that determines difference the between TOut and TOutCut"
annotation (Placement(transformation(extent={{-140,244},{-120,264}})));
Buildings.Controls.OBC.CDL.Logical.Switch outDamSwitch "Set maximum OA damper position to minimum at disable (after time delay)"
Buildings.Controls.OBC.CDL.Continuous.Switch outDamSwitch "Set maximum OA damper position to minimum at disable (after time delay)"
annotation (Placement(transformation(extent={{40,-150},{60,-130}})));
Buildings.Controls.OBC.CDL.Logical.Switch minRetDamSwitch
Buildings.Controls.OBC.CDL.Continuous.Switch minRetDamSwitch
"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.Nor nor1 "Logical nor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ protected
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.Logical.Switch enaDis
Buildings.Controls.OBC.CDL.Continuous.Switch enaDis
"Logical switch to enable damper position limit calculation or disable it (set min limit to physical minimum)"
annotation (Placement(transformation(extent={{82,-120},{102,-100}})));
Buildings.Controls.OBC.CDL.Logical.Not not1 "Logical not block"
annotation (Placement(transformation(extent={{-20,-80},{0,-60}})));
Buildings.Controls.OBC.CDL.Logical.Switch enaDis1
Buildings.Controls.OBC.CDL.Continuous.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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ protected
Buildings.Controls.OBC.CDL.Continuous.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.Logical.Switch enaDis "Enable or disable the heating coil"
Buildings.Controls.OBC.CDL.Continuous.Switch enaDis "Enable or disable the heating coil"
annotation (Placement(transformation(extent={{76,30},{96,50}})));
Buildings.Controls.OBC.CDL.Continuous.Sources.Constant Off(
final k=0) "Off signal for heating coil"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ block ExhaustDamper
Buildings.Controls.OBC.CDL.Continuous.Line exhDamPos
"Linearly map exhaust damper position to the outdoor air damper position"
annotation (Placement(transformation(extent={{20,-10},{40,10}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi1
Buildings.Controls.OBC.CDL.Continuous.Switch swi1
"Check if exhaust damper should be open"
annotation (Placement(transformation(extent={{60,-60},{80,-40}})));
Buildings.Controls.OBC.CDL.Continuous.Hysteresis greThr(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,20 @@ protected
have_occSen
"Outdoor airflow rate per person"
annotation (Placement(transformation(extent={{-160,150},{-140,170}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.Switch swi
"Switch for enabling occupancy sensor input"
annotation (Placement(transformation(extent={{-60,38},{-40,58}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi1
Buildings.Controls.OBC.CDL.Continuous.Switch swi1
"Switch between cooling or heating distribution effectiveness"
annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
Buildings.Controls.OBC.CDL.Continuous.Division zonOutAirRate
"Required zone outdoor airflow rate"
annotation (Placement(transformation(extent={{20,20},{40,40}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi2
Buildings.Controls.OBC.CDL.Continuous.Switch swi2
"If window is open or it is not in occupied mode, the required outdoor
airflow rate should be zero"
annotation (Placement(transformation(extent={{80,20},{100,0}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi3
Buildings.Controls.OBC.CDL.Continuous.Switch swi3
"If supply fan is off, then outdoor airflow rate should be zero."
annotation (Placement(transformation(extent={{140,0},{160,20}})));
Buildings.Controls.OBC.CDL.Continuous.Hysteresis hys(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ block Supply "Supply air set point for single zone VAV system"
CDL.Interfaces.BooleanInput uFan "Supply fan status"
annotation (Placement(transformation(extent={{-140,-160},{-100,-120}}),
iconTransformation(extent={{-140,-120},{-100,-80}})));
CDL.Logical.Switch switch "Switch to assign control signal"
CDL.Continuous.Switch switch "Switch to assign control signal"
annotation (Placement(transformation(extent={{120,-70},{140,-50}})));
CDL.Continuous.Sources.Constant fanOff(k=0) "Fan off status"
annotation (Placement(transformation(extent={{40,10},{60,30}})));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ protected
final k=0)
"Index to indicate unoccupied period"
annotation (Placement(transformation(extent={{0,340},{20,360}})));
Buildings.Controls.OBC.CDL.Logical.Switch corCooDowTim "Corrected cool down period"
Buildings.Controls.OBC.CDL.Continuous.Switch corCooDowTim "Corrected cool down period"
annotation (Placement(transformation(extent={{-220,240},{-200,260}})));
Buildings.Controls.OBC.CDL.Logical.Switch corWarUpTim "Corrected warm-up period"
Buildings.Controls.OBC.CDL.Continuous.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"
Expand Down Expand Up @@ -256,16 +256,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.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.Switch swi
"Switch between occupied mode index and unoccupied period index"
annotation (Placement(transformation(extent={{160,310},{180,330}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi3
Buildings.Controls.OBC.CDL.Continuous.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.Logical.Switch swi4
Buildings.Controls.OBC.CDL.Continuous.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.Logical.Switch swi5
Buildings.Controls.OBC.CDL.Continuous.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"
Expand All @@ -283,13 +283,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.Logical.Switch swi1
Buildings.Controls.OBC.CDL.Continuous.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.Logical.Switch swi2
Buildings.Controls.OBC.CDL.Continuous.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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ block TrimAndRespond "Block to inplement trim and respond logic"
Buildings.Controls.OBC.CDL.Continuous.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.Logical.Switch netRes "Net setpoint reset value"
Buildings.Controls.OBC.CDL.Continuous.Switch netRes "Net setpoint reset value"
annotation (Placement(transformation(extent={{160,-20},{180,-40}})));
Buildings.Controls.OBC.CDL.Continuous.Sources.Constant resAmoCon(
final k=resAmo)
Expand All @@ -57,16 +57,16 @@ block TrimAndRespond "Block to inplement trim and respond logic"
final y_start=iniSet)
"Output the input signal with a unit delay"
annotation (Placement(transformation(extent={{-100,96},{-80,116}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi
Buildings.Controls.OBC.CDL.Continuous.Switch swi
"Switch between initial setpoint and reseted setpoint"
annotation (Placement(transformation(extent={{160,180},{180,160}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi1
Buildings.Controls.OBC.CDL.Continuous.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.Logical.Switch swi2
Buildings.Controls.OBC.CDL.Continuous.Switch swi2
"Reinitialize setpoint to initial setting when device become OFF"
annotation (Placement(transformation(extent={{100,130},{120,150}})));
Buildings.Controls.OBC.CDL.Logical.Switch swi3 "Logical switch"
Buildings.Controls.OBC.CDL.Continuous.Switch swi3 "Logical switch"
annotation (Placement(transformation(extent={{120,-160},{140,-140}})));
Buildings.Controls.OBC.CDL.Discrete.Sampler sampler(
final samplePeriod=samplePeriod)
Expand Down
Loading

0 comments on commit b65beff

Please sign in to comment.