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.

Sign up for GitHub

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

Jump to bottom

First release of the Templates package (VAV system) #2925

Merged
merged 648 commits into from
Aug 16, 2023
Merged

First release of the Templates package (VAV system) #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
648 commits
Select commit Hold shift + click to select a range
8ebc2c9
updated namings for MZVAV controller
JayHuLBL Apr 18, 2022
11f551e
corrected namings in AHU controllers
JayHuLBL Apr 19, 2022
25e0da1
updated namings in cooling only unit
JayHuLBL Apr 19, 2022
70d8854
corrected namings used in terminal unit controllers
JayHuLBL Apr 20, 2022
ac2f494
added fixed plus differential dry bulb high limit cut option
JayHuLBL Apr 21, 2022
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
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
ffbf1aa
Merge branch 'master' into issue1913_g36_final
JayHuLBL Jul 20, 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
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
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
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
de6cf98
corrected the p/dp namings #1913
JayHuLBL Sep 7, 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
7486c52
Update valve components
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
81112cd
Move Interfaces under Components
AntoineGautier Sep 14, 2022
6b5f735
Merge changes from issue1374_template_CHW_final
AntoineGautier Sep 14, 2022
a2288a6
Checkout pump components from
AntoineGautier Sep 22, 2022
01723fd
Remove __Dymola_translate annotation
AntoineGautier Sep 22, 2022
e5d8c2f
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Oct 31, 2022
49494ac
Clean merge artifacts
AntoineGautier Oct 31, 2022
35df78e
Trim trailing spaces
AntoineGautier Oct 31, 2022
3b2884a
Update for ctrl-flow
AntoineGautier Nov 1, 2022
4d57922
Add AllSystems class with top-level parameters
AntoineGautier Nov 3, 2022
97041e1
Refactor w/ updated OA and eco configurations
AntoineGautier Nov 3, 2022
7e2c1f6
Merge pull request #3140 from AntoineGautier/issue1374_templates_updates
AntoineGautier Nov 8, 2022
466236e
Remove AirflowCalculated option
AntoineGautier Nov 8, 2022
281d29f
Minor documentation edits
AntoineGautier Nov 15, 2022
5a6c7f7
Fix package order
AntoineGautier Nov 15, 2022
c45b9c3
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Nov 16, 2022
c399148
Remove unused declaration
AntoineGautier Nov 16, 2022
977e2c0
removed years in enumeration lists
JayHuLBL Dec 7, 2022
ce38700
updated OA configuration enumeration description
JayHuLBL Dec 7, 2022
1ffaca6
Merge branch 'issue3189_g36Enumeration' into issue1374_templates
JayHuLBL Dec 7, 2022
c7a3aa9
removed code years, updated OA section options descriptions
JayHuLBL Dec 7, 2022
869de0a
added building type enumeration
JayHuLBL Dec 8, 2022
8e4cda3
deleted duplicate types
JayHuLBL Dec 9, 2022
559da3a
Update configuration options
AntoineGautier Dec 12, 2022
23c04bc
Update results
AntoineGautier Dec 12, 2022
f2aae54
Merge branch 'master' into issue3189_g36Enumeration
JayHuLBL Dec 12, 2022
3c1be68
removed not_specified options
JayHuLBL Dec 12, 2022
dd2aa1a
set start attribute to the not-specified parameters
JayHuLBL Dec 12, 2022
033804c
Merge branch 'issue3189_g36Enumeration' into issue1374_templates
JayHuLBL Dec 12, 2022
3dee8f6
Merge branch 'issue1374_templates' of https://github.com/lbl-srg/mode…
JayHuLBL Dec 12, 2022
91d10cc
added missing project parameters
JayHuLBL Dec 12, 2022
b2ee0f7
commented project info [ci skip]
JayHuLBL Dec 15, 2022
524caa6
Add enable annotation and minor fixes
AntoineGautier Dec 16, 2022
41bb071
Checkout component models from issue1374_template_CHW_final
AntoineGautier Dec 16, 2022
4b5b246
Doc
AntoineGautier Dec 16, 2022
47a2889
Merge branch 'master' into issue3189_g36Enumeration
JayHuLBL Dec 16, 2022
cf9dc77
removed BOM
JayHuLBL Dec 16, 2022
41781c0
Merge branch 'issue3189_g36Enumeration' into issue1374_templates
JayHuLBL Dec 16, 2022
135c1ef
removed BOM, set default value for eneStd and venStd
JayHuLBL Dec 16, 2022
5eaf853
Merge branch 'issue3189_g36Enumeration' into issue1374_templates
JayHuLBL Dec 16, 2022
74e457e
Merge branch 'issue1374_templates' of https://github.com/lbl-srg/mode…
JayHuLBL Dec 16, 2022
2e316c3
removed uRelFan input
JayHuLBL Dec 19, 2022
87179bb
removed no needed connectors
JayHuLBL Dec 19, 2022
eb55f7b
updated reference
JayHuLBL Dec 19, 2022
7020c3b
removed return fan calculated air option
JayHuLBL Dec 19, 2022
2813073
removed normal open option
JayHuLBL Dec 20, 2022
6ba3896
fixed bug
JayHuLBL Dec 20, 2022
107acc5
recoverred Not_specified opiton for the climate zones
JayHuLBL Dec 21, 2022
64875f3
removed BOM
JayHuLBL Dec 21, 2022
de68b18
Add enable annotations, update description strings
AntoineGautier Dec 21, 2022
e76f057
Fix HTML
AntoineGautier Dec 21, 2022
5f4fee9
Merge branch 'master' into issue3139_MZController
JayHuLBL Dec 21, 2022
d6114bf
merged issue3189 branch
JayHuLBL Dec 21, 2022
016ef3c
added assertion to check if the climate zones have been specified
JayHuLBL Dec 21, 2022
5814ece
added assertion, added validation
JayHuLBL Dec 22, 2022
a6752dc
merged issue3189
JayHuLBL Dec 22, 2022
d27f3d3
removed BOM
JayHuLBL Dec 22, 2022
7fec1bd
removed BOM #3139
JayHuLBL Dec 22, 2022
a0aec47
Merge branch 'issue3189_g36Enumeration' into issue1374_templates
JayHuLBL Dec 22, 2022
610172c
Merge branch 'issue1374_templates' of https://github.com/lbl-srg/mode…
JayHuLBL Dec 22, 2022
577c809
assigned energy and ventilation standard
JayHuLBL Dec 22, 2022
0dfab38
added energy and ventilation standards
JayHuLBL Dec 22, 2022
29c41ca
merged issue3189 [ci skip]
JayHuLBL Dec 22, 2022
f370030
Merge branch 'issue3189_g36Enumeration' into issue3139_MZController
JayHuLBL Dec 22, 2022
7322891
added flag to disable freeze protection for MZVAV controller
JayHuLBL Dec 23, 2022
6af9876
Merge branch 'master' into issue3189_g36Enumeration
JayHuLBL Jan 3, 2023
198e01c
added default standards
JayHuLBL Jan 11, 2023
6600a97
reverted to no assign standards
JayHuLBL Jan 11, 2023
4656395
moved the check of climate zone specification into the generic class
JayHuLBL Jan 11, 2023
0c70cc9
cleaned BOM
JayHuLBL Jan 11, 2023
ec1c248
updated reference results
JayHuLBL Jan 11, 2023
c41c8a7
merged changes on the standards enumerations
JayHuLBL Jan 11, 2023
b08ab45
corrected revision record #3139 [ci skip]
JayHuLBL Jan 12, 2023
aff96c5
removed have_preIndDam
JayHuLBL Jan 12, 2023
76c2a01
updated reference results
JayHuLBL Jan 12, 2023
f3c72b2
added release notes
JayHuLBL Jan 12, 2023
1450777
added flag to disable freeze protection for single AHU controller
JayHuLBL Jan 13, 2023
e25c2ce
changed the pressure independent damper to exponential damper
JayHuLBL Jan 17, 2023
c8eb410
merged master
JayHuLBL Jan 19, 2023
0b1a6fd
Remove unneeded config options for VAV box
AntoineGautier Jan 19, 2023
fdc3e47
reverted the changes regarding the pressure independent dampers
JayHuLBL Jan 19, 2023
b3f65e3
corrected the windows sensor signal
JayHuLBL Jan 19, 2023
09c896f
removed the release note about the pressure independent damper
JayHuLBL Jan 19, 2023
508179d
Merge branch 'issue3139_MZController_withPreIndDam' into issue1374_te…
JayHuLBL Jan 19, 2023
f59980e
merged the 3139 changes
JayHuLBL Jan 19, 2023
11b90cf
removed BOM
JayHuLBL Jan 19, 2023
9b8b710
Merge branch 'issue3139_MZController_withPreIndDam' into issue1374_te…
JayHuLBL Jan 19, 2023
72e208f
Modify FreezeStat enumeration, add revision note [ci skip]
AntoineGautier Jan 20, 2023
969169d
Merge branch 'issue3139_MZController_withPreIndDam' of github.com:lbl…
AntoineGautier Jan 20, 2023
46cbf6a
Minor edit
AntoineGautier Jan 20, 2023
e70218d
Fix typo
AntoineGautier Jan 20, 2023
aa9c441
reverted the exponential damper in example model
JayHuLBL Jan 21, 2023
323cc7d
merged master
JayHuLBL Jan 21, 2023
c9c4f5a
merged master
JayHuLBL Jan 21, 2023
162ac39
merged issue3139
JayHuLBL Jan 23, 2023
2867410
merge mas
JayHuLBL Jan 23, 2023
57c863b
merged issue3139
JayHuLBL Jan 23, 2023
88b6ccd
corrected controller type
JayHuLBL Jan 24, 2023
a0e58ef
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Feb 28, 2023
e0e4fc4
Patch pump components with issue1374_template_CHW_final
AntoineGautier Feb 28, 2023
82323a8
Fix remaining control point issues
AntoineGautier Mar 8, 2023
13a4ddb
Add icon
AntoineGautier Mar 10, 2023
d85840f
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Mar 17, 2023
06584ef
Remove unused components, refactor DX coil data
AntoineGautier Mar 17, 2023
cb63f77
Exclude models from CI tests, add release notes
AntoineGautier Mar 17, 2023
b1541a0
Add Dymola and OCT CI testing for Templates
AntoineGautier Mar 17, 2023
b6aaaac
Update results, fix DX coil validation models
AntoineGautier Mar 17, 2023
1fccc91
Remove unused files
AntoineGautier Mar 17, 2023
d8decc4
Change file permission
AntoineGautier Mar 17, 2023
f27f898
Remove duplicate declaration
AntoineGautier Mar 19, 2023
d806803
Minor
AntoineGautier Mar 19, 2023
06dddcf
renamed the units enumeration
JayHuLBL Apr 5, 2023
783f595
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Apr 18, 2023
0cf36e1
Make secOutRel non replaceable
AntoineGautier Apr 18, 2023
2eaba1c
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Apr 21, 2023
1e248af
Fix icons and type definitions
AntoineGautier Apr 21, 2023
0714e4e
Remove validation with fan array
AntoineGautier Apr 21, 2023
056dbe5
TMP: Reduce CI testing
AntoineGautier Apr 21, 2023
8755bf6
Adjust icon size
AntoineGautier Apr 21, 2023
c898bf7
Remove useless binding causing OCT warning
AntoineGautier Apr 21, 2023
118d243
Resize icons
AntoineGautier Apr 24, 2023
d58b293
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Apr 24, 2023
f9f0aa4
Update icons
AntoineGautier Apr 25, 2023
509b1d0
Update user guide
AntoineGautier Apr 28, 2023
feacffb
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier May 5, 2023
551af26
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier May 10, 2023
ef39768
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier May 19, 2023
e21e6d1
Address review comments #1
AntoineGautier May 19, 2023
c83fe10
Address review comments #2
AntoineGautier May 23, 2023
c8107b6
Refactoring
AntoineGautier May 24, 2023
516904d
Fix HTML and incorrect enumeration
AntoineGautier May 24, 2023
b86578b
Fix incorrect enumeration
AntoineGautier May 24, 2023
5e4587d
Update mos scripts and reference results
AntoineGautier May 24, 2023
3618659
Checkout routing models from issue3266_template_HW_plant
AntoineGautier May 24, 2023
8196c0e
Change annotation __Linkage to __ctrl_flow
AntoineGautier May 24, 2023
23fdba8
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier May 24, 2023
2e0de77
Restore full CI
AntoineGautier May 24, 2023
9aa42fa
Merge branch 'master' into issue1372_templates
mwetter Aug 14, 2023
5d43a73
Update implementation to use new DX system model names
mwetter Aug 15, 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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ env:
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Utilities\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Utilities\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Utilities\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Templates\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Templates\""

before_install:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
Expand Down
101 changes: 101 additions & 0 deletions Buildings/Resources/Images/Templates/Components/Actuators/Modulating.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
101 changes: 101 additions & 0 deletions Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading