Skip to content

Commit 788c2d1

Browse files
AntoineGautierAntoineGautier
committed
Refactor for latest controller updates
1 parent 5d7ac6b commit 788c2d1

10 files changed

Lines changed: 303 additions & 1430 deletions

File tree

‎Buildings/Templates/Plants/Boilers/HotWater/Components/Controls/Guideline36.mo‎

Lines changed: 148 additions & 170 deletions
Large diffs are not rendered by default.

‎Buildings/Templates/Plants/Boilers/HotWater/Components/Controls/Guideline36Plugin.mo‎

Lines changed: 0 additions & 1182 deletions
This file was deleted.

‎Buildings/Templates/Plants/Boilers/HotWater/Components/Controls/TypesTmp.mo‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎Buildings/Templates/Plants/Boilers/HotWater/Components/Controls/package.order‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
Guideline36
2-
Guideline36Plugin
32
OpenLoop
4-
TypesTmp

‎Buildings/Templates/Plants/Boilers/HotWater/Components/Interfaces/PartialController.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ block PartialController
151151
"Set to true for secondary HW return temperature sensor"
152152
annotation (Evaluate=true, Dialog(group="Configuration"));
153153

154-
parameter Boolean have_senDpHeaWatLoc=false
155-
"Set to true for local HW differential pressure sensor hardwired to plant or pump controller"
154+
parameter Boolean have_senDpHeaWatRemWir(start=false)=false
155+
"Set to true for remote HW differential pressure sensor(s) hardwired to plant or pump controller"
156156
annotation (Evaluate=true, Dialog(group="Configuration", enable=
157157
typ==Buildings.Templates.Plants.Boilers.HotWater.Types.Controller.Guideline36));
158158
parameter Integer nSenDpHeaWatRem(

‎Buildings/Templates/Plants/Boilers/HotWater/Configuration/BoilerPlant.mo‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
within Buildings.Templates.Plants.Boilers.HotWater.Configuration;
2+
record BoilerPlant "Configuration parameters for boiler plant"
3+
extends Modelica.Icons.Record;
4+
// Boilers
5+
parameter Boolean have_boiCon
6+
"Set to true if the plant includes condensing boilers"
7+
annotation (Evaluate=true);
8+
parameter Boolean have_boiNon
9+
"Set to true if the plant includes non-condensing boilers"
10+
annotation (Evaluate=true);
11+
parameter Buildings.Templates.Plants.Chillers.Types.ChillerLiftControl typCtlHea
12+
"Type of head pressure control"
13+
annotation (Evaluate=true);
14+
parameter Buildings.Templates.Components.Types.Valve typValChiWatChiIso
15+
"Type of chiller CHW isolation valve"
16+
annotation (Evaluate=true);
17+
parameter Buildings.Templates.Components.Types.Valve typValConWatChiIso
18+
"Type of chiller CW isolation valve"
19+
annotation (Evaluate=true);
20+
parameter Boolean have_valChiWatChiBypPar
21+
"Set to true for chiller CHW bypass valve - Parallel chillers with WSE and primary-only distribution"
22+
annotation (Evaluate=true);
23+
// Controls
24+
parameter Buildings.Templates.Plants.Boilers.HotWater.Types.Controller typCtl
25+
"Type of controller"
26+
annotation (Evaluate=true);
27+
// Loads
28+
parameter Integer nAirHan
29+
"Number of air handling units served by the plant"
30+
annotation (Evaluate=true);
31+
parameter Integer nEquZon
32+
"Number of terminal units (zone equipment) served by the plant"
33+
annotation (Evaluate=true);
34+
// Default fluid properties
35+
parameter Modelica.Media.Interfaces.Types.Density rhoHeaWat_default
36+
"HW default density"
37+
annotation (Evaluate=true);
38+
// HW loop
39+
parameter Integer nPumHeaWatPriCon
40+
"Number of primary HW pumps - Condensing boilers"
41+
annotation (Evaluate=true);
42+
parameter Integer nPumHeaWatPriNon
43+
"Number of primary HW pumps - Non-cCondensing boilers"
44+
annotation (Evaluate=true);
45+
parameter Buildings.Templates.Components.Types.PumpArrangement typArrPumHeaWatPriCon
46+
"Type of primary HW pump arrangement - Condensing boilers";
47+
parameter Buildings.Templates.Components.Types.PumpArrangement typArrPumHeaWatPriNon
48+
"Type of primary HW pump arrangement - Non-condensing boilers";
49+
parameter Boolean have_varPumHeaWatPriCon
50+
"Set to true for variable speed primary HW pumps - Condensing boilers"
51+
annotation (Evaluate=true);
52+
parameter Boolean have_varPumHeaWatPriNon
53+
"Set to true for variable speed primary HW pumps - Non-condensing boilers"
54+
annotation (Evaluate=true);
55+
parameter Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsSecondary typPumHeaWatSec
56+
"Type of secondary HW pumps"
57+
annotation (Evaluate=true);
58+
parameter Integer nPumHeaWatSec
59+
"Number of secondary HW pumps"
60+
annotation (Evaluate=true);
61+
parameter Integer nLooHeaWatSec
62+
"Number of secondary HW loops for distributed secondary distribution"
63+
annotation (Evaluate=true);
64+
parameter Integer nSenDpChiWatRem
65+
"Number of remote CHW differential pressure sensors used for CHW pump speed control"
66+
annotation (Evaluate=true);
67+
parameter Buildings.Templates.Plants.Chillers.Types.PrimaryOverflowMeasurement typMeaCtlChiWatPri
68+
"Type of sensors for primary CHW pump control in variable primary-variable secondary plants"
69+
annotation (Evaluate=true, Dialog(group="Configuration"));
70+
parameter Boolean have_senDpChiWatRemWir
71+
"Set to true for remote CHW differential pressure sensor(s) hardwired to plant or pump controller"
72+
annotation (Evaluate=true);
73+
parameter Integer nLooChiWatSec=1
74+
"Number of secondary CHW loops"
75+
annotation (Evaluate=true, Dialog(group="Configuration"));
76+
parameter Boolean have_senVChiWatSec
77+
"Set to true if secondary loop is equipped with a flow meter"
78+
annotation (Evaluate=true, Dialog(group="Configuration"));
79+
// WSE
80+
parameter Buildings.Templates.Plants.Chillers.Types.Economizer typEco
81+
"Type of WSE"
82+
annotation (Evaluate=true);
83+
// CW pumps
84+
parameter Integer nPumConWat
85+
"Number of CW pumps"
86+
annotation (Evaluate=true);
87+
parameter Buildings.Templates.Components.Types.PumpArrangement typArrPumConWat
88+
"Type of CW pump arrangement"
89+
annotation (Evaluate=true);
90+
parameter Boolean have_pumConWatVar
91+
"Set to true for variable speed CW pumps, false for constant speed pumps"
92+
annotation (Evaluate=true);
93+
parameter Boolean have_pumConWatVarCom
94+
"Set to true for single common speed signal for CW pumps, false for dedicated signals"
95+
annotation (Evaluate=true);
96+
// Coolers
97+
parameter Buildings.Templates.Components.Types.Cooler typCoo
98+
"Condenser water cooling equipment"
99+
annotation(Evaluate=true);
100+
parameter Integer nCoo
101+
"Number of cooler units"
102+
annotation (Evaluate=true);
103+
parameter Boolean have_senLevCoo
104+
"Set to true if cooling towers have level sensor for makeup water control"
105+
annotation (Evaluate=true);
106+
parameter Buildings.Templates.Components.Types.Valve typValCooInlIso
107+
"Cooler inlet isolation valve"
108+
annotation (Evaluate=true, Dialog(group="Configuration"));
109+
parameter Buildings.Templates.Components.Types.Valve typValCooOutIso
110+
"Cooler outlet isolation valve"
111+
annotation (Evaluate=true, Dialog(group="Configuration"));
112+
113+
annotation (
114+
defaultComponentPrefixes="parameter",
115+
defaultComponentName="cfg",
116+
Documentation(
117+
info="<html>
118+
<p>
119+
This record provides the set of configuration parameters for
120+
the heat pump plant models within
121+
<a href=\"modelica://Buildings.Templates.Plants.HeatPumps\">
122+
Buildings.Templates.Plants.HeatPumps</a>.
123+
</p>
124+
</html>"));
125+
end BoilerPlant;

‎Buildings/Templates/Plants/Boilers/HotWater/Configuration/package.mo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
within Buildings.Templates.Plants.Boilers.HotWater;
2+
package Configuration "Records for configuration parameters"
3+
extends Modelica.Icons.MaterialPropertiesPackage;
4+
annotation (Documentation(info="<html>
5+
<p>
6+
This package provides records for configuration parameters.
7+
</p>
8+
</html>"));
9+
end Configuration;

‎Buildings/Templates/Plants/Boilers/HotWater/Configuration/package.order‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BoilerPlant

‎Buildings/Templates/Plants/Boilers/HotWater/Interfaces/PartialBoilerPlant.mo‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,19 @@ partial model PartialBoilerPlant
55
constrainedby Modelica.Media.Interfaces.PartialMedium
66
"HW medium";
77

8+
// The controller implementation does not support hybrid plants
9+
// but the equipment model does. We only limit the choices here
10+
// but keep all choices in the enumeration for future support.
811
parameter Buildings.Templates.Plants.Boilers.HotWater.Types.Boiler typ
912
"Type of boilers"
10-
annotation (Evaluate=true, Dialog(group="Boilers"));
13+
annotation (Evaluate=true, Dialog(group="Boilers"),
14+
choices(
15+
choice = Condensing "Condensing boilers only",
16+
choice = NonCondensing "Non-condensing boilers only"));
1117
parameter Buildings.Templates.Components.Types.BoilerHotWaterModel typMod=
1218
Buildings.Templates.Components.Types.BoilerHotWaterModel.Polynomial
1319
"Type of boiler model"
14-
annotation (Evaluate=true, Dialog(group="Boilers"));
20+
annotation (Evaluate=true, Dialog(group="Boilers"), __ctrlFlow(enable=false));
1521

1622
final parameter Boolean have_boiCon =
1723
typ==Buildings.Templates.Plants.Boilers.HotWater.Types.Boiler.Condensing
@@ -216,8 +222,7 @@ partial model PartialBoilerPlant
216222
final have_varPumHeaWatPriCon=have_varPumHeaWatPriCon,
217223
final have_varPumHeaWatPriNon=have_varPumHeaWatPriNon,
218224
final typCtl=typCtl,
219-
final rho_default=rho_default)
220-
"Design and operating parameters"
225+
final rho_default=rhoHeaWat_default) "Design and operating parameters"
221226
annotation (Placement(transformation(extent={{-280,240},{-260,260}})));
222227

223228
final parameter Modelica.Units.SI.MassFlowRate mHeaWatPriCon_flow_nominal=
@@ -257,15 +262,14 @@ partial model PartialBoilerPlant
257262
"= true, if actual temperature at port is computed"
258263
annotation(Dialog(tab="Advanced",group="Diagnostics"));
259264

260-
final parameter Medium.Density rho_default=
261-
Medium.density(sta_default)
262-
"HW default density";
263-
final parameter Medium.ThermodynamicState sta_default=
264-
Medium.setState_pTX(
265-
T=Buildings.Templates.Data.Defaults.THeaWatSup,
266-
p=Medium.p_default,
267-
X=Medium.X_default)
268-
"HW default state";
265+
final parameter Modelica.Media.Interfaces.Types.Density rhoHeaWat_default=
266+
Medium.density(staHeaWat_default) "HW default density";
267+
final parameter
268+
Modelica.Media.Interfaces.PartialSimpleMedium.ThermodynamicState
269+
staHeaWat_default=Medium.setState_pTX(
270+
T=Buildings.Templates.Data.Defaults.THeaWatSup,
271+
p=Medium.p_default,
272+
X=Medium.X_default) "HW default state";
269273

270274
Modelica.Fluid.Interfaces.FluidPort_a port_a(
271275
redeclare final package Medium = Medium,

‎Buildings/Templates/Plants/Boilers/HotWater/package.order‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
BoilerPlant
22
Components
3+
Configuration
34
Data
45
Types
56
Validation

0 commit comments

Comments
 (0)