Skip to content
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
1677 commits
Select commit Hold shift + click to select a range
e904fb4
validated generic sequences [ci skip]
JayHuLBL Jan 30, 2024
eb0c5d2
validating head pressure control sequences [ci skip]
JayHuLBL Jan 30, 2024
e511a6b
validated head pressure control sequences [ci skip]
JayHuLBL Jan 30, 2024
7f4fc5d
validated minimum flow bypass control [ci skip]
JayHuLBL Jan 31, 2024
5945a72
validating pumps control sequences [ci skip]
JayHuLBL Jan 31, 2024
1603bdb
Added validation model placeholders for primary and secondary loop co…
karthikeyad-pnnl Feb 12, 2024
6b7b7ab
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Feb 26, 2024
9e69a1d
Added new control module for enabling lag primary loop in hybrid plant
karthikeyad-pnnl Mar 4, 2024
81079bc
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 12, 2024
3a73ba1
updated reference
JayHuLBL Mar 12, 2024
983f129
solved issues when modeling with optimica
JayHuLBL Mar 13, 2024
bce2665
corrected html error, deleted test code
JayHuLBL Mar 13, 2024
050ef48
updating documentation for the closed loop model [ci skip]
JayHuLBL Mar 14, 2024
d50075a
updated closed loop documentation
JayHuLBL Mar 14, 2024
c378b68
added release note, updated the exclusion list
JayHuLBL Mar 15, 2024
35860a4
corrected html error
JayHuLBL Mar 15, 2024
592994a
updated schematic
JayHuLBL Mar 15, 2024
a35f0b3
updating validation models for the chilled water pump staging control
JayHuLBL Mar 21, 2024
ebf4c10
improving the validation model documentation
JayHuLBL Mar 25, 2024
707e874
updating validation model document
JayHuLBL Mar 26, 2024
b514f0d
Added script for primary controller validation
karthikeyad-pnnl Mar 26, 2024
1faa1a7
merged master [ci skip]
JayHuLBL Apr 17, 2024
a5f3e44
updated cdl classname
JayHuLBL Apr 17, 2024
7a32971
improved condenser water pump valiation modeli documentations
JayHuLBL Apr 18, 2024
621f61a
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 18, 2024
50314c0
updating condenser water pump speed validation
JayHuLBL Apr 19, 2024
0d4a998
updating the setpoint validation model documentation
JayHuLBL Apr 19, 2024
16179bb
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 2, 2024
fc07da8
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 10, 2024
b9eb2bd
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 13, 2024
d2a9494
adding validation documentation to the staging process sequences [ci …
JayHuLBL May 13, 2024
ed5f183
updated reference, corrected checking of the reset minimum flow setpo…
JayHuLBL May 14, 2024
d20cb75
updated staging process sequences validation [ci skip]
JayHuLBL May 17, 2024
37cd783
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into l…
karthikeyad-pnnl May 19, 2024
05a2fde
Merge branch 'lbl-srg-master' into issue2180_Boilet push origin
karthikeyad-pnnl May 19, 2024
f4bb430
Updated package order files
karthikeyad-pnnl May 19, 2024
c161a20
Updated CDL references after merging latest master
karthikeyad-pnnl May 19, 2024
477c885
adding documentation to the staging process susequences validation [c…
JayHuLBL May 20, 2024
872d587
updated validation models of sub sequences for the staging process [c…
JayHuLBL May 28, 2024
409a6f3
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 28, 2024
c016362
updated down with on-off validation documentation [ci skip]
JayHuLBL May 29, 2024
a2c2cb8
adding validation document for the staging process models [ci skip]
JayHuLBL May 30, 2024
d774f50
added documentation for the validation models of staging sequences [c…
JayHuLBL May 31, 2024
713ca47
adding documentation for the tower control sequences [ci skip]
JayHuLBL Jun 1, 2024
caeae92
adding documentation to the controller validaiton models [ci skip]
JayHuLBL Jun 4, 2024
629b22d
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jun 6, 2024
0edd3d2
updating controller validation documentation [ci skip]
JayHuLBL Jun 7, 2024
ab7d21c
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jun 21, 2024
ca4c52f
updating the reference [ci skip]
JayHuLBL Jun 21, 2024
bc58781
updated reference and the section numbers [ci skip]
JayHuLBL Jun 23, 2024
9a87cb5
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jun 24, 2024
221c0e1
adding the cooling tower controller validation cases [ci skip]
JayHuLBL Jun 25, 2024
79056bc
added validation model for the tower controller [ci skip]
JayHuLBL Jun 25, 2024
a21960d
corrected reference in package.mo file [ci skip]
JayHuLBL Jun 26, 2024
16e3b70
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jun 26, 2024
e43b0a4
updating controller documentation [ci skip]
JayHuLBL Jun 27, 2024
66e6e9b
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jun 27, 2024
694cca3
updated closed-loop diagram, changed staging setpoint reference, addi…
JayHuLBL Jun 29, 2024
4468d18
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jul 1, 2024
7e09830
added documentation
JayHuLBL Jul 1, 2024
1c27c32
updated reference
JayHuLBL Jul 1, 2024
cd50762
added missing comments, deleted temp folder, reverted wrong changes […
JayHuLBL Jul 2, 2024
35fa0b4
updated reference, avoid each warning
JayHuLBL Jul 2, 2024
64157ac
fixed the wrong dynamic color, added comments
JayHuLBL Jul 2, 2024
0930af3
updated conf
JayHuLBL Jul 2, 2024
da73737
changed class name
JayHuLBL Jul 2, 2024
fb7cf43
corrected package order
JayHuLBL Jul 2, 2024
e5386d1
added closedloop test to exclusion list
JayHuLBL Jul 3, 2024
bd4af8f
updated conf file
JayHuLBL Jul 3, 2024
7bd018d
added missing comments
JayHuLBL Jul 3, 2024
a9d4c31
merged master
JayHuLBL Aug 9, 2024
81f1791
updated opnemodelica script
JayHuLBL Aug 9, 2024
1c62c10
merging master
JayHuLBL Aug 15, 2024
17456fa
improved stage change setpoint sequence
JayHuLBL Aug 22, 2024
fb3a36b
changed package order
JayHuLBL Aug 22, 2024
6240554
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Aug 23, 2024
d13967f
deleted min setting [ci skip]
JayHuLBL Nov 5, 2024
259d147
merged master
JayHuLBL Dec 13, 2024
5fc1d5d
updated references
JayHuLBL Dec 13, 2024
386da45
fixed oct compile errors [ci skip]
JayHuLBL Dec 13, 2024
de462b1
updated closed loop test results, deleted CDL changes
JayHuLBL Dec 13, 2024
5a42418
updated reference
JayHuLBL Dec 14, 2024
563949a
corrected hyperlinks
JayHuLBL Dec 14, 2024
16413e1
fixed broken links
JayHuLBL Dec 14, 2024
6681f3d
corrected the duplicate protected statement
JayHuLBL Dec 15, 2024
fd9c9bd
updated references with dymola 2025x
JayHuLBL Dec 17, 2024
782ae15
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Dec 19, 2024
f546531
updated reference results
JayHuLBL Dec 19, 2024
fb70bab
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jan 15, 2025
f5d30ab
addressing antoine's comments [ci skip]
JayHuLBL Jan 15, 2025
9f9b562
renamed enumeration name [ci skip]
JayHuLBL Jan 17, 2025
f1e3de2
improved comments about the chiller type [ci skip]
JayHuLBL Jan 17, 2025
07e5290
removing anyVsdCen [ci skip]
JayHuLBL Jan 21, 2025
9048660
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Feb 25, 2025
0fa8d03
changed the chiller type to enumeration
JayHuLBL Feb 26, 2025
4201564
created type converting to integer [ci skip]
JayHuLBL Feb 26, 2025
712a5b3
propagated anyVsdCen [ci skip]
JayHuLBL Feb 26, 2025
9b3762f
Removed unused parameters and interfaces from primary loop controller…
karthikeyad-pnnl Mar 5, 2025
01bc9f3
Removed excess instances from primary controller validation model
karthikeyad-pnnl Mar 5, 2025
aa93b95
Removed unused interfaces from secondary controller
karthikeyad-pnnl Mar 5, 2025
55b0d28
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 6, 2025
f266c0c
Added backup of original boiler plant model for closed loop demo
karthikeyad-pnnl Mar 6, 2025
2545f33
added the release note to version 12 [ci skip]
JayHuLBL Mar 17, 2025
0e04eeb
added missing connection for the max and min lift [ci skip]
JayHuLBL Mar 17, 2025
3e07d1d
set the default number of pumps to be same as number of chillers
JayHuLBL Mar 17, 2025
a9db9f5
replaced the wet bulb temperature input by the relative humidity input
JayHuLBL Mar 17, 2025
abb6cf6
renamed the maximum plant chilled water supply temperature
JayHuLBL Mar 17, 2025
5d69ab3
renamed parameters for chilled water pressure setpoints [ci skip]
JayHuLBL Mar 18, 2025
bbde740
removed default flow setpoint [ci skip]
JayHuLBL Mar 18, 2025
f6d8504
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 18, 2025
690a75b
Added large office building loads
karthikeyad-pnnl Mar 18, 2025
b776287
Updated paths to Sine block in CDL
karthikeyad-pnnl Mar 18, 2025
e6f6786
Removed unused packages, blocks and scripts
karthikeyad-pnnl Mar 19, 2025
b893410
added start value for the parameters that could be disabled [ci skip]
JayHuLBL Mar 20, 2025
45f38d4
Removed unused reference files for equipment rotation, hybrid plant c…
karthikeyad-pnnl Mar 25, 2025
d79b930
Removed unused classes related to secondary loop controller
karthikeyad-pnnl Mar 25, 2025
ca74ccd
Removed secondary controller model and renamed zonal load class to se…
karthikeyad-pnnl Mar 25, 2025
51b3ade
Removed redundant boiler plant physics model
karthikeyad-pnnl Mar 25, 2025
5b810cd
Renamed boiler plant physics model
karthikeyad-pnnl Mar 26, 2025
093cd5d
Updated documentation for all controller classes
karthikeyad-pnnl Mar 26, 2025
56b7166
Updated controllers to fix issues found in closed-loop demonstration
karthikeyad-pnnl Mar 26, 2025
ead181e
Updated closed loop demonstration models
karthikeyad-pnnl Mar 26, 2025
d78ce5f
Updated unit test results for closed loop demonstration
karthikeyad-pnnl Mar 26, 2025
4b79562
Updated models to fix issues in unit tests
karthikeyad-pnnl Mar 26, 2025
68d7bfe
Uploading latest unit test results
karthikeyad-pnnl Mar 26, 2025
8b699b8
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 26, 2025
cdff3df
changed LIFT parameter name [ci skip]
JayHuLBL Mar 26, 2025
3f8e798
changed displayUnit to unit [ci skip]
JayHuLBL Mar 27, 2025
dcd68c1
moved chiller plant sequence to G36 package
JayHuLBL Mar 27, 2025
b650ea1
added package description [ci skip]
JayHuLBL Mar 27, 2025
72f2f7a
updated release note
JayHuLBL Mar 27, 2025
028c93c
Removed unused files for equipment rotation
karthikeyad-pnnl Apr 1, 2025
0ef33ef
Moved all boiler plant control moodules to new location in G36 package
karthikeyad-pnnl Apr 1, 2025
eadf06d
Merge branch 'issue2293_chiller_plant_seq' of github.com:lbl-srg/mode…
karthikeyad-pnnl Apr 1, 2025
8ea64c1
Merge branch 'lbl-srg-issue2293_chiller_plant_seq' into issue2180_Boi…
karthikeyad-pnnl Apr 1, 2025
9a44746
Updated package structure for examplers package
karthikeyad-pnnl Apr 1, 2025
2c427b2
Updated models to address comments on #2700
karthikeyad-pnnl Apr 4, 2025
7233b21
Merge pull request #4176 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Apr 4, 2025
2dc1657
Fixed translation issues in example model
karthikeyad-pnnl Apr 11, 2025
34245a7
Backing up files with partial fix for isolation valve control
karthikeyad-pnnl Apr 14, 2025
f25f82a
Changed boiler types defintion to use enumeration
karthikeyad-pnnl Apr 15, 2025
f6df9db
Applied functional fixes for staging process
karthikeyad-pnnl Apr 15, 2025
01d8d97
Fixed validation models for all impacted control modules
karthikeyad-pnnl Apr 15, 2025
618d5e0
Fixed translation issues in controller validation and exampe model
karthikeyad-pnnl Apr 15, 2025
3a5e3f6
Merge pull request #4188 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Apr 15, 2025
b354568
Reverted boiler types definition to Integer constants from enumeratio…
karthikeyad-pnnl Apr 16, 2025
8788427
Fixed translation issues in example model
karthikeyad-pnnl Apr 16, 2025
a24f5f6
Merge pull request #4192 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Apr 16, 2025
3244420
Model fixes for staging process issues, and functioning example model
karthikeyad-pnnl Apr 17, 2025
e612f6f
Changed isolation valve parameters to resolve convergence issues
karthikeyad-pnnl Apr 18, 2025
d73797c
Merge pull request #4195 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Apr 26, 2025
db706c9
Updated Boolean parameter in minimum flowrate setpoint calculation in…
karthikeyad-pnnl Apr 28, 2025
39d4d9e
Added contextual comments to blocks and updated formatting
karthikeyad-pnnl May 1, 2025
e1a34d7
Added enable condition to condensation control parameter
karthikeyad-pnnl May 1, 2025
c39e219
Merge pull request #4208 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier May 5, 2025
dae85a9
Added assert messages for invalid combinations of plant configuration…
karthikeyad-pnnl Jun 4, 2025
bd6eb27
Added reference results for new boiler plant primary controller
karthikeyad-pnnl Jun 4, 2025
13b1628
Updated modules to resolve errors found during unit tests
karthikeyad-pnnl Jun 4, 2025
316b175
Updated staging down sequence to resolve errors in unit test
karthikeyad-pnnl Jun 4, 2025
f8eb214
Updated unit test results after all updates for boiler plant template…
karthikeyad-pnnl Jun 4, 2025
bbfe437
Changed derived parameters to final
karthikeyad-pnnl Jul 8, 2025
fd1c7ad
Updated all comments and instance names related to plant and reset re…
karthikeyad-pnnl Jul 8, 2025
c697e81
Updated unit information. Removed duplicate parameters. Updated Boole…
karthikeyad-pnnl Jul 8, 2025
50aa83d
Removed redundant Boolean edge detectors
karthikeyad-pnnl Jul 8, 2025
81f56a0
Changed temperature setpoint reset parameter defaults. Updated parame…
karthikeyad-pnnl Jul 9, 2025
08d4ed7
Updated code per comments on #2700
karthikeyad-pnnl Jul 9, 2025
83e0c6d
Renamed boiler status input on pump controller. Moved pump curves to …
karthikeyad-pnnl Jul 10, 2025
eca779f
Refactored hot water supply temp reset to use new implementation of T&R
karthikeyad-pnnl Jul 10, 2025
e3d46f3
Fixed conditional enable that results in compilation issues
karthikeyad-pnnl Jul 11, 2025
4634b9e
Updated Boolean conditionals for volume flowrate measurement across m…
karthikeyad-pnnl Aug 21, 2025
830a0d5
Fixed illegal parameter modifications in secondary pump controller va…
karthikeyad-pnnl Aug 21, 2025
9d76563
Updated interface name for staging setpoint change detection module
karthikeyad-pnnl Aug 21, 2025
2891217
Updated logic and validation model for block to identify boilers to b…
karthikeyad-pnnl Aug 21, 2025
5746058
Updated variable names in validation scripts
karthikeyad-pnnl Aug 21, 2025
ec6ccbe
Changed diff pressure setpoint interfaces to use array
karthikeyad-pnnl Aug 22, 2025
6296f2a
Updated temp difference parameters to correct instance name format
karthikeyad-pnnl Aug 22, 2025
b7b7d91
Updated blocks and modules to address comments on #2700
karthikeyad-pnnl Aug 22, 2025
847178b
Fixed errors found in unit test
karthikeyad-pnnl Aug 22, 2025
eee912a
Fixed validation scripts to resolve unit test errors
karthikeyad-pnnl Aug 23, 2025
930b46c
Updated unit test results
karthikeyad-pnnl Aug 23, 2025
3280049
Updated models and validation script for closed loop example
karthikeyad-pnnl Aug 27, 2025
25d98b3
Fixed variable name
karthikeyad-pnnl Aug 27, 2025
2fca328
Updated unit test script and reference results
karthikeyad-pnnl Aug 27, 2025
8c8f70f
Updated simulation settings in model to match validation script
karthikeyad-pnnl Aug 27, 2025
08ecbe8
Updated code formatting of closed loop validation plant
karthikeyad-pnnl Aug 27, 2025
0a51ac1
Fixed errors found in unit tests
karthikeyad-pnnl Aug 27, 2025
e2b4519
Updated interfaces and documentation for secondary pump controller an…
karthikeyad-pnnl Aug 28, 2025
ab30322
Updated enable condition for condensing boiler design setpoint
karthikeyad-pnnl Aug 28, 2025
1211d0e
Removed interface for boiler availability from main controller
karthikeyad-pnnl Sep 3, 2025
63c69bd
Updated documentation on bloick for shutting isolation valves during …
karthikeyad-pnnl Sep 3, 2025
045e873
Added block to calculate weighted average of boiler supply temperature
karthikeyad-pnnl Sep 4, 2025
b4bba78
Updated modules to accommodate changes in interface names for weighte…
karthikeyad-pnnl Sep 4, 2025
81e9754
Updated remote and local differential pressure setpoint parameters
karthikeyad-pnnl Sep 4, 2025
b884e1b
Updated default values to use correct conversion of Fahrenheit
karthikeyad-pnnl Sep 4, 2025
e9def85
Fixed formatting and graphical layer
karthikeyad-pnnl Sep 9, 2025
55e88ea
Propagated changes to boiler design flowrate parameter to all classes…
karthikeyad-pnnl Sep 9, 2025
efacf23
Updated parameter definitions for secondary loop flow sensor
karthikeyad-pnnl Sep 9, 2025
035af8d
Refactored types classes
karthikeyad-pnnl Sep 16, 2025
fb49716
Refactored all type assignments
karthikeyad-pnnl Sep 16, 2025
a69259d
Moved parameter from protected section. Updated parameter assignment …
karthikeyad-pnnl Sep 16, 2025
e173ce3
Updated enable condition calculation for secondary flow sensor input
karthikeyad-pnnl Sep 17, 2025
abfb240
Fixed incorrect definitions for secondary pump speed control type
karthikeyad-pnnl Sep 17, 2025
248b1d0
Fixed unit test errors
karthikeyad-pnnl Sep 17, 2025
ca0bbea
Updated validation script to remove redundant plots
karthikeyad-pnnl Sep 17, 2025
8e2118a
Updated unit test results
karthikeyad-pnnl Sep 17, 2025
4cfcca4
Fixed validation script for Example model
karthikeyad-pnnl Sep 17, 2025
6f292d5
Updated unit test results
karthikeyad-pnnl Sep 17, 2025
6b09b3e
Updated calculations for plant and reset requests from secondary loop…
karthikeyad-pnnl Sep 18, 2025
39129dc
Merge branch 'issue2180_BoilerPlant_Nov23' of github.com:karthikeyad-…
karthikeyad-pnnl Sep 18, 2025
5dc6a46
Updated validation script and reference results
karthikeyad-pnnl Sep 18, 2025
ac694fe
Merge remote-tracking branch 'upstream/master' into issue2180_BoilerP…
karthikeyad-pnnl Sep 18, 2025
d114350
merged master
JayHuLBL Sep 18, 2025
77acc45
fixed html error and the deleted not needed texts
JayHuLBL Sep 18, 2025
1e77862
fixed wrong experimental setup
JayHuLBL Sep 18, 2025
9f9d666
updating reference and the openmodelica scripts [ci skip]
JayHuLBL Sep 18, 2025
7e67940
Updated system sizing parameters to resolve short cycling. Changed th…
karthikeyad-pnnl Sep 19, 2025
d57db7f
Updated module for primary pump speed control using flowrate
karthikeyad-pnnl Sep 28, 2025
f8dbe8b
Upadted reference results
karthikeyad-pnnl Sep 28, 2025
01f76fc
Changed logic for secondary pump speed control to use min speed when …
karthikeyad-pnnl Oct 1, 2025
8d9f259
Updated baseclasses for closed loop example
karthikeyad-pnnl Oct 1, 2025
3838178
Updated closed-loop example model
karthikeyad-pnnl Oct 1, 2025
2df5901
Updated reference results
karthikeyad-pnnl Oct 1, 2025
657f63e
Changed start time for validation script
karthikeyad-pnnl Oct 12, 2025
1a27d6a
Updated sizing parameters, defaults and documentation
karthikeyad-pnnl Oct 12, 2025
3f2bd45
Updated reference results
karthikeyad-pnnl Oct 12, 2025
e492a78
Updated icon layer. Removed redundant parameter assignments. Updated …
karthikeyad-pnnl Oct 14, 2025
564839c
Updated control module blocks to resolve comments about enable parame…
karthikeyad-pnnl Oct 15, 2025
7a5c561
Fixed issues with unit tests
karthikeyad-pnnl Oct 15, 2025
f4223dc
Updated reference results
karthikeyad-pnnl Oct 15, 2025
91c578b
Updated documentation to include information about validation plots.
karthikeyad-pnnl Oct 15, 2025
054a652
Updated documentation
karthikeyad-pnnl Oct 15, 2025
5168f07
Updated load components in secondary loop baseclass
karthikeyad-pnnl Dec 4, 2025
c29e045
Removed final keyword from changeable parameters. Fixed incorrect con…
karthikeyad-pnnl Dec 4, 2025
accc432
Updated reference results for unit tests
karthikeyad-pnnl Dec 4, 2025
bc0235c
Merge remote-tracking branch 'upstream/issue2180_BoilerPlant_MainCont…
karthikeyad-pnnl Dec 4, 2025
6c4a8cb
Updated documentation to reflect updated load model
karthikeyad-pnnl Dec 4, 2025
a136b32
Changed inconsistent time value in validation plot
karthikeyad-pnnl Dec 4, 2025
a96a94b
Updated unit test reference result
karthikeyad-pnnl Dec 4, 2025
b9d1996
Merge branch 'issue2180_BoilerPlant_Nov23' of github.com:karthikeyad-…
karthikeyad-pnnl Dec 4, 2025
d350d8e
Renamed closed-loop validation model
karthikeyad-pnnl Dec 8, 2025
8004d52
Updated plot positions in validation script
karthikeyad-pnnl Dec 8, 2025
5d4f21a
Merge pull request #4319 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Jan 30, 2026
c36750e
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Jan 30, 2026
48792f9
Update load model, use heating load from data file
AntoineGautier Jan 30, 2026
d7d2dbe
Update results
AntoineGautier Jan 30, 2026
c4ce81c
Updated HTML formatting in documentation
karthikeyad-pnnl Feb 2, 2026
02236e6
Uncommented protect statement
karthikeyad-pnnl Feb 3, 2026
9f4199d
Merge remote-tracking branch 'upstream/issue2180_BoilerPlant_MainCont…
karthikeyad-pnnl Feb 3, 2026
e798544
Updated documentation formatting. Added missing revision tracker to d…
karthikeyad-pnnl Feb 3, 2026
8063f2e
Merge pull request #4473 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Feb 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -171,18 +171,15 @@ partial model PartialDataCenter
annotation (Placement(transformation(extent={{10,-10},{-10,10}},
rotation=90,
origin={-50,-150})));
Buildings.Examples.ChillerPlant.BaseClasses.SimplifiedRoom roo(
Buildings.Examples.ChillerPlants.DataCenter.BaseClasses.SimplifiedRoom roo(
redeclare replaceable package Medium = MediumA,
rooLen=50,
rooWid=30,
rooHei=3,
m_flow_nominal=mAir_flow_nominal,
QRoo_flow=500000,
nPorts=2)
"Room model"
annotation (Placement(transformation(
extent={{10,-10},{-10,10}},
origin={4,-180})));
nPorts=2) "Room model" annotation (Placement(transformation(extent={{10,-10},
{-10,10}}, origin={4,-180})));
Buildings.Fluid.Actuators.Valves.TwoWayLinear val[numChi](
redeclare each package Medium = MediumW,
each m_flow_nominal=m1_flow_chi_nominal,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ model DXCooledAirsideEconomizer
parameter Real minSpeFan = 0.2
"Minimum fan speed ratio required by variable speed fans";

Buildings.Examples.ChillerPlant.BaseClasses.SimplifiedRoom roo(
Buildings.Examples.ChillerPlants.DataCenter.BaseClasses.SimplifiedRoom roo(
redeclare package Medium = Medium,
rooLen=50,
rooHei=3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1264,8 +1264,7 @@ equation
annotation (Dialog(enable=have_frePro),
defaultComponentName="conVAV",
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-200,-400},{200,400}}),
graphics={
Rectangle(
graphics={Rectangle(
extent={{-200,-400},{200,400}},
Comment on lines 1265 to 1267
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this file modified?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted to original master branch commit in latest PR

lineColor={0,0,127},
fillColor={255,255,255},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
within Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve;
block BypassValvePosition
"Sequence for controlling minimum flow bypass valve position"

parameter Integer nPum = 2
"Number of pumps";

parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType= Buildings.Controls.OBC.CDL.Types.SimpleController.PI
"Type of controller";

parameter Real k(
final min=0,
final unit="1",
displayUnit="1") = 1
"Gain of controller";

parameter Real Ti(
final min=0,
final unit="s",
displayUnit="s",
final quantity="time") = 0.5
"Time constant of integrator block";

parameter Real Td(
final min=0,
final unit="s",
displayUnit="s",
final quantity="time") = 0.1
"Time constant of derivative block";

Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uPumSta[nPum]
"Input signals indicating pump statuses"
annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
iconTransformation(extent={{-140,-40},{-100,0}})));

Buildings.Controls.OBC.CDL.Interfaces.RealInput VHotWat_flow(
final unit="m3/s",
displayUnit="m3/s",
final quantity="VolumeFlowRate")
"Measured hot-water flow-rate through primary circuit"
annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
iconTransformation(extent={{-140,0},{-100,40}})));

Buildings.Controls.OBC.CDL.Interfaces.RealInput VHotWatMinSet_flow(
final unit="m3/s",
displayUnit="m3/s",
final quantity="VolumeFlowRate")
"Calculated hot water minimum flow setpoint through boilers"
annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
iconTransformation(extent={{-140,40},{-100,80}})));

Buildings.Controls.OBC.CDL.Interfaces.RealInput uMinBypValPos(
final unit="1",
displayUnit="1",
final min=0)
"Minimum bypass valve position for condensation control in non-condensing boilers"
annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
iconTransformation(extent={{-140,-80},{-100,-40}})));

Buildings.Controls.OBC.CDL.Interfaces.RealOutput yBypValPos(
final unit="1",
displayUnit="1",
final min=0)
"Bypass valve opening position"
annotation (Placement(transformation(extent={{100,-50},{140,-10}}),
iconTransformation(extent={{100,-20},{140,20}})));

protected
Buildings.Controls.OBC.CDL.Reals.Subtract sub2
"Difference between measured flowrate and minimum flow setpoint"
annotation (Placement(transformation(extent={{-70,30},{-50,50}})));

Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(
final nin=nPum)
"Block to detect if any of the pumps are proved ON"
annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));

Buildings.Controls.OBC.CDL.Reals.Divide div
"Normalize measured hot water flowrate"
annotation (Placement(transformation(extent={{-20,30},{0,50}})));

Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(
final k=0)
"Constant Real source"
annotation (Placement(transformation(extent={{-20,60},{0,80}})));

Buildings.Controls.OBC.CDL.Reals.Max max
"Ensure bypass valve position is greater than lower limit for condensation control"
annotation (Placement(transformation(extent={{70,-40},{90,-20}})));

Buildings.Controls.OBC.CDL.Reals.AddParameter addPar(
final p=1e-6)
"Prevent division by zero"
annotation (Placement(transformation(extent={{-70,70},{-50,90}})));

Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPID(
final controllerType=controllerType,
final k=k,
final Ti=Ti,
final Td=Td,
final yMax=1,
final yMin=0,
xi_start=1,
reverseActing=false)
"PID loop to regulate flow through primary loop using bypass valve"
annotation (Placement(transformation(extent={{20,60},{40,80}})));

Buildings.Controls.OBC.CDL.Logical.Edge edg
"Reset PID loop when it is activated"
annotation (Placement(transformation(extent={{-20,-10},{0,10}})));

equation

connect(mulOr.u[1:nPum], uPumSta) annotation (Line(points={{-72,0},{-120,0}},
color={255,0,255}));

connect(uMinBypValPos, max.u2) annotation (Line(points={{-120,-60},{50,-60},{50,
-36},{68,-36}}, color={0,0,127}));
connect(max.y, yBypValPos)
annotation (Line(points={{92,-30},{120,-30}}, color={0,0,127}));
connect(VHotWatMinSet_flow, addPar.u)
annotation (Line(points={{-120,80},{-72,80}}, color={0,0,127}));
connect(addPar.y, div.u2) annotation (Line(points={{-48,80},{-40,80},{-40,34},
{-22,34}}, color={0,0,127}));
connect(con.y, conPID.u_s)
annotation (Line(points={{2,70},{18,70}}, color={0,0,127}));
connect(div.y, conPID.u_m)
annotation (Line(points={{2,40},{30,40},{30,58}}, color={0,0,127}));
connect(mulOr.y, edg.u) annotation (Line(points={{-48,0},{-22,0}},
color={255,0,255}));
connect(edg.y, conPID.trigger)
annotation (Line(points={{2,0},{24,0},{24,58}}, color={255,0,255}));

connect(conPID.y, max.u1) annotation (Line(points={{42,70},{50,70},{50,-24},{68,
-24}}, color={0,0,127}));
connect(sub2.y, div.u1) annotation (Line(points={{-48,40},{-28,40},{-28,46},{-22,
46}}, color={0,0,127}));
connect(VHotWatMinSet_flow,sub2. u1) annotation (Line(points={{-120,80},{-80,80},
{-80,46},{-72,46}}, color={0,0,127}));
connect(VHotWat_flow,sub2. u2) annotation (Line(points={{-120,40},{-80,40},{-80,
34},{-72,34}}, color={0,0,127}));
annotation (defaultComponentName="bypValPos",
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
graphics={Rectangle(
extent={{-100,100},{100,-100}},
lineColor={28,108,200},
fillColor={255,255,255},
fillPattern=FillPattern.Solid),
Text(
extent={{-70,20},{70,-20}},
textColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.None,
textString="bypValPos"),
Text(
extent={{-100,146},{100,108}},
textColor={0,0,255},
textString="%name")}),
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
Documentation(info="<html>
<p>
Control sequence for bypass circuit valve position <code>yBypValPos</code>
for boiler plant loop.
</p>
<ul>
<li>
The bypass valve is enabled when any of the hot-water supply pumps are proven on
<code>uPumSta = true</code>, and disabled otherwise.
</li>
<li>
When enabled, a PID control loop modulates the bypass valve to maintain
a primary circuit flow rate of <code>VHotWatMinSet_flow</code>, calculated in class
<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.SetPoints.MinimumFlowSetpoint\">
Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.SetPoints.MinimumFlowSetpoint</a>.
</li>
<li>
When all the pumps are not proved on <code>uPumSta = false</code>, the valve
is fully opened.
</li>
<li>
When a non-condensing boiler is enabled, the bypass valve position is set to the
higher value between the signal generated by the PID loop, and the minimum valve
position for condensation control <code>uMinBypValPos</code>.
</li>
</ul>
</html>", revisions="<html>
<ul>
<li>
August 17, 2020, by Karthik Devaprasad:<br/>
First implementation.
</li>
</ul>
</html>"));
end BypassValvePosition;
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
within Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve.Validation;
block BypassValvePosition

Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve.BypassValvePosition
bypValPos(
final nPum=2,
final k=1,
final Ti=10,
final Td=10e-6)
"Test instance for bypass valve controller"
annotation (Placement(transformation(extent={{10,-10},{30,10}})));

protected
Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(
final k=1.2)
"Minimum flow setpoint"
annotation (Placement(transformation(extent={{-40,50},{-20,70}})));

Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin(
final amplitude=0.5,
final freqHz=1/75,
final phase=0,
final offset=1.2,
final startTime=1)
"Sine input"
annotation (Placement(transformation(extent={{-80,10},{-60,30}})));

Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
final width=0.5,
final period=300)
"Boolean pulse generator"
annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));

Buildings.Controls.OBC.CDL.Reals.Sources.Constant con1(
final k=0.2)
"Minimum valve position for condensation control"
annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));

Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booRep(
final nout=2)
"Boolean replicator"
annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));

Buildings.Controls.OBC.CDL.Reals.Sources.Constant con2(
final k=0)
"Constant zero signal"
annotation (Placement(transformation(extent={{-80,50},{-60,70}})));

Buildings.Controls.OBC.CDL.Reals.Switch swi
"Pass zero flowrate when pumps are switched off"
annotation (Placement(transformation(extent={{-40,10},{-20,30}})));

equation
connect(con.y, bypValPos.VHotWatMinSet_flow) annotation (Line(points={{-18,60},
{0,60},{0,6},{8,6}}, color={0,0,127}));
connect(con1.y, bypValPos.uMinBypValPos) annotation (Line(points={{-18,-60},{0,
-60},{0,-6},{8,-6}}, color={0,0,127}));
connect(booPul.y, booRep.u)
annotation (Line(points={{-58,-20},{-42,-20}}, color={255,0,255}));
connect(booRep.y, bypValPos.uPumSta) annotation (Line(points={{-18,-20},{-10,-20},
{-10,-2},{8,-2}}, color={255,0,255}));

connect(swi.y, bypValPos.VHotWat_flow) annotation (Line(points={{-18,20},{-10,
20},{-10,2},{8,2}}, color={0,0,127}));
connect(sin.y, swi.u1) annotation (Line(points={{-58,20},{-50,20},{-50,28},{-42,
28}}, color={0,0,127}));
connect(con2.y, swi.u3) annotation (Line(points={{-58,60},{-54,60},{-54,12},{-42,
12}}, color={0,0,127}));
connect(booPul.y, swi.u2) annotation (Line(points={{-58,-20},{-46,-20},{-46,20},
{-42,20}}, color={255,0,255}));
annotation (
Documentation(info="<html>
<p>
This example validates
<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve.BypassValvePosition\">
Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve.BypassValvePosition</a>.
</p>
</html>", revisions="<html>
<ul>
<li>
August 17, 2020, by Karthik Devaprasad:<br/>
First implementation.
</li>
</ul>
</html>"),
Icon(coordinateSystem(preserveAspectRatio=false), graphics={
Ellipse(lineColor = {75,138,73},
fillColor={255,255,255},
fillPattern = FillPattern.Solid,
extent={{-100,-100},{100,100}}),
Polygon(lineColor = {0,0,255},
fillColor = {75,138,73},
pattern = LinePattern.None,
fillPattern = FillPattern.Solid,
points={{-36,60},{64,0},{-36,-60},{-36,60}})}), Diagram(
coordinateSystem(preserveAspectRatio=false)),
__Dymola_Commands(file=
"./Resources/Scripts/Dymola/Controls/OBC/ASHRAE/G36/Plants/Boilers/BypassValve/Validation/BypassValvePosition.mos"
"Simulate and plot"),
experiment(
StartTime=0,
StopTime=300,
Interval=1,
Tolerance=1e-06));
end BypassValvePosition;
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
within Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve;
package Validation "Validation models for BypassValve sequences"




annotation (Icon(graphics={
Rectangle(
lineColor={200,200,200},
fillColor={248,248,248},
fillPattern=FillPattern.HorizontalCylinder,
extent={{-100,-100},{100,100}},
radius=25.0),
Rectangle(
lineColor={128,128,128},
extent={{-100,-100},{100,100}},
radius=25.0),
Polygon(
origin={8,14},
lineColor={78,138,73},
fillColor={78,138,73},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}})}),
Documentation(info="<html>
<p>
This package contains validation models for the classes in
<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve\">
Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve</a>.
</p>
</html>"));
end Validation;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BypassValvePosition
Loading
Loading