Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1397 commits
Select commit Hold shift + click to select a range
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
55b0d28
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL 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
b893410
added start value for the parameters that could be disabled [ci skip]
JayHuLBL Mar 20, 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
a1847e7
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 14, 2025
8879d0d
avoided using two-devices lead-lag rotation in controller
JayHuLBL Apr 14, 2025
3f6504e
used status emulators in open loop validation model
JayHuLBL Apr 15, 2025
1124463
adding ecnomizer chiller water bypass valve control
JayHuLBL Apr 16, 2025
ee259ba
updated economizer controller validation model
JayHuLBL Apr 16, 2025
0f09fdf
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 23, 2025
7ab29db
changed pacakge icons
JayHuLBL Apr 25, 2025
fef227e
refactoring plant staging process
JayHuLBL Apr 28, 2025
d7bb718
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jun 2, 2025
c022c82
corrected wrong connection
JayHuLBL Jun 2, 2025
118cd7a
updated economizer documentation
JayHuLBL Jun 4, 2025
6f8e539
updated references
JayHuLBL Jun 5, 2025
1ef5499
addressing comments
JayHuLBL Jun 6, 2025
f3f7bb4
removed duplicated protected
JayHuLBL Jun 6, 2025
41a13f2
updated reference
JayHuLBL Jun 7, 2025
8dcde2c
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jul 1, 2025
7c2cbfc
changed validation model to avoid optimica run error [ci skip]
JayHuLBL Jul 8, 2025
3872867
added PID with enable controller
JayHuLBL Jul 8, 2025
bf2731e
updated reference
JayHuLBL Jul 8, 2025
bafebd3
used the PID controller with enable, updated reference
JayHuLBL Jul 8, 2025
1f96d2e
used status emulator for closed loop example
JayHuLBL Jul 8, 2025
f52258f
updated closed-loop test reference
JayHuLBL Jul 8, 2025
5e2de3c
propagated WSE chiller water bypass valve control to top level contro…
JayHuLBL Jul 8, 2025
d99f838
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jul 9, 2025
7ceb4bf
changed the condenser water isolation valve to be optional
JayHuLBL Jul 9, 2025
4327287
seprated local DP setpoint calculation
JayHuLBL Jul 10, 2025
0452e4c
merged master
JayHuLBL Aug 1, 2025
e8e1147
added water level unit, added plant schedule input
JayHuLBL Aug 1, 2025
be821fd
updated reference
JayHuLBL Aug 1, 2025
2f64c3c
changed the condenser water pump speed setpoint to be conditional
JayHuLBL Aug 4, 2025
a115341
refactored the calculation of chiller lifts
JayHuLBL Aug 5, 2025
a740957
added air-cooled chiller flag
JayHuLBL Aug 6, 2025
09ea65a
removed plant cooling load input
JayHuLBL Aug 6, 2025
9968a16
removed tower fan speed input
JayHuLBL Aug 6, 2025
80b9fbc
removed chiller load input
JayHuLBL Aug 7, 2025
6b8c157
added prefix r
JayHuLBL Aug 7, 2025
cda6a2c
Merge branch 'issue4306_addPrefixR' into issue2293_chiller_plant_seq
JayHuLBL Aug 7, 2025
834b606
fixed optimica run error
JayHuLBL Aug 7, 2025
ee49408
upgraded node version
JayHuLBL Aug 8, 2025
792cd80
upgraded node version before installation
JayHuLBL Aug 8, 2025
1e20ba9
switch to the desired node version
JayHuLBL Aug 8, 2025
4b82c14
added sudo
JayHuLBL Aug 8, 2025
f0215c9
changed approach to upgrade node
JayHuLBL Aug 8, 2025
4a3a4d9
changed back node upgrade approach
JayHuLBL Aug 8, 2025
d5ce318
added sudo
JayHuLBL Aug 8, 2025
9bcd6a4
add npm installation
JayHuLBL Aug 8, 2025
04f6220
added rehash
JayHuLBL Aug 8, 2025
c6ffb69
added command end
JayHuLBL Aug 8, 2025
9c617b9
added apt update
JayHuLBL Aug 8, 2025
e41e6d6
moved the node version update to the test script
JayHuLBL Aug 8, 2025
b894897
added npm installation
JayHuLBL Aug 8, 2025
a807c30
updated node js version
JayHuLBL Aug 8, 2025
e722b46
changed yml file syntax error
JayHuLBL Aug 8, 2025
2de2099
corrected .yml error
JayHuLBL Aug 8, 2025
b810297
added specific node version
JayHuLBL Aug 8, 2025
6b06c4b
changed to the latest node version
JayHuLBL Aug 8, 2025
635463e
changed to the latest node version
JayHuLBL Aug 8, 2025
4d403ed
Merge branch 'issue4306_addPrefixR' into issue2293_chiller_plant_seq
JayHuLBL Aug 12, 2025
053228f
fixing typos [ci skip]
JayHuLBL Aug 13, 2025
264283f
fixed typos
JayHuLBL Aug 13, 2025
aa83bdc
addressing comments
JayHuLBL Aug 14, 2025
a36d420
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Aug 14, 2025
bd267b7
addressing the comments
JayHuLBL Aug 18, 2025
2520a71
added missing comments
JayHuLBL Aug 19, 2025
3e80884
changed the flag for chiller load reduction
JayHuLBL Aug 19, 2025
89ab050
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Aug 19, 2025
1eb4614
fixing the tupos
JayHuLBL Aug 20, 2025
15d4088
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Aug 21, 2025
08c6684
added condenser water return temperature array
JayHuLBL Aug 21, 2025
f4396f0
fixed the nSta calculation
JayHuLBL Aug 22, 2025
9fc7bf6
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Aug 22, 2025
294cef3
deleted 2 equipment rotation package [ci skip]
JayHuLBL Aug 22, 2025
a4ea151
addressing comments
JayHuLBL Aug 26, 2025
4105f75
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Aug 27, 2025
72f97c5
changed chiller capacity calculation
JayHuLBL Aug 27, 2025
79f8bfe
deleted the removed package
JayHuLBL Aug 27, 2025
d03d546
addressing new comments
JayHuLBL Sep 10, 2025
f317b9b
removed condenser water pump speed input [ci skip]
JayHuLBL Sep 11, 2025
7c80f41
added the head pressure control types enumeration [ci skip]
JayHuLBL Sep 11, 2025
9220a2b
updated enable/disable condition [ci skip]
JayHuLBL Sep 11, 2025
cf352f2
corrected comments
JayHuLBL Sep 11, 2025
55ea8c5
corrected chilled water isolation valve control [ci skip]
JayHuLBL Sep 12, 2025
ea6e1c5
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Oct 6, 2025
f35aafa
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Nov 11, 2025
4d78386
added start attribute
JayHuLBL Nov 19, 2025
2a7b274
addressed minor comments [ci skip]
JayHuLBL Nov 26, 2025
5183eec
applied timer with reset [ci skip]
JayHuLBL Nov 26, 2025
dd1d4bc
added end switch inputs
JayHuLBL Dec 8, 2025
f6dd271
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Dec 8, 2025
b7dc7a6
improved the staging matriices
JayHuLBL Dec 9, 2025
ca9cc0c
renamed the end switch flags
JayHuLBL Dec 9, 2025
2318955
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Dec 10, 2025
b2fa914
added guard to disable devices properply when disabling plants
JayHuLBL Dec 11, 2025
0ab1250
improved the nSta calculation
JayHuLBL Dec 11, 2025
81e7733
changed the example
JayHuLBL Dec 11, 2025
536ff75
changed the example
JayHuLBL Dec 11, 2025
1bbefe2
renamed the parameters
JayHuLBL Dec 11, 2025
be6dedb
added plant enabling status input to the staging process control
JayHuLBL Dec 22, 2025
70e592c
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jan 8, 2026
af1deb4
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Feb 6, 2026
04a42fd
added local setpoint calculation
JayHuLBL Feb 9, 2026
6a71211
corrected text color annotation
JayHuLBL Feb 10, 2026
5bb008b
corrected text annotation errors
JayHuLBL Feb 10, 2026
7a2462a
corrected text annotation errors
JayHuLBL Feb 10, 2026
6cb515d
addressing comments
JayHuLBL Feb 11, 2026
8aa7277
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Feb 11, 2026
040da0e
created chiller chilled water isolation valve control with the end sw…
JayHuLBL Feb 12, 2026
6b3d691
updated isolation valve control
JayHuLBL Feb 12, 2026
599062d
added the chilled water isolation valve end switch inputs [ci skip]
JayHuLBL Feb 13, 2026
4bb7c3e
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Feb 18, 2026
6b6092d
improved dP sensor conditions
JayHuLBL Feb 19, 2026
913d373
renamed parameters
JayHuLBL Feb 19, 2026
703baa9
improved closed-loop test model
JayHuLBL Feb 19, 2026
65e403b
moved timer with reset to CDL package [ci skip]
JayHuLBL Feb 24, 2026
e4e424a
corrected revision note
JayHuLBL Feb 25, 2026
c0331c5
corrected section orders
JayHuLBL Feb 27, 2026
096e410
improved implementation
JayHuLBL Mar 5, 2026
c780563
replaced the PIDEnable block
JayHuLBL Mar 5, 2026
28ec9a5
added missing comment
JayHuLBL Mar 6, 2026
f88a838
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 10, 2026
9ebefc9
increased openmodelica timeout
JayHuLBL Mar 10, 2026
ae6ff16
separated ci test of the OBC package out of the Controls package
JayHuLBL Mar 11, 2026
58176c9
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 11, 2026
40d24b4
updated to use modelica 4.1.0
JayHuLBL Mar 11, 2026
3e35906
reverted msl version
JayHuLBL Mar 12, 2026
9fb6de9
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 16, 2026
63fd0b4
reverted unnecessary changes
JayHuLBL Mar 18, 2026
c74154b
fixed typo, changed the connector enabling conditions, added chilled …
JayHuLBL Mar 25, 2026
9610e85
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 25, 2026
b46bb65
added enumeration for the isolation valve types
JayHuLBL Mar 26, 2026
8f4bb87
added flags for the modulation feedback
JayHuLBL Mar 30, 2026
acd8716
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Mar 31, 2026
704e1af
adding plant enabling input to the staging up controller [ci skip]
JayHuLBL Apr 1, 2026
62776ef
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 2, 2026
5787a8f
corrected wrong parameter settings in open loop test [ci skip]
JayHuLBL Apr 2, 2026
67d8a37
improved implementation
JayHuLBL Apr 8, 2026
cb0a2db
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 8, 2026
bb9d1f7
added missing documentation
JayHuLBL Apr 8, 2026
fa36535
changed the matrix to be undefined size and added asserts
JayHuLBL Apr 8, 2026
957d3f8
corrected typos, improved namings and conditions [ci skip]
JayHuLBL Apr 9, 2026
5fb7b5d
added process ending signal for checking next chillers
JayHuLBL Apr 9, 2026
da21582
updated the check of the achieving of the minimum chiller water flow
JayHuLBL Apr 13, 2026
33e9423
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 15, 2026
1eea516
improved plant disable control
JayHuLBL Apr 15, 2026
ed3656b
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 20, 2026
a4854c3
corrected chiller load calculation
JayHuLBL Apr 21, 2026
9aa0ced
improved changes on the WSE bypass chilled water isolation valve control
JayHuLBL Apr 21, 2026
73d17ac
corrected error in documentation
JayHuLBL Apr 21, 2026
1cd9772
corrected typo
JayHuLBL Apr 21, 2026
629cf3f
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 23, 2026
6c4de07
fixed a glitch in the staging process
JayHuLBL Apr 23, 2026
185ecdc
improved implemenation to avoid out of range index warning
JayHuLBL Apr 24, 2026
7a3ee88
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 27, 2026
40a32b8
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Apr 27, 2026
4970d59
added delay to avoid edge
JayHuLBL Apr 27, 2026
7ef7cb6
improved fan speed control so can enable it when plant enabled in WSE…
JayHuLBL Apr 28, 2026
cb162e0
improved implementation to avoid demand reduction when up from 0 stage
JayHuLBL Apr 30, 2026
24b2249
simplied implementation, avoid not intented edge
JayHuLBL May 1, 2026
7283f85
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 1, 2026
2f43d4c
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 4, 2026
aa08ab5
corrected tower fan speed control
JayHuLBL May 5, 2026
1fd3287
added input of entering chiller chilled water temperature [ci skip]
JayHuLBL May 5, 2026
124df78
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 6, 2026
8de7144
improved WSE-only tower speed control [ci skip]
JayHuLBL May 6, 2026
842ee86
corrected wse integrated operaion mode fan speed control [ci skip]
JayHuLBL May 6, 2026
6e72265
improved WSE control to avoid unnecessary falling edge [ci skip]
JayHuLBL May 6, 2026
b463be0
improved economizer controller [ci skip]
JayHuLBL May 11, 2026
1888ee9
changed solver for the closed loop test
JayHuLBL May 13, 2026
a5d068c
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 14, 2026
e3558dc
removed models from exclusion list
JayHuLBL May 15, 2026
744b3a6
moved the release note
JayHuLBL May 18, 2026
fe12ae1
fixed typos
JayHuLBL May 18, 2026
be48be7
fixed typos in Example.ChillerPlants package
JayHuLBL May 18, 2026
b68050d
corrected economizer tuning parameter calculation
JayHuLBL May 20, 2026
67ee039
improved calculation of the economizer tuning parameter
JayHuLBL May 21, 2026
6b811c6
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 21, 2026
5fd8f70
applied single process setting for the OME test
JayHuLBL May 26, 2026
c3e0100
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL May 26, 2026
8b185a4
added missing conditional connection
JayHuLBL May 27, 2026
4af8de2
added missing conditional connection
JayHuLBL May 28, 2026
089285f
merged master
JayHuLBL Jun 1, 2026
f89836a
improved text [ci skip]
JayHuLBL Jun 1, 2026
8a64bc4
updated note to avoid including boiler plants
JayHuLBL Jun 2, 2026
b31af51
checked out unnecessary changes
JayHuLBL Jun 2, 2026
ac062bc
renamed the Example.ChillerPlants package
JayHuLBL Jun 2, 2026
f9001c6
renamed the Example.ChillerPlants package
JayHuLBL Jun 2, 2026
d923c0d
recreated chiller schematic drawings to have the svg version
JayHuLBL Jun 2, 2026
b87ed9e
moved timerwithReset back to the generic package
JayHuLBL Jun 2, 2026
41c341a
avoided using new timer
JayHuLBL Jun 4, 2026
ae88aad
implemented TimerWithReset as composed block
JayHuLBL Jun 5, 2026
1da7858
Merge branch 'master' into issue2293_chiller_plant_seq
JayHuLBL Jul 9, 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
  •  
  •  
  •  
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@ env:
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Air,Examples}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Air,Examples}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Controls\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Controls\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Controls\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Controls.{Continuous,DemandResponse,Discrete,Predictors,SetPoints,Sources}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Controls.{Continuous,DemandResponse,Discrete,Predictors,SetPoints,Sources}\" SINGLEPROC=\"true\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Controls.{Continuous,DemandResponse,Discrete,Predictors,SetPoints,Sources}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Controls.OBC\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Controls.OBC\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Controls.OBC\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,18 +177,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.ChillerPlant.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.ChillerPlant.DataCenter.BaseClasses.SimplifiedRoom roo(
redeclare package Medium = Medium,
rooLen=50,
rooHei=3,
Expand Down
3,069 changes: 3,069 additions & 0 deletions Buildings/Controls/OBC/ASHRAE/G36/Plants/Chillers/Controller.mo

Large diffs are not rendered by default.

Loading
Loading