Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Templates • CHW plant #3167

Draft
wants to merge 1,628 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
1628 commits
Select commit Hold shift + click to select a range
c28f578
changed exhaust damper to relief damper
JayHuLBL Apr 22, 2022
05d1524
renamed connecter
JayHuLBL Apr 25, 2022
5828039
added barometric relief option
JayHuLBL Apr 27, 2022
ee0b626
Merge branch 'master' into issue1913_g36_final
JayHuLBL Apr 27, 2022
99d0c04
unified the parameter namings, updated comments
JayHuLBL Apr 28, 2022
852f150
propageted min and max return fan speed
JayHuLBL Apr 29, 2022
a117ac8
added default value to hysteresis parameters
JayHuLBL May 5, 2022
9577bf4
added flow setpoint override to damper (valve) control subsequence
JayHuLBL May 6, 2022
91236cc
avoid re-define of the nominal flow
JayHuLBL May 6, 2022
1ef9277
revised comments
JayHuLBL May 6, 2022
510d17f
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier May 9, 2022
2e1d919
Fix typo
AntoineGautier May 9, 2022
7fea0e5
run unit tests
JayHuLBL May 10, 2022
51e6b6c
Merge branch 'master' into issue1913_g36_final
JayHuLBL May 10, 2022
b6c95ea
updating the closed loop model
JayHuLBL May 11, 2022
37be0bc
Merge branch 'master' into issue1913_g36_final
JayHuLBL May 26, 2022
96ff588
unified parameter namings
JayHuLBL May 31, 2022
51edf75
corrected link
JayHuLBL May 31, 2022
ba6ce75
added connector attributes
JayHuLBL May 31, 2022
a11719a
exported terminal box actual valve position
JayHuLBL May 31, 2022
34fc7bc
output ventilation setpoints
JayHuLBL May 31, 2022
abdb0f3
updating parating for the closed loop model
JayHuLBL May 31, 2022
7ba8ba7
merged master
JayHuLBL May 31, 2022
159c54c
reverted changes
JayHuLBL Jun 1, 2022
6b067c0
corrected typos
JayHuLBL Jun 1, 2022
54b16b8
updated parameter comments
JayHuLBL Jun 1, 2022
52c1acd
added closed-loop model
JayHuLBL Jun 1, 2022
48cdf2f
removed redundant connection
JayHuLBL Jun 1, 2022
0ea28c0
added connector conditions
JayHuLBL Jun 1, 2022
2c863b3
setted up the closed-loop model
JayHuLBL Jun 1, 2022
93924c5
Merge branch 'master' into issue1913_g36_final
JayHuLBL Jun 1, 2022
97205f3
added connector condition
JayHuLBL Jun 1, 2022
027fc88
improved zero flow check
JayHuLBL Jun 2, 2022
8b91502
updating figures in documentation
JayHuLBL Jun 6, 2022
2cbda99
updated all figures
JayHuLBL Jun 6, 2022
d34bf48
avoid divide zero
JayHuLBL Jun 16, 2022
f857d68
added missing hys
JayHuLBL Jun 16, 2022
5817629
removed moving mean
JayHuLBL Jun 16, 2022
4a574d0
improved default PID factors
JayHuLBL Jun 16, 2022
7eb9324
added input samplers
JayHuLBL Jun 16, 2022
9436a2f
moved old G36 example to obsolete
JayHuLBL Jun 16, 2022
6d2d5ff
unified control loop hys, added samplers
JayHuLBL Jun 16, 2022
e9ccb07
added true hold to avoid frequent switch
JayHuLBL Jun 17, 2022
77ffb10
corrected invalid text
JayHuLBL Jun 21, 2022
673adce
Merge branch 'master' into issue1913_g36_final
JayHuLBL Jun 22, 2022
a354365
moving G36_PR1 to obsolete package
JayHuLBL Jun 23, 2022
abd0eac
correcting scripts
JayHuLBL Jun 23, 2022
8ec4915
renamed scripts and reference results
JayHuLBL Jun 23, 2022
19e85c4
corrected script paths
JayHuLBL Jun 23, 2022
a1b3eec
removing or updating the usage of the G36_PR1 sequences
JayHuLBL Jun 23, 2022
dd4426d
updating the usage of G36_PR1 sequences
JayHuLBL Jun 23, 2022
0727b52
refactored package orer
JayHuLBL Jun 23, 2022
3d6f570
replaced single zone AHU control sequences
JayHuLBL Jun 24, 2022
8c5cc97
updated reference with Dymola 2022x
JayHuLBL Jun 24, 2022
11596f5
rerun unit test for the VAVReheat models
JayHuLBL Jun 24, 2022
e795f1b
removed G36_PR1 pacakage
JayHuLBL Jun 24, 2022
fafb6fd
removed G36_PR1 pacakage
JayHuLBL Jun 24, 2022
ec2b94f
moved imges and corrected G36_PR1 related links
JayHuLBL Jun 24, 2022
4d03688
changed stop time of the plotter example model
JayHuLBL Jul 5, 2022
e8bed6c
updated reference result
JayHuLBL Jul 5, 2022
b9d0d9d
added conversion script, updated release note
JayHuLBL Jul 5, 2022
100fa05
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jul 6, 2022
b212939
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Jul 8, 2022
51da9c8
Merge branch 'issue1913_g36_final' of github.com:lbl-srg/modelica-bui…
AntoineGautier Jul 8, 2022
50279f8
created closed loop chiller plant sequence test
JayHuLBL Jul 8, 2022
96ffbaf
reordered package
JayHuLBL Jul 8, 2022
666b90b
corrected text format
JayHuLBL Jul 8, 2022
98a6141
added economizer devices control
JayHuLBL Jul 15, 2022
826bc84
reordered package
JayHuLBL Jul 15, 2022
7f9e598
run unit text
JayHuLBL Jul 15, 2022
01027a5
corrected html syntax
JayHuLBL Jul 15, 2022
e0997cc
updated economizer controller
JayHuLBL Jul 15, 2022
aa1c94f
unit test
JayHuLBL Jul 15, 2022
1e14345
updated change intial state
JayHuLBL Jul 18, 2022
ffbf1aa
Merge branch 'master' into issue1913_g36_final
JayHuLBL Jul 20, 2022
d982052
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jul 20, 2022
a6bade5
created plant enable package
JayHuLBL Jul 20, 2022
5b32aa6
added devices control when plant enables
JayHuLBL Jul 20, 2022
5e11b8f
added devices control when enabling and disabling plants
JayHuLBL Jul 22, 2022
3e294b1
Start refactoring control sections
AntoineGautier Jul 8, 2022
0174c90
Fix package structure and parameter assignment
AntoineGautier Aug 2, 2022
9fa011c
Add VAV box cooling only controller
AntoineGautier Aug 2, 2022
80ab160
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Aug 2, 2022
e87bcc7
Add script
AntoineGautier Aug 2, 2022
5e017c9
Remove Dialog annotations
AntoineGautier Aug 3, 2022
76528a1
fixed error in tower staging process
JayHuLBL Aug 3, 2022
cf17ab9
Add __Linkage(enable=false) annotation
AntoineGautier Aug 3, 2022
8ecbc04
Doc and formatting
AntoineGautier Aug 4, 2022
26b0f94
merged master
JayHuLBL Aug 9, 2022
8ba70c7
Merge branch 'master' into issue1913_g36_final
JayHuLBL Aug 16, 2022
d199bd9
changed freeze stat enumerations
JayHuLBL Aug 22, 2022
1eff463
merged master
JayHuLBL Aug 23, 2022
3cbe566
separated ahu mode calculation
JayHuLBL Aug 24, 2022
0a22596
addressing comments
JayHuLBL Aug 24, 2022
7465777
addressing multizone AHU controller comments
JayHuLBL Aug 25, 2022
c2fc556
Fix missing vendor annotation
AntoineGautier Aug 30, 2022
7be670f
improved parameter namings
JayHuLBL Aug 31, 2022
2d7e632
removed zero default value
JayHuLBL Aug 31, 2022
1803445
Remove function calls
AntoineGautier Sep 1, 2022
aa25805
removed the damper and valve actual position connectors
JayHuLBL Sep 1, 2022
c153168
updated comments, changed boolean connector name
JayHuLBL Sep 1, 2022
2bff124
changed file name
JayHuLBL Sep 1, 2022
3b292f8
fixed broken links
JayHuLBL Sep 1, 2022
17c6add
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Sep 1, 2022
7f8ee62
fixed typos
JayHuLBL Sep 2, 2022
254a9f5
removed colon mark
JayHuLBL Sep 2, 2022
e2b9252
Convert package file into directory
AntoineGautier Sep 5, 2022
71aeb94
Convert to full class names
AntoineGautier Sep 5, 2022
af27be1
Merge branch 'issue1913_g36_final' of github.com:lbl-srg/modelica-bui…
AntoineGautier Sep 5, 2022
6b0842e
Refactor for 254a9f5353
AntoineGautier Sep 5, 2022
2c5c343
Merge branch 'issue1374_templates' of github.com:lbl-srg/modelica-bui…
AntoineGautier Sep 6, 2022
a3e2ee0
Merge branch 'issue2293_chiller_plant_seq' of github.com:lbl-srg/mode…
AntoineGautier Sep 6, 2022
c7b0909
Restructure and rename
AntoineGautier Sep 6, 2022
ba7cba2
Merge branch 'master' into issue1913_g36_final
JayHuLBL Sep 6, 2022
b9e34aa
addressed comments
JayHuLBL Sep 6, 2022
107647b
Merge branch 'issue1913_g36_final' of github.com:lbl-srg/modelica-bui…
AntoineGautier Sep 7, 2022
55f06cc
Change default controller, refactor for b9e34aa06a
AntoineGautier Sep 7, 2022
c35f54b
Change default controller for VAV box
AntoineGautier Sep 7, 2022
e6adcc2
Merge branch 'issue1374_templates' of github.com:lbl-srg/modelica-bui…
AntoineGautier Sep 7, 2022
f29637a
Refactor with hydronic routing components
AntoineGautier Sep 7, 2022
de6cf98
corrected the p/dp namings #1913
JayHuLBL Sep 7, 2022
7d3cfe7
Relocate PassThroughFluid, continue refactoring
AntoineGautier Sep 8, 2022
237f466
Refactor WSE and pump models
AntoineGautier Sep 8, 2022
db64381
Merge branch 'issue1913_g36_final' of github.com:lbl-srg/modelica-bui…
AntoineGautier Sep 9, 2022
b28971e
Refactor for de6cf98, relocate PassThroughFluid
AntoineGautier Sep 9, 2022
89780e3
Merge branch 'issue1374_templates' into issue1374_template_CHW_final
AntoineGautier Sep 9, 2022
4259625
Refactor pumps
AntoineGautier Sep 9, 2022
a83c190
Add states to hydronic routing components
AntoineGautier Sep 12, 2022
7486c52
Update valve components
AntoineGautier Sep 13, 2022
850568e
Refactor WSE
AntoineGautier Sep 13, 2022
b2370b4
Fix choice annotation
AntoineGautier Sep 13, 2022
1e11f5a
improved handling of dividing by zero
JayHuLBL Sep 13, 2022
4cb7487
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Sep 14, 2022
273e8db
Merge branch 'issue1913_g36_final' of github.com:lbl-srg/modelica-bui…
AntoineGautier Sep 14, 2022
bc93003
Assign valve dynamics in validation model
AntoineGautier Sep 14, 2022
ea1a8bf
Merge branch 'issue1374_templates' into issue1374_template_CHW_final
AntoineGautier Sep 14, 2022
8312124
Update WSE
AntoineGautier Sep 14, 2022
3f2bab2
Refactor chillers
AntoineGautier Sep 14, 2022
81112cd
Move Interfaces under Components
AntoineGautier Sep 14, 2022
2e425ba
Merge branch 'issue1374_templates' into issue1374_template_CHW_final
AntoineGautier Sep 14, 2022
9d082a8
Resolve merge conflicts
AntoineGautier Sep 14, 2022
6b5f735
Merge changes from issue1374_template_CHW_final
AntoineGautier Sep 14, 2022
a0c41b6
Refactor chillers
AntoineGautier Sep 15, 2022
f060740
Change ConWat into ConFlu to support air-cooled
AntoineGautier Sep 16, 2022
dac3f06
avoided using minimum outdoor air damper status input for return fan …
JayHuLBL Sep 16, 2022
bbefc72
renamed relief fans to fans group
JayHuLBL Sep 16, 2022
0bacc6c
Add debug model for chiller group
AntoineGautier Sep 19, 2022
403b791
Refactor valve selection in chiller group
AntoineGautier Sep 20, 2022
c67e939
created single relief fan control
JayHuLBL Sep 20, 2022
a2b1538
Refactor cooling tower
AntoineGautier Sep 20, 2022
2d8747b
Refactor plant model
AntoineGautier Sep 22, 2022
6a35dc6
Merge branch 'issue1374_templates' of github.com:lbl-srg/modelica-bui…
AntoineGautier Sep 22, 2022
a2288a6
Checkout pump components from
AntoineGautier Sep 22, 2022
01723fd
Remove __Dymola_translate annotation
AntoineGautier Sep 22, 2022
7aa0b73
Merge branch 'issue1374_templates' into issue1374_template_CHW_final
AntoineGautier Sep 22, 2022
2662242
composed relief fan control to multizone AHU controller
JayHuLBL Sep 22, 2022
bb1c5d0
Refactor plant model
AntoineGautier Sep 22, 2022
cffd305
Add local array bus instance
AntoineGautier Sep 27, 2022
7c8ea58
Remove local array instances
AntoineGautier Sep 27, 2022
5b1b67b
Add test model for issue with constant Boolean
AntoineGautier Sep 27, 2022
8615481
Remove constant Booleans from OpenLoop
AntoineGautier Sep 27, 2022
60afe30
Propagation of per is removed temporarily
AntoineGautier Sep 27, 2022
24ea334
composed the relief fan control to single zone AHU controller
JayHuLBL Sep 27, 2022
72e4539
merged master
JayHuLBL Sep 27, 2022
859cc62
added default values, added reference results of the relief fan control
JayHuLBL Sep 27, 2022
7ccf988
removed BOM
JayHuLBL Sep 27, 2022
65fd011
deleted obsolete OpenModelica script
JayHuLBL Sep 27, 2022
3517f4a
added missing comments
JayHuLBL Sep 28, 2022
2f4b3af
removed self connection
JayHuLBL Sep 28, 2022
02cf18d
changed the time constant value of temperature sensors
JayHuLBL Sep 28, 2022
f879298
corrected variables in mos scripts
JayHuLBL Sep 29, 2022
8cc5dc7
Add validation models
AntoineGautier Sep 29, 2022
f1ab9fd
updated reference results
JayHuLBL Sep 29, 2022
bda11e9
added missing comment
JayHuLBL Sep 29, 2022
b427e2d
added missing fill() function
JayHuLBL Sep 29, 2022
203f013
updated reference results in plotter examples package
JayHuLBL Sep 29, 2022
d550924
corrected obsolete models, updated reference results
JayHuLBL Sep 29, 2022
a4e061b
updated reference results
JayHuLBL Sep 29, 2022
40dc116
Evaluate have_pumChiWatSec inside record
AntoineGautier Sep 30, 2022
73fec9d
Fix validation model with air cooled chillers
AntoineGautier Sep 30, 2022
5647448
Merge branch 'master' into issue1913_g36_final
mwetter Sep 30, 2022
e5fa731
Added failing new models in Obsolete package to exclusion list
mwetter Sep 30, 2022
94b7d69
Removed non-existent models from configuration file
mwetter Sep 30, 2022
34e11be
Corrected reference of G36
mwetter Sep 30, 2022
6afdfd8
Corrected access to non-existent type
mwetter Sep 30, 2022
b030bce
Corrected access to non-existent type
mwetter Sep 30, 2022
0497e9e
Reintroduce per propagation
AntoineGautier Oct 3, 2022
d713038
Add validation models
AntoineGautier Oct 3, 2022
965b9c5
Add WSE to template
AntoineGautier Oct 3, 2022
49944ba
Refactor ChillersToPrimaryPumps with nChi+1 ports
AntoineGautier Oct 3, 2022
5733d0d
Fix various WSE configurations
AntoineGautier Oct 3, 2022
1984a75
corrected hyperlinks
JayHuLBL Oct 3, 2022
7519ef7
reverted the change of temperature sensor time constants
JayHuLBL Oct 3, 2022
09cefa9
Add configuration constraints and assert
AntoineGautier Oct 4, 2022
35217ee
merged master
JayHuLBL Oct 4, 2022
fda6ead
corrected loop issue
JayHuLBL Oct 5, 2022
0d3680d
updated reference results
JayHuLBL Oct 5, 2022
8818ac5
removed BOM
JayHuLBL Oct 5, 2022
d56529b
updated reference results
JayHuLBL Oct 5, 2022
65156f1
updated reference results of VAV reheat example models in Obsolete pa…
JayHuLBL Oct 5, 2022
d72aca5
merged issue1913
JayHuLBL Oct 5, 2022
c9e1e98
Minor
AntoineGautier Oct 6, 2022
22522a9
Merge branch 'issue2293_chiller_plant_seq' of github.com:lbl-srg/mode…
AntoineGautier Oct 6, 2022
bc8978d
Integrate G36 controller
AntoineGautier Oct 6, 2022
7a4c784
merged master
JayHuLBL Oct 6, 2022
3f8c79f
corrected text
JayHuLBL Oct 6, 2022
afeebe8
Merge branch 'issue2293_chiller_plant_seq' of github.com:lbl-srg/mode…
AntoineGautier Oct 7, 2022
8587c7a
Refactor for G36 controller integration
AntoineGautier Oct 7, 2022
7364b3d
Graphics
AntoineGautier Oct 18, 2022
fe2ae29
Debug controller
AntoineGautier Oct 18, 2022
4a58b9d
Debug controller, final assignments for air-cooled
AntoineGautier Oct 19, 2022
0590545
Fix BaseWaterCooledG36 for OCT
AntoineGautier Oct 26, 2022
7922d1b
Reintroduce per propagation from ChillerGroup
AntoineGautier Oct 26, 2022
2e9020e
Clean validation models
AntoineGautier Nov 7, 2022
af72b7f
Update OpenLoop controller
AntoineGautier Nov 8, 2022
16c0c9e
Doc and clean
AntoineGautier Nov 9, 2022
7d31fee
Rename and doc
AntoineGautier Nov 16, 2022
ab18a0d
Check out AllSystems from issue1374_templates
AntoineGautier Nov 16, 2022
ea5e025
Update doc, add scripts
AntoineGautier Nov 16, 2022
6b78219
Update doc, add scripts
AntoineGautier Nov 16, 2022
f93cc21
Add validation script
AntoineGautier Nov 21, 2022
63fd529
Update script and makefile
AntoineGautier Nov 22, 2022
b7f398a
Merge branch 'issue1374_template_CHW_final' of https://github.com/lbl…
AntoineGautier Dec 16, 2022
e2b223f
Checkout patched components from issue1374_templates
AntoineGautier Feb 28, 2023
1fc350b
Merge branch 'issue1374_template_CHW_final' of https://github.com/lbl…
AntoineGautier Mar 10, 2023
0321a9a
Minor
AntoineGautier Mar 21, 2023
00734f2
Check out updates from issue3266_template_HW_plant
AntoineGautier Apr 21, 2023
f7d3961
Update graphical parameters
AntoineGautier Apr 21, 2023
c5aa9bb
Graphics
AntoineGautier Apr 21, 2023
3c2ff74
Refactor for new def in EnergyStandard
AntoineGautier Aug 24, 2023
829ac75
Fix incorrect bindings revealed by Dymola 2023x R1
AntoineGautier Aug 24, 2023
fe41228
Update plant schematic
AntoineGautier Aug 24, 2023
80fdd15
Checkout components from issue3266_template_HW_plant
AntoineGautier Aug 24, 2023
20dc37a
Graphics
AntoineGautier Aug 25, 2023
42d8746
Graphics
AntoineGautier Aug 28, 2023
7191eb1
Check out component interfaces from issue3266_template_HW_plant
AntoineGautier Aug 28, 2023
ca4697a
Graphics
AntoineGautier Aug 28, 2023
ac2fe63
Remove conditions for CW supply and return T sensor
AntoineGautier Aug 28, 2023
ee2f577
Graphics
AntoineGautier Aug 28, 2023
73e2d2a
Connect eco to mixing port of inlConChi
AntoineGautier Aug 29, 2023
737165e
Graphics
AntoineGautier Aug 29, 2023
0ffb9f1
Refactor with all chiller points within bus.chi
AntoineGautier Sep 1, 2023
200f891
Add missing point TConWatEcoRet
AntoineGautier Sep 1, 2023
ec8c18e
Pull test scripts from issue3266_template_HW_plant
AntoineGautier Sep 8, 2023
4687b55
Update scripts
AntoineGautier Sep 11, 2023
4b6c2a2
Filter configurations in test script
AntoineGautier Sep 14, 2023
8180377
Check out interfaces from master, use port_*_x|y
AntoineGautier Sep 17, 2023
94f1695
Graphics [ci skip]
AntoineGautier Sep 17, 2023
5ad3841
Doc
AntoineGautier Sep 25, 2023
a4a91f1
Move isolation valves into chiller group, graphics
AntoineGautier Sep 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into issue2293_chiller_plant_seq
  • Loading branch information
JayHuLBL committed Jul 20, 2022
commit d9820521f2e3c58137a3b986240bd2c336c6ec7d

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.