Skip to content

Commit

Permalink
addresses #2086 [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
@milicag
milicag committed Dec 8, 2020
1 parent 865db5c commit 92c6ba2
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/Processes/Down.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ block Down
final quantity=fill("VolumeFlowRate", nChi),
displayUnit=fill("m3/s", nChi))
"Minimum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real maxFloSet[nChi](
final unit=fill("m3/s", nChi),
final quantity=fill("VolumeFlowRate", nChi),
displayUnit=fill("m3/s", nChi))
"Maximum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real aftByPasSetTim(
final unit="s",
final quantity="Time",
Expand Down
4 changes: 2 additions & 2 deletions ...ontrols/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/Processes/Subsequences/DownStart.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ block DownStart "Sequence for starting stage-down process"
final quantity=fill("VolumeFlowRate", nChi),
displayUnit=fill("m3/s", nChi))
"Minimum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real maxFloSet[nChi](
final unit=fill("m3/s", nChi),
final quantity=fill("VolumeFlowRate", nChi),
displayUnit=fill("m3/s", nChi))
"Maximum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real aftByPasSetTim(
final unit="s",
final quantity="Time",
Expand Down
4 changes: 2 additions & 2 deletions ...gs/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/Processes/Subsequences/UpEnd.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ block UpEnd "Sequence for ending stage-up process"
final quantity=fill("VolumeFlowRate", nChi),
displayUnit=fill("m3/s", nChi))
"Minimum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real maxFloSet[nChi](
final unit=fill("m3/s", nChi),
final quantity=fill("VolumeFlowRate", nChi),
displayUnit=fill("m3/s", nChi))
"Maximum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real aftByPasSetTim(
final unit="s",
final quantity="Time",
Expand Down
4 changes: 2 additions & 2 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/Processes/Up.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ block Up "Sequence for control devices when there is stage-up command"
final quantity=fill("VolumeFlowRate",nChi),
displayUnit=fill("m3/s",nChi))={0.0089,0.0089}
"Minimum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real maxFloSet[nChi](
final unit=fill("m3/s",nChi),
final quantity=fill("VolumeFlowRate",nChi),
displayUnit=fill("m3/s",nChi))={0.025,0.025}
"Maximum chilled water flow through each chiller"
annotation (Evaluate=true, Dialog(group="Reset CHW minimum flow setpoint"));
annotation (Dialog(group="Reset CHW minimum flow setpoint"));
parameter Real aftByPasSetTim(
final unit="s",
final quantity="Time",
Expand Down
4 changes: 2 additions & 2 deletions ...gs/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Staging/SetPoints/SetpointController.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ block SetpointController
final quantity=fill("Power",nChi),
displayUnit=fill("W",nChi))
"Design chiller capacities vector"
annotation (Evaluate=true, Dialog(tab="General", group="Chiller configuration parameters"));
annotation (Dialog(tab="General", group="Chiller configuration parameters"));

parameter Real chiMinCap[nChi](
final unit=fill("W",nChi),
final quantity=fill("Power",nChi),
displayUnit=fill("W",nChi))
"Chiller minimum cycling loads vector"
annotation (Evaluate=true, Dialog(tab="General", group="Chiller configuration parameters"));
annotation (Dialog(tab="General", group="Chiller configuration parameters"));

parameter Integer chiTyp[nChi]={
Buildings.Controls.OBC.ASHRAE.PrimarySystem.ChillerPlant.Types.ChillerAndStageTypes.positiveDisplacement,
Expand Down
10 changes: 5 additions & 5 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Tower/Controller.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ block Controller "Cooling tower controller"

// Fan speed control: when WSE is enabled
parameter Real chiMinCap[nChi](
each final unit="W",
final unit=fill("W", nChi),
final quantity=fill("Power", nChi))={1e4,1e4}
"Minimum cyclining load below which chiller will begin cycling"
annotation (Dialog(tab="Fan speed", group="WSE enabled",
Expand Down Expand Up @@ -66,25 +66,25 @@ block Controller "Cooling tower controller"
final unit=fill("K",nChi),
final quantity=fill("TemperatureDifference",nChi),
displayUnit=fill("degC",nChi))={12,12} "Minimum LIFT of each chiller"
annotation (Evaluate=true, Dialog(tab="Fan speed", group="Return temperature control"));
annotation (Dialog(tab="Fan speed", group="Return temperature control"));
parameter Real TConWatSup_nominal[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={293.15,293.15}
"Condenser water supply temperature (condenser entering) of each chiller"
annotation (Evaluate=true, Dialog(tab="Fan speed", group="Return temperature control"));
annotation (Dialog(tab="Fan speed", group="Return temperature control"));
parameter Real TConWatRet_nominal[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={303.15,303.15}
"Condenser water return temperature (condenser leaving) of each chiller"
annotation (Evaluate=true, Dialog(tab="Fan speed", group="Return temperature control"));
annotation (Dialog(tab="Fan speed", group="Return temperature control"));
parameter Real TChiWatSupMin[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={278.15,278.15}
"Lowest chilled water supply temperature oc each chiller"
annotation (Evaluate=true, Dialog(tab="Fan speed", group="Return temperature control"));
annotation (Dialog(tab="Fan speed", group="Return temperature control"));
parameter Buildings.Controls.OBC.CDL.Types.SimpleController couPlaCon=
Buildings.Controls.OBC.CDL.Types.SimpleController.PI
"Type of coupled plant controller"
Expand Down
8 changes: 4 additions & 4 deletions Buildings/Controls/OBC/ASHRAE/PrimarySystem/ChillerPlant/Tower/FanSpeed/Controller.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,25 @@ block Controller "Tower fan speed control"
final unit=fill("K",nChi),
final quantity=fill("TemperatureDifference",nChi),
displayUnit=fill("degC",nChi))={12,12} "Minimum LIFT of each chiller"
annotation (Evaluate=true, Dialog(tab="Return temperature control", group="Setpoint"));
annotation (Dialog(tab="Return temperature control", group="Setpoint"));
parameter Real TConWatSup_nominal[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={293.15,293.15}
"Design condenser water supply temperature (condenser entering) of each chiller"
annotation (Evaluate=true, Dialog(tab="Return temperature control", group="Setpoint"));
annotation (Dialog(tab="Return temperature control", group="Setpoint"));
parameter Real TConWatRet_nominal[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={303.15,303.15}
"Design condenser water return temperature (condenser leaving) of each chiller"
annotation (Evaluate=true, Dialog(tab="Return temperature control", group="Setpoint"));
annotation (Dialog(tab="Return temperature control", group="Setpoint"));
parameter Real TChiWatSupMin[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={278.15,278.15}
"Lowest chilled water supply temperature of each chiller"
annotation (Evaluate=true, Dialog(tab="Return temperature control", group="Setpoint"));
annotation (Dialog(tab="Return temperature control", group="Setpoint"));
parameter Buildings.Controls.OBC.CDL.Types.SimpleController couPlaCon=
Buildings.Controls.OBC.CDL.Types.SimpleController.PI "Type of controller"
annotation (Dialog(tab="Return temperature control", group="Coupled plant",
Expand Down
8 changes: 4 additions & 4 deletions ...OBC/ASHRAE/PrimarySystem/ChillerPlant/Tower/FanSpeed/ReturnWaterTemperature/Controller.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ block Controller
final unit=fill("K",nChi),
final quantity=fill("TemperatureDifference",nChi),
displayUnit=fill("degC",nChi))={12,12} "Minimum LIFT of each chiller"
annotation (Evaluate=true, Dialog(tab="Setpoint"));
annotation (Dialog(tab="Setpoint"));
parameter Real TConWatSup_nominal[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={293.15,293.15}
"Design condenser water supply temperature (condenser entering) of each chiller"
annotation (Evaluate=true, Dialog(tab="Setpoint"));
annotation (Dialog(tab="Setpoint"));
parameter Real TConWatRet_nominal[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi))={303.15, 303.15}
"Design condenser water return temperature (condenser leaving) of each chiller"
annotation (Evaluate=true, Dialog(tab="Setpoint"));
annotation (Dialog(tab="Setpoint"));
parameter Real TChiWatSupMin[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi)) = {278.15, 278.15}
"Lowest chilled water supply temperature of each chiller"
annotation (Evaluate=true, Dialog(tab="Setpoint"));
annotation (Dialog(tab="Setpoint"));
parameter Buildings.Controls.OBC.CDL.Types.SimpleController couPlaCon=
Buildings.Controls.OBC.CDL.Types.SimpleController.PI
"Type of controller"
Expand Down
4 changes: 2 additions & 2 deletions ...marySystem/ChillerPlant/Tower/FanSpeed/ReturnWaterTemperature/Subsequences/LessCoupled.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ block LessCoupled
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi)) = {293.15, 293.15}
"Design condenser water supply temperature (condenser entering) of each chiller"
annotation (Evaluate=true, Dialog(group="Return water temperature controller"));
annotation (Dialog(group="Return water temperature controller"));
parameter Real TConWatRet_nominal[nChi](
final unit=fill("K",nChi),
final quantity=fill("ThermodynamicTemperature",nChi),
displayUnit=fill("degC",nChi)) = {303.15, 303.15}
"Design condenser water return temperature (condenser leaving) of each chiller"
annotation (Evaluate=true, Dialog(group="Return water temperature controller"));
annotation (Dialog(group="Return water temperature controller"));

parameter Buildings.Controls.OBC.CDL.Types.SimpleController supWatCon=
Buildings.Controls.OBC.CDL.Types.SimpleController.PI
Expand Down

0 comments on commit 92c6ba2

Please sign in to comment.