Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
529 commits
Select commit Hold shift + click to select a range
48e38f6
removed redundant zeros [ci skip]
JayHuLBL Sep 22, 2022
7effeca
removed BOM
JayHuLBL Sep 22, 2022
ecfb839
refactored package order [ci skip]
JayHuLBL Sep 22, 2022
e500080
Remove unnecessary experiment statement
xinglu-pnnl Nov 14, 2022
61a8b84
Fixed lineColor error in Text annotation
xinglu-pnnl Nov 14, 2022
f1eb6a7
removed the dymola algorithm in the mos script
xinglu-pnnl Nov 15, 2022
74c0b57
Add required documentation for three models
xinglu-pnnl Nov 15, 2022
65e65f6
Switch back some unintentional changes
xinglu-pnnl Nov 15, 2022
1b17944
Remove unnecessary zeros
xinglu-pnnl Nov 15, 2022
3d846f3
Correct the documentation html for these two types
xinglu-pnnl Nov 16, 2022
04b80a3
Merge pull request #53 from lbl-srg/issue2180_BoilerPlant_MainControl…
karthikeyad-pnnl Nov 21, 2022
6163230
Merge pull request #54 from terrancelu92/issue2180_BoilerPlant_MainCo…
karthikeyad-pnnl Nov 21, 2022
89b78df
Updated unit test results
karthikeyad-pnnl Nov 23, 2022
264fe21
Fixed issues in example models
karthikeyad-pnnl Nov 23, 2022
ec0e3bf
Updated boiler plant controller in line with updates made during join…
karthikeyad-pnnl Nov 26, 2022
7544ba7
Upadted boiler plant 3example model in line with updates made during …
karthikeyad-pnnl Nov 26, 2022
a0486e3
Updated connect statements in validation model after updating connect…
karthikeyad-pnnl Nov 26, 2022
f23978e
Removed unused validation script for non-existent model
karthikeyad-pnnl Nov 26, 2022
97562fb
Updated unit test results
karthikeyad-pnnl Nov 26, 2022
d7e52b3
Updated icon layer formatting
karthikeyad-pnnl Nov 26, 2022
110e5cc
Removed redundant zeros
karthikeyad-pnnl Nov 26, 2022
fe2a983
Merge pull request #3168 from karthikeyad-pnnl/issue2180_BoilerPlant_…
JayHuLBL Mar 10, 2023
d072610
merging master
JayHuLBL Mar 10, 2023
ecfdd1c
merged issue2293
JayHuLBL Mar 10, 2023
1a5959f
corrected class path
JayHuLBL Mar 10, 2023
5602c1f
Merge pull request #61 from lbl-srg/issue2180_BoilerPlant_MainControl…
karthikeyad-pnnl Mar 28, 2023
9e4eb4e
Deleted modifiers in extIndSig blocks
junkewang001 Mar 30, 2023
e998513
Changed the input of stage0 from 0 to 1
junkewang001 Mar 30, 2023
eaa16cb
Deleted modifiers of allowOutOfRange and outOfRangeValue in components
junkewang001 Mar 31, 2023
8b8109d
Added new class and modified existing class to fix zero index error o…
karthikeyad-pnnl Apr 4, 2023
b889ffc
Updated class name for zero index correction
karthikeyad-pnnl Apr 4, 2023
a936cfd
Moved zero index correction to the generic package
karthikeyad-pnnl Apr 4, 2023
b91833c
Updated models to resolve errors logged during unit test
karthikeyad-pnnl Apr 4, 2023
3823371
Added tolerance to model file
karthikeyad-pnnl Apr 4, 2023
7a08b9b
Added tolerance to validation model
karthikeyad-pnnl Apr 4, 2023
364347b
Updated unit test results
karthikeyad-pnnl Apr 4, 2023
633760e
Merge branch 'issue2180_BoilerPlant_MainController_oct_2021' into iss…
karthikeyad-pnnl Apr 4, 2023
e100a16
Updated input signals for validation model
karthikeyad-pnnl Apr 7, 2023
9e8071d
Removed excess zeros from validation script
karthikeyad-pnnl Apr 7, 2023
32fc2cf
Changed default component name
karthikeyad-pnnl Apr 7, 2023
52f2f67
Fixed typos in documentation
karthikeyad-pnnl Apr 10, 2023
33c8675
Updated annotation instances of dialog to Dialog
karthikeyad-pnnl Jun 6, 2023
2405421
Changed plant enable schedule from parameter to Boolean input
karthikeyad-pnnl Jun 6, 2023
94b0908
Fixed typos in comments and added missing comments
karthikeyad-pnnl Jun 15, 2023
1910760
Changed Boolean parameter names in line with changes being made at to…
karthikeyad-pnnl Jun 15, 2023
2b39cf0
Added separate modules for primary and secondary loop controllers
karthikeyad-pnnl Nov 2, 2023
7114102
Updated primary controller
karthikeyad-pnnl Nov 16, 2023
f932040
Added additional output for condensation regulation signal to main co…
karthikeyad-pnnl Nov 28, 2023
1603bdb
Added validation model placeholders for primary and secondary loop co…
karthikeyad-pnnl Feb 12, 2024
9e69a1d
Added new control module for enabling lag primary loop in hybrid plant
karthikeyad-pnnl Mar 4, 2024
b514f0d
Added script for primary controller validation
karthikeyad-pnnl Mar 26, 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
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
f266c0c
Added backup of original boiler plant model for closed loop demo
karthikeyad-pnnl Mar 6, 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
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
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
aae46d5
Merge remote-tracking branch 'upstream/master' into issue2180_BoilerP…
karthikeyad-pnnl Jul 29, 2026
b5250e5
Updated reference results with new translation statistics. Other resu…
karthikeyad-pnnl Jul 30, 2026
e68a550
Merge remote-tracking branch 'upstream/issue2293_chiller_plant_seq' i…
karthikeyad-pnnl Jul 30, 2026
7cbceb0
Merge pull request #4688 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Aug 10, 2026
a07caa7
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Aug 10, 2026
23397da
Exposed separate user selection parameter for headered primary pumps
karthikeyad-pnnl Aug 25, 2026
2906748
Fixed translation issues in open-loop and closed-loop validation models
karthikeyad-pnnl Aug 25, 2026
63cccb4
Updated Boolean enable conditions to support primary-only, dedicated …
karthikeyad-pnnl Aug 28, 2026
8714ab9
Updated validation model and script to add new config for primary-onl…
karthikeyad-pnnl Aug 28, 2026
34e4417
Updated reference results with trajectories for new instances
karthikeyad-pnnl Aug 28, 2026
14c77fc
Fixed translation issue in closed-loop validation model
karthikeyad-pnnl Aug 28, 2026
c3c2c57
Merge branch 'issue2180_BoilerPlant_Nov23' of github.com:karthikeyad-…
karthikeyad-pnnl Aug 28, 2026
fc7dcd2
Updated pump status change module to include logic for detecting proc…
karthikeyad-pnnl Aug 30, 2026
b4fb809
Removed redundant logic for pump status change completion detection. …
karthikeyad-pnnl Aug 30, 2026
bc56cc4
Fixed bugs in the staging process control modules
karthikeyad-pnnl Aug 30, 2026
e08dccf
Upadetd validation model and script for pump status change module
karthikeyad-pnnl Aug 30, 2026
be94652
Updated validation script for primary loop controller
karthikeyad-pnnl Aug 30, 2026
5037c0c
Added logic to pump status change module to prevent process initiatio…
karthikeyad-pnnl Aug 30, 2026
12df838
Removed redundant logic. Added non-zero delay to controller output in…
karthikeyad-pnnl Aug 30, 2026
ca24d0e
Fixed issue that was failing pedantic translation
karthikeyad-pnnl Aug 30, 2026
23dd736
Updated reference results for unit tests after latest updates
karthikeyad-pnnl Aug 30, 2026
cc625ce
Updated primary pump variable speed Boolean parameter enable conditions
karthikeyad-pnnl Sep 3, 2026
7c89f55
Updated documentation on primary loop controller
karthikeyad-pnnl Sep 3, 2026
0928b1d
Removed locked out configuration for fixed speed secondary pumps from…
karthikeyad-pnnl Sep 3, 2026
da8bffd
Added pre block to break algebraic loop in secondary pump controller
karthikeyad-pnnl Sep 4, 2026
ec55304
Upadetd interfaces and documentation on zero index correction block
karthikeyad-pnnl Sep 7, 2026
8b5808c
Fixed validation script command and variables
karthikeyad-pnnl Sep 7, 2026
69cccaa
Updated reference results for unit tests
karthikeyad-pnnl Sep 7, 2026
fc6e359
Fixed compilation error in closed-loop validation model
karthikeyad-pnnl Sep 7, 2026
6d4ab5a
Uploading files after running annotation clean-up bash commands
karthikeyad-pnnl Sep 7, 2026
c01c730
Fixed enable condition for variable speed primary pumps parameter. Up…
karthikeyad-pnnl Sep 11, 2026
c94371d
Removed redundant connections from interfaces to themselves
karthikeyad-pnnl Sep 11, 2026
6010404
Merge pull request #4698 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Sep 11, 2026
bbd1641
Fix HTML
AntoineGautier Sep 11, 2026
c7aeb81
Fix tolerance
AntoineGautier Sep 11, 2026
72bd2d5
Updated max tolerance warning raised by unit tests
karthikeyad-pnnl Sep 13, 2026
a2d3560
Deleted OpenModelica comparison scripts with no corresponding validat…
karthikeyad-pnnl Sep 13, 2026
d82fe3a
Merge pull request #4727 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Sep 14, 2026
7762cff
Changed boiler types definition to enumeration
karthikeyad-pnnl Sep 16, 2026
2ae86d0
Restore type definitions for boiler controller package
karthikeyad-pnnl Sep 16, 2026
7d815a9
Added missing description strings and other parameters detected durin…
karthikeyad-pnnl Sep 16, 2026
e2b8358
Updated reference results for unit tests
karthikeyad-pnnl Sep 16, 2026
64b7a3b
Re-enabled protected section
karthikeyad-pnnl Sep 16, 2026
5cab875
Added missing description strings, updated graphical layout, fixed si…
karthikeyad-pnnl Sep 17, 2026
47f5b96
Updated reference results for unit tests
karthikeyad-pnnl Sep 17, 2026
71799cb
Removed if-else conditions from equations. Added second instance of c…
karthikeyad-pnnl Sep 17, 2026
c6f9fb3
Fixed accidentally deleted connections
karthikeyad-pnnl Sep 17, 2026
7d8af1c
Fixed warnings found in OCT unit test
karthikeyad-pnnl Sep 17, 2026
5736244
Added pre blocks to feedback loops to break algebraic loops
karthikeyad-pnnl Sep 17, 2026
f6c7775
Merge pull request #4740 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Sep 17, 2026
8c35334
Removed default configuration parameters
karthikeyad-pnnl Sep 18, 2026
e3aa051
Removed connection from connector to itself
karthikeyad-pnnl Sep 18, 2026
f83ee68
Merge pull request #4741 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Sep 19, 2026
4f2e45f
Model failing in OpenModelica excluded from unit tests
karthikeyad-pnnl Sep 22, 2026
edbf625
Merge pull request #4742 from karthikeyad-pnnl/issue2180_BoilerPlant_…
AntoineGautier Sep 24, 2026
6a9a105
Exclude model from CI tests (Modelon #7916)
AntoineGautier Sep 24, 2026
7c67f14
Fix translation of BoilerPlants.Guideline36 in OCT and OMC
AntoineGautier Sep 28, 2026
1e37de1
Update results
AntoineGautier Sep 28, 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
@@ -0,0 +1,192 @@
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},
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,106 @@
within Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers.BypassValve.Validation;
block BypassValvePosition
"Validation model for bypass valve control module"

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
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
within Buildings.Controls.OBC.ASHRAE.G36.Plants.Boilers;
package BypassValve "Control sequences for minimum flow bypass valve"
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),
Ellipse(
origin={10,10},
fillColor={76,76,76},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
extent={{-80.0,-80.0},{-20.0,-20.0}}),
Ellipse(
origin={10,10},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
extent={{0.0,-80.0},{60.0,-20.0}}),
Ellipse(
origin={10,10},
fillColor={128,128,128},
pattern=LinePattern.None,
fillPattern=FillPattern.Solid,
extent={{0.0,0.0},{60.0,60.0}}),
Ellipse(
origin={10,10},
lineColor={128,128,128},
fillColor={255,255,255},
fillPattern=FillPattern.Solid,
extent={{-80.0,0.0},{-20.0,60.0}})}),
Documentation(info="<html>
<p>
This package contains control sequences for the minimum flow bypass valve.
</p>
</html>"));
end BypassValve;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BypassValvePosition
Validation
Loading
Loading