Skip to content

Commit 9f02685

Browse files
AntoineGautierAntoineGautier
committed
Refactor after merge [ci skip]
1 parent e99200b commit 9f02685

61 files changed

Lines changed: 416 additions & 431 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupPolynomial.mos renamed to Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupPolynomial.mos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
simulateModel("Buildings.Templates.HeatingPlants.HotWater.Components.Validation.BoilerGroupPolynomial",
1+
simulateModel("Buildings.Templates.Plants.Boilers.HotWater.Components.Validation.BoilerGroupPolynomial",
22
method="cvode",
33
tolerance=1e-6,
44
stopTime=2000.0,
@@ -18,4 +18,4 @@ createPlot(id=1,
1818
y={"mHeaWat_flow_nominal", "mHeaWat_flow.m_flow"},
1919
subPlot=103,
2020
autoscale=true,
21-
grid=true);
21+
grid=true);

Buildings/Resources/Scripts/Dymola/Templates/HeatingPlants/HotWater/Components/Validation/BoilerGroupTable.mos renamed to Buildings/Resources/Scripts/Dymola/Templates/Plants/Boilers/HotWater/Components/Validation/BoilerGroupTable.mos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
simulateModel("Buildings.Templates.HeatingPlants.HotWater.Components.Validation.BoilerGroupTable",
1+
simulateModel("Buildings.Templates.Plants.Boilers.HotWater.Components.Validation.BoilerGroupTable",
22
method="cvode",
33
tolerance=1e-6,
44
stopTime=2000.0,
@@ -18,4 +18,4 @@ createPlot(id=1,
1818
y={"mHeaWat_flow_nominal", "mHeaWat_flow.m_flow"},
1919
subPlot=103,
2020
autoscale=true,
21-
grid=true);
21+
grid=true);

‎Buildings/Templates/AirHandlersFans/Validation/package.order‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
VAVMultiZone
21
UserProject

‎Buildings/Templates/Components/Data/package.order‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
BoilerHotWater
12
Chiller
23
Coil
34
Cooler

‎Buildings/Templates/Components/Interfaces/package.order‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Bus
2+
PartialBoilerHotWater
23
PartialChiller
34
PartialCoil
45
PartialCooler

‎Buildings/Templates/Components/Routing/MultipleToSingle.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,24 +166,24 @@ equation
166166
pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
167167
then LinePattern.Solid else LinePattern.Dash,
168168
thickness=5),
169-
Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
169+
Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
170170
points=if icon_offset*icon_dy>=0 then
171171
{{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}}
172172
elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then
173173
{{0, 0},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}}
174174
else {{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}},
175175
color={0,0,0},
176-
pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
176+
pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
177177
then LinePattern.Solid else LinePattern.Dash,
178178
thickness=5),
179-
Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
179+
Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
180180
points=if icon_offset*icon_dy>=0 then
181181
{{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}}
182182
elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then
183183
{{0, 0},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}}
184184
else {{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}},
185185
color={0,0,0},
186-
pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
186+
pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
187187
then LinePattern.Solid else LinePattern.Dash,
188188
thickness=5)}),
189189
Diagram(

‎Buildings/Templates/Components/Routing/SingleToMultiple.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,24 +169,24 @@ equation
169169
pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
170170
then LinePattern.Solid else LinePattern.Dash,
171171
thickness=5),
172-
Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
172+
Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
173173
points=if icon_offset*icon_dy>=0 then
174174
{{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}}
175175
elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then
176176
{{0, 0},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}}
177177
else {{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}},
178178
color={0,0,0},
179-
pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
179+
pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
180180
then LinePattern.Solid else LinePattern.Dash,
181181
thickness=5),
182-
Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
182+
Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IntegrationPoint.None,
183183
points=if icon_offset*icon_dy>=0 then
184184
{{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}}
185185
elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then
186186
{{0, 0},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}}
187187
else {{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}},
188188
color={0,0,0},
189-
pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
189+
pattern=if icon_pipe==Buildings.Templates.Components.Types.IntegrationPoint.Supply
190190
then LinePattern.Solid else LinePattern.Dash,
191191
thickness=5)}),
192192
Diagram(

‎Buildings/Templates/Components/Types.mo‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
within Buildings.Templates.Components;
22
package Types "Package with type definitions"
33
extends Modelica.Icons.TypesPackage;
4+
type BoilerHotWaterModel = enumeration(
5+
Polynomial
6+
"Efficiency described by a polynomial",
7+
Table
8+
"Efficiency described by a table")
9+
"Enumeration to specify the type of hot water boiler model";
410
type Chiller = enumeration(
511
AirCooled
612
"Air-cooled compression chiller",

‎Buildings/Templates/Components/Validation/BoilerHotWater.mo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ model BoilerHotWater "Test model for the hot water boiler model"
3030
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
3131
Fluid.Sources.Boundary_pT retHeaWat(
3232
redeclare final package Medium = Medium,
33-
p=Buildings.Templates.Data.Defaults.pHeaWat_rel_min + boiTab.dpHeaWat_nominal,
33+
p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + boiTab.dpHeaWat_nominal,
3434
use_T_in=true,
3535
T=datBoiTab.THeaWatSup_nominal - 15,
3636
nPorts=2) "Boundary conditions for HW distribution system"
3737
annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
3838

3939
Fluid.Sources.Boundary_pT supHeaWat(redeclare final package Medium =Medium,
40-
p=Buildings.Templates.Data.Defaults.pHeaWat_rel_min,
40+
p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal,
4141
nPorts=2)
4242
"Boundary conditions for HW distribution system"
4343
annotation (Placement(transformation(extent={{90,-30},{70,-10}})));

‎Buildings/Templates/Components/package.order‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Actuators
2+
Boilers
23
Chillers
34
Coils
45
Controls

0 commit comments

Comments
 (0)