Skip to content

Commit 7be1352

Browse files
Update validation script
1 parent cd6b2f1 commit 7be1352

4 files changed

Lines changed: 26 additions & 14 deletions

File tree

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

Buildings/Resources/Scripts/travis/templates/Plants.Boilers.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,13 @@
4646
pla__nBoiNon_select=[
4747
'2',
4848
],
49-
pla__typPumHeaWatPriCon=[
50-
'Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsPrimary.Variable',
51-
'Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsPrimary.Constant',
49+
pla__have_boiConZerFlo=[
50+
'true',
51+
'false',
52+
],
53+
pla__have_boiNonZerFlo=[
54+
'true',
55+
'false',
5256
],
5357
pla__typPumHeaWatPriNon=[
5458
'Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsPrimary.Variable',
@@ -142,6 +146,7 @@
142146
'typArrPumHeaWatPriNon_select',
143147
'nBoiNon_select',
144148
'typPumHeaWatPriNon',
149+
'have_boiNonZerFlo',
145150
],
146151
),
147152
(
@@ -152,11 +157,17 @@
152157
'typArrPumHeaWatPriCon_select',
153158
'nBoiCon_select',
154159
'typPumHeaWatPriCon',
160+
'have_boiConZerFlo',
155161
],
156162
),
157163
],
158164
}
159165

160166

161167
if __name__ == '__main__':
162-
core.main(models=MODELS, modif_grid=MODIF_GRID, exclude=EXCLUDE, remove_modif=REMOVE_MODIF)
168+
core.main(
169+
models=MODELS,
170+
modif_grid=MODIF_GRID,
171+
exclude=EXCLUDE,
172+
remove_modif=REMOVE_MODIF,
173+
)

Buildings/Resources/Scripts/travis/templates/checkandrun.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,23 @@ done
8989
# Each value is a string containing directory paths (relative to `modelica-buildings/Buildings`).
9090
declare -A checksum_dirs=(
9191
["Buildings.Templates.AirHandlersFans"]="Templates/AirHandlersFans
92-
Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV"
92+
Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV"
9393
["Buildings.Templates.ZoneEquipment"]="Templates/ZoneEquipment
94-
Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly
95-
Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat"
94+
Controls/OBC/ASHRAE/G36/TerminalUnits/CoolingOnly
95+
Controls/OBC/ASHRAE/G36/TerminalUnits/Reheat"
96+
["Buildings.Templates.Plants.Boilers"]="Templates/Plants/Boilers
97+
Controls/OBC/ASHRAE/G36/Plants/Boilers"
9698
["Buildings.Templates.Plants.HeatPumps"]="Templates/Plants/HeatPumps
97-
Templates/Plants/Controls"
98-
["Plants.Boilers"]="Templates/Plants/Boilers
99-
Controls/OBC/ASHRAE/G36/Plants/Boilers"
99+
Templates/Plants/Controls"
100100
)
101101
# Declare the python script that must be run for each template package.
102102
# Each key is a full Modelica package name (with . as separator).
103103
# Each value is a string containing the script path (relative to `modelica-buildings/Buildings`).
104104
declare -A test_script=(
105-
["Buildings.Templates.AirHandlersFans"]="./Resources/Scripts/travis/templates/VAVMultiZone.py"
106-
["Buildings.Templates.ZoneEquipment"]="./Resources/Scripts/travis/templates/VAVBox.py"
107-
["Buildings.Templates.Plants.HeatPumps"]="./Resources/Scripts/travis/templates/Plants.HeatPumps.py"
105+
# ["Buildings.Templates.AirHandlersFans"]="./Resources/Scripts/travis/templates/VAVMultiZone.py"
106+
# ["Buildings.Templates.ZoneEquipment"]="./Resources/Scripts/travis/templates/VAVBox.py"
107+
["Buildings.Templates.Plants.Boilers"]="./Resources/Scripts/travis/templates/Plants.Boilers.py"
108+
# ["Buildings.Templates.Plants.HeatPumps"]="./Resources/Scripts/travis/templates/Plants.HeatPumps.py"
108109
)
109110

110111
# Validate single-package argument if provided

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ block PartialController
4444
Buildings.Templates.Plants.Boilers.HotWater.Types.PumpsSecondary.None
4545
and (cfg.have_boiCon and cfg.have_pumHeaWatPriVarCon
4646
or cfg.have_boiNon and cfg.have_pumHeaWatPriVarNon)));
47-
// At least one flow sensor is needed, either in primary or secondary loop for staging.
4847
final parameter Boolean have_senVHeaWatPriCon =
4948
cfg.have_boiCon
5049
and (if cfg.have_pumHeaWatPriVarCon and

0 commit comments

Comments
 (0)