Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
527 commits
Select commit Hold shift + click to select a range
b20f2c2
Merge remote-tracking branch 'upstream/issue2885_FanCoilUnitControls'…
karthikeyad-pnnl Apr 2, 2025
8f1ca9d
Updated files to resolve unit test errors
karthikeyad-pnnl Apr 2, 2025
f449e6a
Merge pull request #16 from karthikeyad-pnnl/issue2885_FanCoilUnitCon…
cerrinamouchref-pnnl Apr 2, 2025
0a42d5c
Validation model updates
cerrinamouchref-pnnl Apr 2, 2025
84f1e6a
Updates for conventions
cerrinamouchref-pnnl Apr 2, 2025
166dec0
conventions updates
cerrinamouchref-pnnl Apr 4, 2025
dcb0da5
Merge pull request #175 from cerrinamouchref-pnnl/trial
karthikeyad-pnnl Apr 11, 2025
96aaeb9
Removed files not required in library
karthikeyad-pnnl Apr 11, 2025
ddd5512
Uploading unit test reference for closed-loop validation model
karthikeyad-pnnl Apr 30, 2025
9acd7fa
Removed unused packages
karthikeyad-pnnl May 6, 2025
e3ed93a
Moved FCU physics model to baseclasses package in Examples. Removed u…
karthikeyad-pnnl May 6, 2025
b280297
Updated formatting
karthikeyad-pnnl May 7, 2025
eb004cb
Removed unused instances
karthikeyad-pnnl May 7, 2025
56dc7dd
Updated unit test results
karthikeyad-pnnl May 7, 2025
ddb9f59
Modified unit and displayUnit keyword args
karthikeyad-pnnl May 13, 2025
47b81c6
Updated parameter name for hysteresis value
karthikeyad-pnnl May 13, 2025
e175299
Updated icon layer for supply temperature setpoint controller
karthikeyad-pnnl May 13, 2025
bb3b6f1
Merge branch 'master' into issue2885_FanCoilUnitControls
JayHuLBL May 15, 2025
be239a1
Merge remote-tracking branch 'upstream/issue2885_FanCoilUnitControls'…
karthikeyad-pnnl May 15, 2025
95d7a26
Removed empty zone equipment package
karthikeyad-pnnl May 20, 2025
b89866b
Removed empty folder from repo
karthikeyad-pnnl May 20, 2025
e8725be
Removed reference data for models that are no longer included
karthikeyad-pnnl May 20, 2025
12ccc31
Updated parameter name per comment on #4238
karthikeyad-pnnl May 20, 2025
28a0b35
Removed new line per comment on #4238
karthikeyad-pnnl May 20, 2025
62d3bd3
Removed simulation parameter for algorithm
karthikeyad-pnnl May 21, 2025
532476d
Merge pull request #4238 from karthikeyad-pnnl/issue2885_FanCoilUnitC…
JayHuLBL May 21, 2025
7a7169c
Merge branch 'master' into issue2885_FanCoilUnitControls
JayHuLBL May 21, 2025
09d7114
moved release note to newer version
JayHuLBL May 21, 2025
c6a240e
fixed html syntex errors
JayHuLBL May 21, 2025
1a2ad0b
renamed parameters
JayHuLBL May 21, 2025
e377801
removed not needed displayUnit specification
JayHuLBL May 21, 2025
c328911
corrected comments
JayHuLBL May 21, 2025
a3cfa1f
removed not needed enumeration
JayHuLBL May 21, 2025
5696194
deleted not used package
JayHuLBL May 21, 2025
2d8754b
added hysteresis
JayHuLBL May 22, 2025
9a955f0
changed PID value, increased tolerance
JayHuLBL May 23, 2025
c17d669
changed PID value
JayHuLBL May 23, 2025
fe7b4c8
removed not need file
JayHuLBL May 23, 2025
7f1afba
removed self-connecting, delete each attribute
JayHuLBL May 23, 2025
0b38be7
improved graphic [ci skip]
JayHuLBL May 23, 2025
319a922
Merge branch 'master' into issue2885_FanCoilUnitControls
JayHuLBL May 28, 2025
d21e7da
merged master
JayHuLBL May 30, 2025
f471e52
improved the sequence to enable/disbale instance based on the existen…
JayHuLBL May 31, 2025
c34fbe7
updated reference
JayHuLBL Jun 2, 2025
e20a3e4
Updated unit test reference results for closed-loop validation model
karthikeyad-pnnl Jun 3, 2025
8f35662
Updated reference results
karthikeyad-pnnl Jun 3, 2025
d16c418
Merge pull request #4267 from karthikeyad-pnnl/issue2885_FanCoilUnitC…
JayHuLBL Jun 3, 2025
12bcc16
sperated ci test package
JayHuLBL Jun 6, 2025
2047fed
added water loop resistance
JayHuLBL Jul 1, 2025
68e6271
updated reference
JayHuLBL Jul 1, 2025
179884c
Updated thermal zone model with native Modelica class. Updated sizing…
karthikeyad-pnnl Jul 2, 2025
97919a9
Updated parameter formatting
karthikeyad-pnnl Jul 2, 2025
48cc125
Updated unit test reference results
karthikeyad-pnnl Jul 2, 2025
1df869d
Merge remote-tracking branch 'upstream/issue2885_FanCoilUnitControls'…
karthikeyad-pnnl Jul 2, 2025
f677c79
Merge branch 'issue2885_FanCoilUnitControls_060325' of github.com:kar…
karthikeyad-pnnl Jul 2, 2025
3e48db8
Updated unit test results after merging latest commits form upstream
karthikeyad-pnnl Jul 2, 2025
c1fb67b
Updated validation script to plot all 5 zones
karthikeyad-pnnl Jul 2, 2025
593dcac
Updated parameters to prevent PI action from saturating
karthikeyad-pnnl Jul 2, 2025
3a97fc2
Updated sizing parameters
karthikeyad-pnnl Jul 2, 2025
efdb850
Updated unit test results after latest parameter updates
karthikeyad-pnnl Jul 2, 2025
4631ef4
Merge pull request #4287 from karthikeyad-pnnl/issue2885_FanCoilUnitC…
JayHuLBL Jul 8, 2025
02d4a31
improved graphic
JayHuLBL Jul 8, 2025
5d32de6
updated reference results
JayHuLBL Jul 8, 2025
f2377ca
updated reference
JayHuLBL Jul 9, 2025
735d5c1
updated results
hcasperfu Jul 10, 2025
5140718
changed unoccupied setpoints
JayHuLBL Jul 10, 2025
031b499
changed PID parameter
JayHuLBL Jul 10, 2025
37712c4
updated results
hcasperfu Jul 10, 2025
f619ec8
increased the openmodelica timeout
JayHuLBL Jul 14, 2025
9907ce8
Merge branch 'issue2885_FanCoilUnitControls' of https://github.com/lb…
JayHuLBL Jul 14, 2025
18eb886
corrected comment
JayHuLBL Jul 14, 2025
b3d6995
Updated comment, rearranged components
mwetter Jul 18, 2025
8ee3ae2
Renamed thermal zones model
karthikeyad-pnnl Aug 13, 2025
dad17f7
Moved fan coil unit classes to Fluid package
karthikeyad-pnnl Aug 13, 2025
890e0a3
Updated documentation
karthikeyad-pnnl Aug 13, 2025
e355e49
Updated icon layer for fan coil unit
karthikeyad-pnnl Aug 13, 2025
bc41a55
Updated parameters to speed up simulation
karthikeyad-pnnl Aug 14, 2025
ea7dcac
Further changed parameters to speed up simulation
karthikeyad-pnnl Aug 14, 2025
5289cfb
Updated unit test results
karthikeyad-pnnl Aug 14, 2025
7c93264
Merge remote-tracking branch 'upstream/issue2885_FanCoilUnitControls'…
karthikeyad-pnnl Aug 14, 2025
5abd4e1
Merge pull request #4308 from karthikeyad-pnnl/issue2885_FanCoilUnitC…
JayHuLBL Aug 14, 2025
a1589fd
Merge branch 'master' into issue2885_FanCoilUnitControls
JayHuLBL Aug 14, 2025
5b65ccd
improved PID controller
JayHuLBL Aug 14, 2025
62ffbc6
fixed html error
JayHuLBL Aug 14, 2025
a12504b
updated reference results
JayHuLBL Aug 18, 2025
eedc2a6
removed closed loop out of the exclusion list
JayHuLBL Aug 18, 2025
e02c809
increased openmodelica timeout
JayHuLBL Aug 19, 2025
87da178
Swapped order of ports, a and then b
mwetter Aug 28, 2025
40ac9ae
Renamed for clarity
mwetter Aug 28, 2025
8f639b3
Aligend components to grid
mwetter Aug 28, 2025
eafe2f1
Still working out errors, but 3 unit model with 3 seperate zones
cerrinamouchref-pnnl Aug 30, 2025
8fbbca9
Updated user guide (#4322)
mwetter Sep 3, 2025
a6b041f
Merge IBPSA library (#4320)
mwetter Sep 3, 2025
5d7b694
Guarded against division by zero (#4323)
mwetter Sep 4, 2025
0bb053a
Merge pull request #184 from cerrinamouchref-pnnl/issue2885_FanCoilUn…
karthikeyad-pnnl Sep 4, 2025
4b8c3eb
Merge branch 'issue2885_FanCoilUnitControls' of https://github.com/lb…
karthikeyad-pnnl Sep 4, 2025
d25239c
Merge branch 'lbl-srg-issue2885_FanCoilUnitControls' into issue2885_F…
karthikeyad-pnnl Sep 4, 2025
5bde9b3
Added additional parameters for supporting fan coil unit with no heat…
karthikeyad-pnnl Sep 4, 2025
bdb17da
Fixed all translation issues
karthikeyad-pnnl Sep 4, 2025
643186b
Updated closed-llop example to improve simulation speed
karthikeyad-pnnl Sep 5, 2025
10f91b5
Bump requests in /Buildings/Resources/Documentation/userGuide (#4328)
dependabot[bot] Sep 5, 2025
2de98c3
Upadetd validation script
karthikeyad-pnnl Sep 5, 2025
ed7717a
Updated unit test results
karthikeyad-pnnl Sep 5, 2025
fe46583
Corrected test for borefield steady state (#4329)
mwetter Sep 5, 2025
de69e32
Updated code layer and documentation
karthikeyad-pnnl Sep 8, 2025
1c7d05b
Merge branch 'issue2885_FanCoilUnitControls_060325' of github.com:kar…
karthikeyad-pnnl Sep 8, 2025
fc4d9e6
Updated protected status of logic blocks
karthikeyad-pnnl Sep 8, 2025
d905845
Updated example model and fan coil unit model
karthikeyad-pnnl Sep 8, 2025
d0d6b12
Merge pull request #18 from karthikeyad-pnnl/issue2885_FanCoilUnitCon…
cerrinamouchref-pnnl Sep 10, 2025
bce4fcd
Updates to four pipe
cerrinamouchref-pnnl Sep 10, 2025
7af1af0
Merge pull request #186 from cerrinamouchref-pnnl/issue2885_FanCoilUn…
karthikeyad-pnnl Sep 11, 2025
8a5cc69
Updates to four pipe
cerrinamouchref-pnnl Sep 11, 2025
b8286bc
Updated documentation and formatting. Removed schematic image
karthikeyad-pnnl Sep 11, 2025
b5d9d27
Reverted unnecessary changes in example model
karthikeyad-pnnl Sep 11, 2025
4cbd5cd
Renamed time series files to .mos (#4337)
mwetter Sep 11, 2025
eca2e95
Issue4317 update ramp doc (#4335)
JayHuLBL Sep 12, 2025
b245c9c
Bump urllib3 in /Buildings/Resources/src/fluid/heatpumps/calibration/…
dependabot[bot] Sep 12, 2025
b0a1fa1
Bump requests from 2.32.0 to 2.32.4 in /Buildings/Resources/src/fluid…
dependabot[bot] Sep 12, 2025
eb4778b
Merge IBPSA, issue 2044 (#4338)
mwetter Sep 12, 2025
b799635
WIP: update FourPipe schematic
cerrinamouchref-pnnl Sep 12, 2025
9497680
Merge branch 'issue2885_FanCoilUnitControls_060325' of https://github…
cerrinamouchref-pnnl Sep 12, 2025
79df85b
updates to schematic and last comments
cerrinamouchref-pnnl Sep 12, 2025
f950717
Merged IBPSA, issue2046_simultaneousEvents (#4340)
mwetter Sep 13, 2025
4f57c9a
Merge pull request #4334 from karthikeyad-pnnl/issue2885_FanCoilUnitC…
JayHuLBL Sep 15, 2025
4514953
fixed html error
JayHuLBL Sep 15, 2025
60786cf
removed the FCU test model out of the exclusion list
JayHuLBL Sep 15, 2025
1782605
Changed value of small (#4342)
mwetter Sep 16, 2025
553eb38
Updated missing parameter assignments
karthikeyad-pnnl Sep 16, 2025
dac554c
Merge pull request #187 from cerrinamouchref-pnnl/issue2885_FanCoilUn…
karthikeyad-pnnl Sep 16, 2025
7aa0bad
Deleted unused file
karthikeyad-pnnl Sep 16, 2025
6edd315
Removed unused PDF file
karthikeyad-pnnl Sep 16, 2025
16195f6
Propagated interface name changes
karthikeyad-pnnl Sep 16, 2025
029ca30
Updated example model parameters to speed up simulation
karthikeyad-pnnl Sep 16, 2025
64a5e04
Updated unit test results
karthikeyad-pnnl Sep 16, 2025
0acc53f
Added missing header file for Python API (#4344)
mwetter Sep 16, 2025
72b144d
Updated documentation and schematic
karthikeyad-pnnl Sep 16, 2025
724e33f
Updated formatting
karthikeyad-pnnl Sep 16, 2025
e275ede
Merge pull request #4346 from karthikeyad-pnnl/issue2885_FanCoilUnitC…
JayHuLBL Sep 16, 2025
121dcad
fixed html error
JayHuLBL Sep 16, 2025
df694bf
Bump urllib3 in /Buildings/Resources/Documentation/userGuide (#4341)
dependabot[bot] Sep 17, 2025
9a5c4c7
updated reference
JayHuLBL Sep 17, 2025
aaa38a9
changed graphic
JayHuLBL Sep 18, 2025
05adeb0
changed hysteresis value
JayHuLBL Sep 19, 2025
f883be2
reverted changes
JayHuLBL Sep 19, 2025
0b22b62
Revised documentation and icon
mwetter Sep 19, 2025
53f47d9
Revised pressure drops
mwetter Sep 19, 2025
9841ded
Revised documentation and icon
mwetter Sep 19, 2025
01b183e
updated reference
JayHuLBL Sep 19, 2025
f817407
Enabled show_T as there is little overhead
mwetter Sep 19, 2025
412be7b
Updated reference results
mwetter Sep 19, 2025
0829da8
Introduced model for zone
mwetter Sep 19, 2025
f4b4d39
Merge remote-tracking branch 'refs/remotes/origin/issue2885_FanCoilUn…
mwetter Sep 19, 2025
dc958fd
Updated reference result
mwetter Sep 19, 2025
f1565dc
Changed heating coil and cooling coil to computationally simpler mode…
karthikeyad-pnnl Sep 20, 2025
fe73064
Updated parameters to resolve unit test errors
karthikeyad-pnnl Sep 20, 2025
5fbb6e2
Updated reference results
karthikeyad-pnnl Sep 20, 2025
9c8d651
Using same cooling coil parameters across all 3 FCU instances
karthikeyad-pnnl Sep 20, 2025
0fb3708
Merge branch 'issue2885_FanCoilUnitControls_060325' of github.com:kar…
karthikeyad-pnnl Sep 20, 2025
155e0f2
Updated missed parameters for cooling coil
karthikeyad-pnnl Sep 20, 2025
b6a51e0
Updated reference results
karthikeyad-pnnl Sep 20, 2025
e7afd22
Merge pull request #4357 from karthikeyad-pnnl/issue2885_FanCoilUnitC…
JayHuLBL Sep 22, 2025
c88c0a3
Added attributes
mwetter Sep 22, 2025
472c7f6
Renamed parameters to use heaCoi and cooCoi consistently
mwetter Sep 22, 2025
aa2bc0d
Renamed parameters to use heaCoi and cooCoi consistently, changed hea…
mwetter Sep 22, 2025
c9921b9
Changed attribute
mwetter Sep 22, 2025
4940440
Rearranged connections, added displayUnit
mwetter Sep 22, 2025
db0c2eb
Renamed model as it is not really a hydronic system but rather only a…
mwetter Sep 22, 2025
f4b08df
Updated package info
mwetter Sep 22, 2025
c644525
Renamed Examples/HydronicHeating to its original name
mwetter Sep 22, 2025
dd48f76
Renamed Examples/HydronicHeating to its original name
mwetter Sep 22, 2025
db0e873
Updated reference results
mwetter Sep 22, 2025
9c8e5ff
Add multipipe heat pump model (#4284)
AntoineGautier Sep 24, 2025
e9a30da
Added missing annotation 'Interval' (#4363)
mwetter Sep 24, 2025
616b3cd
Issue2885 fan coil unit controls 060325 (#4366)
karthikeyad-pnnl Sep 24, 2025
49a8148
Corrected declaration of internal walls
mwetter Sep 24, 2025
8bcd2b1
Corrected url format [ci skip]
mwetter Sep 24, 2025
c2ed7bb
added value assignment
JayHuLBL Sep 24, 2025
5d31503
updated reference results
JayHuLBL Sep 24, 2025
93f4397
updated user guide
JayHuLBL Sep 24, 2025
5889675
added release note
JayHuLBL Sep 26, 2025
241da30
updated references
JayHuLBL Sep 26, 2025
7df64ed
Reordered notes alphabetically
mwetter Sep 26, 2025
b2e1243
Issue2885 fan coil unit controls 060325 (#4371)
karthikeyad-pnnl Sep 26, 2025
fcc4511
Merge branch 'master' into issue2885_FanCoilUnitControls
mwetter Sep 26, 2025
d255075
Renamed sensors
mwetter Sep 26, 2025
148b6a3
Changed hysteresis
mwetter Sep 26, 2025
7bc36e5
Corrected html
mwetter Sep 26, 2025
6447036
Swapped ports so inlet is left, outlet is right
mwetter Sep 26, 2025
b177322
Swapped ports so inlet is left, outlet is right
mwetter Sep 26, 2025
b3991d8
Changed parameters to consistently use heaCoi and cooCoi
mwetter Sep 26, 2025
d994b8f
Updated control parameters
karthikeyad-pnnl Sep 26, 2025
6aa2d33
Updated reference results
mwetter Sep 27, 2025
e38309a
Merge Ibpsa issue2043 two way flow element and update to Ubuntu 24.04…
mwetter Sep 29, 2025
791b69a
Issue2885 fan coil unit controls 060325 (#4376)
karthikeyad-pnnl Sep 29, 2025
56468b4
Merge branch 'master' into issue2885_FanCoilUnitControls
mwetter Sep 29, 2025
8b3ba75
Renamed Thys to THys (#4375)
JayHuLBL Sep 29, 2025
c67267b
Update unit tests
EttoreZ Sep 29, 2025
669e124
Merge pull request #3627 from lbl-srg/issue2885_FanCoilUnitControls
mwetter Sep 30, 2025
db0603b
Created branch for #4378
mwetter Sep 30, 2025
692d764
Updated reference results
mwetter Sep 30, 2025
7cf8ff4
fix a bug when triggering assertions
Oct 2, 2025
43f448f
update the example
Oct 2, 2025
ef5c236
Added missing header file import
mwetter Oct 2, 2025
8956d9c
Corrected html
mwetter Oct 2, 2025
299f805
Declared functions as impure
mwetter Oct 2, 2025
1a30c1f
Update cfdCosimulation.h
mwetter Oct 2, 2025
524982c
update reference data
Oct 3, 2025
72303ce
Updated reference results
mwetter Oct 3, 2025
675ddb4
Templates • Refactor AWHP plant template with modular HP model (#4171)
AntoineGautier Oct 5, 2025
cde96b8
Restore CI tests & split templates' tests into 3 jobs
AntoineGautier Oct 5, 2025
85309f3
Merge pull request #4387 from lbl-srg/issue4386_restoreCITests
mwetter Oct 6, 2025
341d58a
Merge pull request #4368 from lbl-srg/issue4367_AvoidDefaultRoughness
mwetter Oct 6, 2025
4c81fe3
Merge pull request #4381 from lbl-srg/issue4379_ffd_include
mwetter Oct 6, 2025
f81424a
Reformulated when equation
mwetter Oct 6, 2025
985fea1
apply similar change to ZonedBorefields
thorade Oct 7, 2025
6aa5fff
update the model doc
Oct 8, 2025
d5884dc
update the script and reference results
Oct 8, 2025
a4a740c
update the release note
Oct 8, 2025
c152033
Merge pull request #4389 from modelon-community/issue4321_groundTempe…
mwetter Oct 8, 2025
f09a660
Updated revision notes
mwetter Oct 8, 2025
18509bb
Removed models from exclude list for optimica
mwetter Oct 8, 2025
e0af73e
Updated comment
mwetter Oct 8, 2025
c0479ac
Corrected html
mwetter Oct 8, 2025
f5bccb0
Merge pull request #4385 from SenHuang19/issue4378_autotuningPID
JayHuLBL Oct 8, 2025
6edf738
added more output variables
JayHuLBL Oct 8, 2025
0e7de3c
Merge branch 'master' into issue4378_autotuningPID
JayHuLBL Oct 8, 2025
5a7d4b1
Corrected wrong each statements
mwetter Oct 8, 2025
77e140f
Separted long running Geothermal tests
mwetter Oct 9, 2025
d73b3f6
Updated release notes
mwetter Oct 9, 2025
1ce9662
Increased timeout for zoned borefield
mwetter Oct 9, 2025
c5d143b
improved documenetation
JayHuLBL Oct 9, 2025
d1cb5f5
Added model back to exclude list
mwetter Oct 20, 2025
1a64c4e
Changed delay to a value that is within time resolution of BAS
mwetter Oct 21, 2025
728a31c
Exposed delay time as constant, as the documentation says it should b…
mwetter Oct 21, 2025
508f3e4
Revised documentation
mwetter Oct 21, 2025
b685782
Excluded FEFLOW models for optimica
mwetter Oct 27, 2025
6910c04
Updated reference results
mwetter Oct 28, 2025
4b6ebb7
Merge pull request #4393 from lbl-srg/issue4378_autotuningPID
mwetter Oct 28, 2025
05fcb18
Increased timeout for AllElectricCWStorage for optimica
mwetter Oct 28, 2025
d7dc83d
Merge branch 'master' into issue4321_groundTemperatureResponse
mwetter Oct 28, 2025
729f615
Merge pull request #4390 from lbl-srg/issue4321_groundTemperatureResp…
mwetter Oct 30, 2025
40f67aa
Reformulated initialization of CDL.Logical.Latch
mwetter Nov 3, 2025
1b08b5d
Updated release notes
mwetter Nov 3, 2025
496fbab
Increased timeout
mwetter Nov 4, 2025
e90a348
Merge pull request #4399 from lbl-srg/IBPSASync_issue2064_latch_initi…
mwetter Nov 6, 2025
28de343
Added validation data and script for Bottom Cycle
ViswanathanGanesh01 Nov 19, 2025
eeffc67
Delete Buildings/Resources/Data/Fluid/CHPs/DistrictCHP directory
ViswanathanGanesh01 Nov 19, 2025
74f2bd5
Delete Buildings/Resources/Scripts/Dymola/Fluid/CHPs/DistrictCHP dire…
ViswanathanGanesh01 Nov 19, 2025
24cfc83
Added validation files and script for bottom cycle
ViswanathanGanesh01 Nov 19, 2025
506ee8b
Merge branch 'issue3284_districtCHP' into Issue3284
ViswanathanGanesh01 Nov 19, 2025
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
  •  
  •  
  •  
29 changes: 18 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
os: Linux
dist: focal
dist: nobel

language: python

python:
- "3.8"
- "3.12"

branches:
only:
Expand Down Expand Up @@ -47,6 +47,9 @@ 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.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 Expand Up @@ -83,18 +86,21 @@ env:
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.FixedResistances\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.FixedResistances\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.FixedResistances\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.Geothermal\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.Geothermal\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.Geothermal\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Electrical\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Electrical\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Electrical\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Airflow,BoundaryConditions}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Airflow,BoundaryConditions}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Airflow,BoundaryConditions}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.HeatTransfer\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.HeatTransfer\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.HeatTransfer\""
Expand All @@ -107,7 +113,9 @@ env:
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Templates\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Templates\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Templates\""
- TEST_ARG="make test-templates-dymola"
- TEST_ARG="make test-templates-dymola PACKAGE=\"Buildings.Templates.AirHandlersFans\" COVER=0.5"
- TEST_ARG="make test-templates-dymola PACKAGE=\"Buildings.Templates.Plants.HeatPumps\" COVER=0.2"
- TEST_ARG="make test-templates-dymola PACKAGE=\"Buildings.Templates.ZoneEquipment\""

before_install:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
Expand Down Expand Up @@ -156,12 +164,11 @@ before_install:
install:
- git lfs pull
- pip3 install --upgrade pip wheel
- pip3 install --only-binary=numpy,scipy,matplotlib numpy==1.21.4 scipy==1.7.3 matplotlib==3.5.1
- pip3 install git+https://github.com/lbl-srg/${BUILDINGSPY_VERSION}
- if [[ "$TEST_ARG" == *test-energyplus* ]] || [[ "$TEST_ARG" == *test-templates* ]]; then
export ENERGYPLUS_9_6_0=${ENERGYPLUS_9_6_0};
export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0};
pip3 install pandas==1.3.5;
pip3 install pandas==2.3.2;
fi;
- if [[ "$TEST_ARG" == *EnergyPlus_24_2_0* ]] || [[ "$TEST_ARG" == *Buildings.{Obsolete* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
echo "Installing Spawn binaries";
Expand Down
3 changes: 3 additions & 0 deletions Buildings/.copiedFiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Buildings/Airflow/Multizone/BaseClasses/Door.mo
Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
Buildings/Airflow/Multizone/BaseClasses/ErrorControl.mo
Buildings/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo
Buildings/Airflow/Multizone/BaseClasses/Examples/PowerLaw05.mo
Buildings/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo
Buildings/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo
Buildings/Airflow/Multizone/BaseClasses/Examples/WindPressureProfile.mo
Expand All @@ -17,6 +18,7 @@ Buildings/Airflow/Multizone/BaseClasses/ZonalFlow.mo
Buildings/Airflow/Multizone/BaseClasses/package.mo
Buildings/Airflow/Multizone/BaseClasses/package.order
Buildings/Airflow/Multizone/BaseClasses/powerLaw.mo
Buildings/Airflow/Multizone/BaseClasses/powerLaw05.mo
Buildings/Airflow/Multizone/BaseClasses/powerLawFixedM.mo
Buildings/Airflow/Multizone/BaseClasses/windPressureLowRise.mo
Buildings/Airflow/Multizone/BaseClasses/windPressureProfile.mo
Expand Down Expand Up @@ -2912,6 +2914,7 @@ Buildings/Resources/Images/Utilities/Math/int.pdf
Buildings/Resources/Images/Utilities/Math/int.png
Buildings/Resources/Python-Sources/MakeORCFluidRecord.py
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw05.mos
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureProfile.mos
Expand Down
10 changes: 10 additions & 0 deletions Buildings/Airflow/Multizone/BaseClasses/Door.mo
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ protected
constant Real conTP = Buildings.Media.Air.dStp*Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s
"Conversion factor for converting temperature difference to pressure difference";

final parameter Real sqrt_dp_turbulent(min=0) = sqrt(dp_turbulent)
"Square root of pressure difference where laminar and turbulent flow relation coincide";

parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
T=Medium.T_default,
p=Medium.p_default,
Expand Down Expand Up @@ -118,6 +121,13 @@ This is a partial model for the bi-directional air flow through a door.
revisions="<html>
<ul>
<li>
September 19, 2025, by Michael Wetter:<br/>
Introduced protected parameter <code>sqrt_dp_turbulent</code>,
which is needed to improve computing efficiency if flow exponent is <i>0.5</i>.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2043\">IBPSA, #2043</a>.
</li>
<li>
October 6, 2020, by Michael Wetter:<br/>
First implementation for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1353\">#1353</a>.
Expand Down
10 changes: 10 additions & 0 deletions Buildings/Airflow/Multizone/BaseClasses/DoorDiscretized.mo
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ protected
parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
"Density, used to compute fluid volume";

final parameter Real sqrt_dp_turbulent(min=0) = sqrt(dp_turbulent)
"Square root of pressure difference where laminar and turbulent flow relation coincide";

input Real hAg[nCom](each unit="m2/s2")=
{Modelica.Constants.g_n*(hA - (i - 0.5)*dh) for i in 1:nCom}
"Product g*h_i for each compartment";
Expand Down Expand Up @@ -118,6 +121,13 @@ using the model for a door that can be open or closed.
revisions="<html>
<ul>
<li>
September 19, 2025, by Michael Wetter:<br/>
Introduced protected parameter <code>sqrt_dp_turbulent</code>,
which is needed to improve computing efficiency if flow exponent is <i>0.5</i>.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2043\">IBPSA, #2043</a>.
</li>
<li>
October 29, 2024, by Klaas De Jonge:<br/>
Unprotected <code>dh</code> and changed prefixes of <code>dh</code>,<code>hAg</code> and <code>hBg</code> to <code>input</code>.<br/>
This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1935\">#1935</a>.
Expand Down
73 changes: 73 additions & 0 deletions Buildings/Airflow/Multizone/BaseClasses/Examples/PowerLaw05.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
within Buildings.Airflow.Multizone.BaseClasses.Examples;
model PowerLaw05
"Test model for power law function with constant exponent of 0.5"
extends Modelica.Icons.Example;
parameter Real C = 2/10^m "Flow coefficient, C = V_flow/ dp^m";

constant Real m(min=0.5, max=1) = 0.5
"Flow exponent, m=0.5 for turbulent, m=1 for laminar";
parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0) = 5
"Pressure difference where regularization starts";
final parameter Real sqrt_dp_turbulent(min=0) = sqrt(dp_turbulent)
"Square root of pressure difference where regularization starts";

Modelica.Units.SI.PressureDifference dp "Pressure difference";
Modelica.Units.SI.VolumeFlowRate V_flow
"Volume flow rate computed with model powerLaw";
Modelica.Units.SI.VolumeFlowRate VFixed_flow
"Volume flow rate computed with model powerLawFixed";

constant Real gamma(min=1) = 1.5
"Normalized flow rate where dphi(0)/dpi intersects phi(1)";
constant Real a = gamma
"Polynomial coefficient for regularized implementation of flow resistance";
constant Real b = 1/8*m^2 - 3*gamma - 3/2*m + 35.0/8
"Polynomial coefficient for regularized implementation of flow resistance";
constant Real c = -1/4*m^2 + 3*gamma + 5/2*m - 21.0/4
"Polynomial coefficient for regularized implementation of flow resistance";
constant Real d = 1/8*m^2 - gamma - m + 15.0/8
"Polynomial coefficient for regularized implementation of flow resistance";

equation
dp = 10*(-1+2*time);
V_flow = Buildings.Airflow.Multizone.BaseClasses.powerLaw(
dp=dp,
C=C,
m=m,
dp_turbulent=dp_turbulent);
VFixed_flow = Buildings.Airflow.Multizone.BaseClasses.powerLaw05(
C=C,
dp=dp,
a=a,
b=b,
c=c,
d=d,
dp_turbulent=dp_turbulent,
sqrt_dp_turbulent=sqrt_dp_turbulent);
assert(abs(V_flow-VFixed_flow) < 1E-10, "Error: The two implementations of the power law model need to give identical results");
annotation (
experiment(Tolerance=1e-6, StopTime=1.0),
__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw05.mos"
"Simulate and plot"), Documentation(info="<html>
<p>
This examples demonstrates the
<a href=\"modelica://Buildings.Airflow.Multizone.BaseClasses.powerLaw\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw</a>
and
<a href=\"modelica://Buildings.Airflow.Multizone.BaseClasses.powerLaw05\">
Buildings.Airflow.Multizone.BaseClasses.powerLaw05</a>
functions.
They need to return the same function value.
This is verified by an <code>assert</code> statement.
</p>
</html>", revisions="<html>
<ul>
<li>
September 19. 2025, by Michael Wetter:<br/>
First implementation.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2043\">IBPSA, #2043</a>.
</li>
</ul>
</html>"));
end PowerLaw05;
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PowerLaw
PowerLaw05
PowerLawFixedM
WindPressureLowRise
WindPressureProfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ protected
Medium.dynamicViscosity(sta_default)
"Dynamic viscosity at the medium default properties";

final parameter Real sqrt_dp_turbulent(min=0) = sqrt(dp_turbulent)
"Square root of pressure difference where laminar and turbulent flow relation coincide";

Medium.ThermodynamicState sta "State of the medium in the component";
Modelica.Units.SI.DynamicViscosity dynVis "Dynamic viscosity";
Real mExc(quantity="Mass", final unit="kg")
Modelica.Units.SI.Mass mExc(start=0, fixed=true, unbounded=true)
"Air mass exchanged (for purpose of error control only)";

initial equation
mExc=0;
assert(homotopyInitialization, "In " + getInstanceName() +
": The constant homotopyInitialization has been modified from its default value. This constant will be removed in future releases.",
level = AssertionLevel.warning);
Expand Down Expand Up @@ -110,6 +112,25 @@ not in the equation section since this model sets both
revisions="<html>
<ul>
<li>
September 22, 2025, by Michael Wetter:<br/>
Set <code>unbounded=true</code> for <code>mExc_flow</code>.
This is to have the same implementation as in
<a href=\"modelica://Buildings.Airflow.Multizone.BaseClasses.TwoWayFlowElement\">
Buildings.Airflow.Multizone.BaseClasses.TwoWayFlowElement</a>
where this change was done to avoid spikes in <code>port_a.m_flow</code> in
<a href=\"modelica://Buildings.Airflow.Multizone.Examples.OneOpenDoor\">
Buildings.Airflow.Multizone.Examples.OneOpenDoor</a>.<br/>
This is for
<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4360\">Buildings, #4360</a>.
</li>
<li>
September 19, 2025, by Michael Wetter:<br/>
Introduced protected parameter <code>sqrt_dp_turbulent</code>,
which is needed to improve computing efficiency if flow exponent is <i>0.5</i>.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2043\">IBPSA, #2043</a>.
</li>
<li>
February 2, 2022, by Michael Wetter:<br/>
Revised implementation.<br/>
This is for
Expand Down
36 changes: 28 additions & 8 deletions Buildings/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ protected
Modelica.Units.SI.VolumeFlowRate VZer_flow(fixed=false)
"Minimum net volume flow rate to prevent zero flow";

Modelica.Units.SI.Mass mExcAB(start=0, fixed=true)
Modelica.Units.SI.Mass mExcAB(start=0, fixed=true, unbounded=true)
"Air mass exchanged (for purpose of error control only)";
Modelica.Units.SI.Mass mExcBA(start=0, fixed=true)
Modelica.Units.SI.Mass mExcBA(start=0, fixed=true, unbounded=true)
"Air mass exchanged (for purpose of error control only)";

Medium.MassFraction Xi_a1_inflow[Medium1.nXi]
Expand All @@ -55,8 +55,8 @@ equation
// gives higher robustness. The reason may be that for bi-directional flow,
// (VAB_flow - VBA_flow) may be close to zero.
if forceErrorControlOnFlow then
der(mExcAB) = mAB_flow;
der(mExcBA) = mBA_flow;
der(mExcAB) = port_a1.m_flow;
der(mExcBA) = port_a2.m_flow;
else
der(mExcAB) = 0;
der(mExcBA) = 0;
Expand All @@ -82,14 +82,14 @@ equation

VZer_flow = vZer*A;

mAB_flow = rho_a1_inflow*VAB_flow;
mBA_flow = rho_a2_inflow*VBA_flow;
mAB_flow = port_a1.m_flow;
mBA_flow = port_a2.m_flow;
// Average velocity (using the whole orifice area)
vAB = VAB_flow/A;
vBA = VBA_flow/A;

port_a1.m_flow = mAB_flow;
port_a2.m_flow = mBA_flow;
port_a1.m_flow = rho_a1_inflow*VAB_flow;
port_a2.m_flow = rho_a2_inflow*VBA_flow;

// Energy balance (no storage, no heat loss/gain)
port_a1.h_outflow = inStream(port_b1.h_outflow);
Expand Down Expand Up @@ -135,6 +135,26 @@ for doors that can be open or closed as a function of an input signal.
revisions="<html>
<ul>
<li>
September 22, 2025, by Michael Wetter:<br/>
Set <code>unbounded=true</code> for <code>mExcAB_flow</code> and <code>mExcBA_flow</code>
to avoid spikes in <code>port_a.m_flow</code> in
<a href=\"modelica://Buildings.Airflow.Multizone.Examples.OneOpenDoor\">
Buildings.Airflow.Multizone.Examples.OneOpenDoor</a>.<br/>
This is for
<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4360\">Buildings, #4360</a>.
</li>
<li>
September 19, 2025, by Michael Wetter:<br/>
Refactored implementation of underlying function that computes the flow rate
to allow function to be inlined.
This leads to a 20% faster simulation of
<a href=\"modelica://Buildings.Airflow.Multizone.Examples.OneOpenDoor\">
Buildings.Airflow.Multizone.Examples.OneOpenDoor</a> compared to the previous
implementation.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2043\">IBPSA, #2043</a>.
</li>
<li>
May 12, 2020, by Michael Wetter:<br/>
Changed assignment of <code>m1_flow_small</code> and
<code>m2_flow_small</code> to <code>final</code>.
Expand Down
1 change: 1 addition & 0 deletions Buildings/Airflow/Multizone/BaseClasses/package.order
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ TwoWayFlowElement
TwoWayFlowElementBuoyancy
ZonalFlow
powerLaw
powerLaw05
powerLawFixedM
windPressureLowRise
windPressureProfile
Expand Down
Loading