Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
561 commits
Select commit Hold shift + click to select a range
8097276
Move borefield model
dhblum Jan 8, 2024
dda6836
Correct typo in heating ETS
dhblum Jan 8, 2024
2cf2705
Add issue #
dhblum Jan 8, 2024
2d8980b
Correct html
dhblum Jan 8, 2024
c33a8ad
Fix removal of Plants.Reservoir
dhblum Jan 8, 2024
aedc08c
Extend Plannts.Heating from VariantsPackage
dhblum Jan 8, 2024
d9c5cd3
Merge pull request #3629 from lbl-srg/issue3628_cleanDHC
dhblum Jan 9, 2024
349b749
Removed file
dhblum Jan 9, 2024
c1005f5
Merge pull request #3632 from lbl-srg/issue3631_rmFile
dhblum Jan 10, 2024
1111d15
Uploading new module for determining next coil to be enabled
karthikeyad-pnnl Jan 11, 2024
86fa821
Added documentation to new module
karthikeyad-pnnl Jan 11, 2024
e03293e
Updated validation script and added new reference file.
karthikeyad-pnnl Jan 11, 2024
0f046a3
Integrated new block into main controller
karthikeyad-pnnl Jan 11, 2024
1ffc03d
Merge pull request #19 from karthikeyad-pnnl/issue3544_HeatPumpRTUCon…
junkewang001 Jan 11, 2024
81cfcb5
Merge branch 'issue3544_HeatPumpRTUControls' of https://github.com/ju…
junkewang001 Jan 11, 2024
105a8fc
Unit tests after adding NextCoil module
junkewang001 Jan 12, 2024
178a9d9
Updated documentation
junkewang001 Jan 13, 2024
8657ec1
Updated docker image to dymola 2024x (#3623)
mwetter Jan 14, 2024
1573d48
Update conf.yml for OpenModelica 1.22.1 (#3621)
mwetter Jan 14, 2024
3797045
Bump jinja2 in /Buildings/Resources/Documentation/userGuide (#3634)
dependabot[bot] Jan 14, 2024
0847c52
Bump jinja2 in /Buildings/Resources/src/fluid/heatpumps/calibration/d…
dependabot[bot] Jan 14, 2024
2e4f554
Added curves for auxiliary coil validation model and rerun unit test
junkewang001 Jan 19, 2024
008ed21
Update documentation about Spawn's warmup procedure (#3643)
kbenne Jan 24, 2024
9c5d528
Corrected typo (#3645)
mwetter Jan 24, 2024
467b4b9
Update Optimica license file (#3648)
mwetter Jan 29, 2024
a4a1b56
Templates • Testing automation (#3528)
AntoineGautier Feb 7, 2024
fb759ec
Merge pull request #119 from lbl-srg/issue3544_HeatPumpRTUControls
karthikeyad-pnnl Feb 7, 2024
6cdbe0b
Updated references to Reals package in CDL library
karthikeyad-pnnl Feb 7, 2024
ca6acd1
Added and modified validation models for VAV reheat systems
karthikeyad-pnnl Feb 7, 2024
3634715
Fixed bug and reverted weather file to version with modelica environm…
karthikeyad-pnnl Feb 7, 2024
327fff9
Added validation script for new validation model
karthikeyad-pnnl Feb 8, 2024
8ab4b69
Updated package order for new files
karthikeyad-pnnl Feb 8, 2024
448d038
Merge branch 'issue3544_HeatPumpRTUControls' into issue3544_HeatPumpR…
junkewang001 Feb 8, 2024
7ac625b
Merge pull request #22 from karthikeyad-pnnl/issue3544_HeatPumpRTUCon…
junkewang001 Feb 8, 2024
6716d8d
Merge IBPSA master (#3656)
mwetter Feb 13, 2024
208bfc4
Revised script and line connections
junkewang001 Feb 16, 2024
0713cfd
Added images for RTU system with DX coils
junkewang001 Feb 19, 2024
ffc7a5f
Added documentation for base case modules and example model
junkewang001 Feb 19, 2024
39457d3
Added radiant heat port to EnergyPlus thermal zone (#3662)
mwetter Feb 26, 2024
2763cc9
Corrected line connections and changed simulation times
junkewang001 Feb 26, 2024
8ef5133
Added results from Unit Tests
junkewang001 Feb 27, 2024
f627016
Corrected wrong annotation in MediumColumnDynamic (#3670)
mwetter Feb 28, 2024
b5fe7ff
Ibpsa1840 interpolate not smooth (#3671)
hcasperfu Feb 29, 2024
d0a44bf
Issue3431 update reservoir model (#3642)
EttoreZ Mar 6, 2024
ca5d249
Remove trailing white spaces (#3685)
mwetter Mar 8, 2024
7f279cd
deleted triggeredTrapezoid (#3690)
JayHuLBL Mar 10, 2024
6441666
Updated conf.yml for Optimica 1.48.2 with latest Experimental.DHC (#3…
mwetter Mar 10, 2024
ab1e68a
Changed set point that is used when heater is off (#3682)
mwetter Mar 11, 2024
be8f1ec
Removed in the documentation the reference of OnOffController (#3692)
JayHuLBL Mar 11, 2024
8b930fc
Corrected wrong displayUnit string (#3700)
mwetter Mar 13, 2024
7b684a7
Corrected displayUnit in SkyClearness and G36 (#3678)
mwetter Mar 13, 2024
4383a78
Merged IBPSA, issues 1842, 1847, 1850 (#3701)
mwetter Mar 13, 2024
be63b6e
Updated CDL documentation (master) (#3666)
mwetter Mar 16, 2024
44d6494
Issue3356 dhc user guide (#3714)
dhblum Mar 18, 2024
ef920b4
Added missing causality (#3717)
mwetter Mar 21, 2024
6c72235
Add insulation to idf file (#3709)
mwetter Mar 23, 2024
929cf1a
Patch annotation copyright (#3724)
mwetter Mar 25, 2024
b2e9da5
Ibpsa1844 move interpolate to math (#3706)
hcasperfu Mar 25, 2024
a0b01c5
Corrected broken links in Aquifer package (#3729)
mwetter Mar 26, 2024
cf73e6f
Rename DHC models and update release notes (#3719)
EttoreZ Mar 27, 2024
06c7692
Update sensor parameter to avoid warning (#3732)
mwetter Mar 28, 2024
d70a3e8
Issue 3707, break algebraic loop that involves EnergyPlus in the resi…
mwetter Mar 28, 2024
51e6af6
Removed Python36 in Obsolete package (#3738)
mwetter Mar 29, 2024
4a50b00
Renamed CDL.Logical.TrueHoldWithReset to TrueHold (#3737)
mwetter Mar 30, 2024
7a5768a
Corrected wrong parameter assignment in ChillerDXHeatingEconomizer (#…
mwetter Mar 30, 2024
cdeee72
Removed argument initialCall in Spawn (#3742)
mwetter Mar 30, 2024
b508ad9
Issue3606 district icons (#3734)
dhblum Mar 30, 2024
eb4ca96
Removed binding to initialCall which is no longer an input
mwetter Apr 1, 2024
c5fd934
Batch pr master (#3767)
mwetter Apr 2, 2024
527f606
Update Interval specification for PlugFlowPipe, and merge latest IBPS…
mwetter Apr 4, 2024
f1607e1
Templates • AWHP plant (#3770)
AntoineGautier Apr 5, 2024
6740b53
Reformulated InductiveLoad to avoid infinite value (#3780)
mwetter Apr 6, 2024
0e7afcf
Issue3727 move dhc 2 (#3781)
dhblum Apr 8, 2024
471527a
Corrected wrong image location
mwetter Apr 9, 2024
9ea7b9d
Changed version of BuildingsPy (#3789)
mwetter Apr 10, 2024
9b0f642
Patch release notes 11 0 1 (#3792)
mwetter Apr 10, 2024
3c1888c
Patch split release notes (#3794)
mwetter Apr 12, 2024
c0bf654
Wrong image location (#3795)
rpatureau Apr 12, 2024
fdcca08
Bump idna from 3.3 to 3.7 in /Buildings/Resources/src/fluid/heatpumps…
dependabot[bot] Apr 13, 2024
6e64aac
Bump idna in /Buildings/Resources/Documentation/userGuide (#3797)
dependabot[bot] Apr 15, 2024
13987ad
Corrected broken hyperlinks (#3801)
mwetter Apr 17, 2024
c7220f4
Refactor Latch block (#3800)
AntoineGautier Apr 18, 2024
16be388
Issue3809 add sort output backward compatible (#3813)
mwetter Apr 23, 2024
96788c1
Merge pull request #122 from junkewang001/issue3544_HeatPumpRTUControls
karthikeyad-pnnl May 2, 2024
47530ef
Bump jinja2 in /Buildings/Resources/Documentation/userGuide (#3825)
dependabot[bot] May 7, 2024
c657d7f
Bump jinja2 in /Buildings/Resources/src/fluid/heatpumps/calibration/d…
dependabot[bot] May 7, 2024
086ad75
Ibpsa sync issue1874 connectors floating points (#3829)
mwetter May 8, 2024
275a0ec
Update BuildingsPy version (#3827)
mwetter May 9, 2024
8cb67d6
Ibpsa sync issue1576 heat pump model integration (#3637)
mwetter May 11, 2024
c8a2746
Updated version to 11.1.0 (#3832)
mwetter May 14, 2024
d7fe6b6
Merges development branch 12.0.0 to the master (#3826)
mwetter May 15, 2024
88cafbc
Moved data file to Resources folder (#3833)
mwetter May 16, 2024
69bc4c7
Merged updated heat pump examples from IBPSA master (#3836)
mwetter May 18, 2024
1771438
Merged solar collectors from IBPSA (#3838)
mwetter May 18, 2024
318bd78
Merge IBPSA master (#3839)
mwetter May 20, 2024
9411156
Removed parameter dynFil in borefield models (#3835)
mwetter May 21, 2024
b112eff
--- (#3840)
dependabot[bot] Jun 5, 2024
637fa31
Increased version of python requests
mwetter Jun 5, 2024
361892e
Update Dymola image to 2024xRefresh1 (#3855)
mwetter Jun 7, 2024
d5f15a6
Corrected malformed url (#3859)
mwetter Jun 8, 2024
bc6d589
Issue3809 add sort output (#3810)
JayHuLBL Jun 9, 2024
e561639
tightened tolerance by 10 (#3867)
hcasperfu Jun 9, 2024
1a2bddb
Merged IBPSA master (#3868)
mwetter Jun 10, 2024
5a7990e
Updated optimica version to 1.51.6 (#3862)
mwetter Jun 10, 2024
8c99242
Fix load computation in chiller and heat pump models (#3849)
AntoineGautier Jun 11, 2024
8780439
Issue3851 number of requests robust comparison (#3873)
hcasperfu Jun 12, 2024
4f33209
Add seasonal geothermal storage that allows zoned operation (#3812)
mwetter Jun 15, 2024
b658b4f
Updated example of steam self-acting valve (#3884)
mwetter Jun 16, 2024
05e02f3
Improved DHC example to avoid verification error at zero flow (#3878)
mwetter Jun 18, 2024
e6c2110
Merged IBPSA master (#3895)
mwetter Jun 20, 2024
a027737
Bump urllib3 in /Buildings/Resources/Documentation/userGuide (#3891)
dependabot[bot] Jun 20, 2024
f491d8b
Bump urllib3 in /Buildings/Resources/src/fluid/heatpumps/calibration/…
dependabot[bot] Jun 20, 2024
a8fac9c
Use pre instead of hold in time suppression (#3893)
AntoineGautier Jun 21, 2024
cb35a76
Corrected annotation (#3901)
mwetter Jun 23, 2024
985582a
Update EquationFitReversible_ScalingFactor.mo (#3905)
rpatureau Jun 24, 2024
54b21d8
Updated to omc 1.23.0 (#3890)
mwetter Jun 25, 2024
d95a645
Use moving average in flow switch box (#3907)
AntoineGautier Jun 26, 2024
0d8ed44
Fix algebraic loops appearing after refactoring hold block (#3916)
AntoineGautier Jun 27, 2024
6488223
Additional validation cases for zoned borefields (#3913)
mwetter Jun 27, 2024
745315e
Updated python script to export BESTEST data (#3908)
JayHuLBL Jun 28, 2024
2cf523e
Ibpsa1880 mover efficiency fix and validation rework (#3834)
hcasperfu Jul 6, 2024
c39e4c0
Add new features to the AWHP plant template (#3847)
AntoineGautier Jul 6, 2024
c128f96
Bump certifi in /Buildings/Resources/Documentation/userGuide (#3933)
dependabot[bot] Jul 8, 2024
fc92ba5
Improve checksum test (#3927)
AntoineGautier Jul 8, 2024
a81d2ee
Remove file added by mistake (#3935)
AntoineGautier Jul 9, 2024
464c18a
Bump certifi in /Buildings/Resources/src/fluid/heatpumps/calibration/…
dependabot[bot] Jul 9, 2024
b57b61c
Replaced conversion of PLR to pulse (#3938)
mwetter Jul 10, 2024
2367435
Updated variables used in verification of DataCenterDiscreteTimeContr…
mwetter Jul 10, 2024
a07fc89
Refactor TrueFalseHold, move TrueHold to Obsolete (#3863)
AntoineGautier Jul 10, 2024
b642ed9
Improve status emulator (#3925)
AntoineGautier Jul 12, 2024
793aa27
Update model to remove nonlinear system of equation with discrete var…
mwetter Jul 12, 2024
014afe0
Moved parameter to main tab (#3946)
mwetter Jul 13, 2024
e3e7637
Add hold signal to trim and respond block (#3864)
AntoineGautier Jul 16, 2024
6eb5f6f
Merges IBPSA, issue 1908 (#3949)
mwetter Jul 16, 2024
3764b4a
Update results (#3951)
AntoineGautier Jul 19, 2024
4d9b7fd
Issue3433 organic rankine cycle (#3434)
hcasperfu Aug 15, 2024
69988e6
removed double icon (#3956)
JayHuLBL Aug 15, 2024
439f291
Issue3928 remove error trajectories (#3955)
hcasperfu Aug 15, 2024
1d13979
Issue3957 remove sta t (#3959)
hcasperfu Aug 15, 2024
9cc1938
Ibpsa1913 remove sta t patch (#3961)
hcasperfu Aug 19, 2024
03b69f1
Issue3953 unit delay (#3958)
JayHuLBL Aug 19, 2024
1118f17
Issue1938 spawn negative start time (#3921)
mwetter Aug 20, 2024
424a30c
Merged IBPSA, issue1919_heatPumpCodeMarkup (#3962)
mwetter Aug 21, 2024
8584e80
Fix TrueFalseHold with unit impulse input signal (#3967)
AntoineGautier Aug 27, 2024
e952aaf
Corrected media choices (#3971)
JayHuLBL Aug 29, 2024
5f29874
Issue3968 remove nrpm from obsolete (#3975)
hcasperfu Aug 30, 2024
e76d634
added start time (#3977)
JayHuLBL Aug 31, 2024
cbe1013
Corrected compliance with MSL (master) (#3982)
mwetter Sep 2, 2024
77e582f
Ibpsa1912 avoid get peak function unless asked (#3976)
hcasperfu Sep 3, 2024
eadbd6c
Spawn - support RunPeriod (#3988)
mwetter Sep 4, 2024
a6b8a00
Fixed issues when multiple sims are performed (#3995)
chria Sep 12, 2024
7074231
Removed whitespace
mwetter Sep 12, 2024
86f1cb1
corrected broken html links (#3999)
hcasperfu Sep 15, 2024
55203c6
Update actuator model (#4000)
mwetter Sep 18, 2024
5723bac
spelling mistakes (#4008)
rpatureau Sep 20, 2024
2f5a4a9
Correct dimension in actuator model in data center package (#4005)
mwetter Sep 20, 2024
6fd3c19
Merge actuator revisions from IBPSA (#4010)
mwetter Sep 21, 2024
63c1932
Merged changes from IBPSA, issue1926 (#4011)
mwetter Sep 27, 2024
f3e6bac
Revised documentation of SlewRateLimiter (#4014)
mwetter Oct 2, 2024
c34c05a
Issue3989 pump control (#3991)
JayHuLBL Oct 4, 2024
9d0f28e
Merges IBPSA, issues1935_unprotectdhDiscretizedDoor (#4021)
mwetter Oct 20, 2024
4502eec
Refactor to ensure passed=u if t=0 (#4022)
AntoineGautier Oct 25, 2024
0e633cd
Merge changes for ORC model from IBPSA (#4020)
mwetter Oct 27, 2024
e3aff0b
Merge IBPSA, issue1937_checkValve (#4023)
mwetter Oct 28, 2024
e3e424c
Update OpenModelica to 1.24.0 (#4026)
mwetter Oct 29, 2024
fa15775
check valve - enable models (#4024)
mwetter Nov 2, 2024
e775985
Changed guard against division by zero (#4034)
mwetter Nov 4, 2024
ef8df7a
Issue4037 co sim start (#4039)
JayHuLBL Nov 8, 2024
0881724
Update Spawn to EnergyPlus 24.2.0 (#4018)
mwetter Nov 9, 2024
df0be2a
Improve comment strings and reformat implementation of CDL Elementary…
mwetter Nov 9, 2024
a8b0409
Corrected wrong annotation in FanCoil2PipeHeatingValve (#4045)
mwetter Nov 10, 2024
07dfbd5
Change initialization of electrical load (#4049)
mwetter Nov 18, 2024
ba8277f
Updated Spawn installation instructions (#4057)
mwetter Nov 22, 2024
32156a1
Remove time events in ETS model with heat recovery chiller (#4059)
mwetter Nov 25, 2024
0368613
updated windows library (#4061)
JayHuLBL Nov 26, 2024
98a6e4b
Increased tolerance (#4064)
JayHuLBL Nov 26, 2024
04215e9
Update FFD library with VS 2019 (#4067)
JayHuLBL Nov 28, 2024
1e1f16d
Issue4069 occupants (#4073)
mwetter Dec 9, 2024
adac77c
Made test case robust against rounding errors (#4075)
mwetter Dec 11, 2024
09c7e6d
Issue3978 dymola2025x (#4077)
mwetter Dec 14, 2024
0416acd
Update link to build status
mwetter Dec 14, 2024
140a250
Update IBPSA issue1707 with ISO 13790 model validation (#4078)
mwetter Dec 16, 2024
27020e5
Merge changes from IBPSA, issue1944 cdl (#4079)
mwetter Dec 17, 2024
7b611f3
Correct typo in documentation of OptimalStart.mo (#4084)
mwetter Jan 3, 2025
49c32a9
Added doi to AgentPump1Pipe.mo (#4085)
mwetter Jan 3, 2025
09be0ad
Ibpsa sync issue1944 cdl rev (#4087)
mwetter Jan 9, 2025
97901a0
Spawn, improve error check if run from directory with spaces (#4089)
mwetter Jan 10, 2025
ca9c102
Merge elsewhen clauses (#4094)
AntoineGautier Jan 15, 2025
b399379
Change __ctrlFlow annotations (#4093)
AntoineGautier Jan 22, 2025
cb3374f
Changed tolerance of assertion blocks (#4091)
mwetter Jan 22, 2025
6f2e492
corrected the path (#4102)
JayHuLBL Jan 27, 2025
e5d3cb1
Updated OCT image to 1.55.11 (#4106)
mwetter Feb 4, 2025
606b748
Retrying make target in CI tests once if failed (#4100)
mwetter Feb 11, 2025
8712af7
Merged IBPSA, update to solar collectors (#4113)
mwetter Feb 12, 2025
ca1e43f
Updated runner to Ubuntu 24.04 (#4114)
mwetter Feb 12, 2025
2622f9f
Corrected conditions to disable output connectors (#4124)
JayHuLBL Mar 3, 2025
8f64586
CDL compliance of controls in DHC package (#4111)
JayHuLBL Mar 4, 2025
d51dc6a
Set single processor for CI tests for #4128
mwetter Mar 7, 2025
51cdf0d
Updated BuildingsPy version (#4117)
mwetter Mar 7, 2025
7533268
replaced moving average (#4131)
JayHuLBL Mar 7, 2025
4608661
Updated Jinja to 3.1.6 (#4136)
mwetter Mar 8, 2025
1c9424d
Issue4133 revise ets supervisory controller (#4134)
hcasperfu Mar 9, 2025
3b6eb5c
Merged IBPSA, issue 1981 (#4139)
mwetter Mar 9, 2025
37df18a
Change equation structure for zoned borefield initialization (#4135)
mwetter Mar 10, 2025
3f472bb
Merge IBPSA, issue 1987
mwetter Mar 10, 2025
6898770
Removed Obsolete.Air
mwetter Mar 10, 2025
62e7fff
Removed Obsolete.Controls.Continuous
mwetter Mar 10, 2025
f1d6ec5
Removed Obsolete.Examples
mwetter Mar 10, 2025
ef8a5de
Removed Obsolete.Fluid.{FixedResistances,Sources}
mwetter Mar 10, 2025
a4f9783
Updated users guide
mwetter Mar 10, 2025
9999cd4
Removed script for obsolete model
mwetter Mar 10, 2025
b6ae778
Moved EnergyPlus 9_6_0 to Obsolete.EnergyPlus_9_6_0
mwetter Mar 10, 2025
3750ebb
Moved EnergyPlus 9_6_0 to Obsolete.EnergyPlus_9_6_0
mwetter Mar 10, 2025
78f1138
Updated icon
mwetter Mar 10, 2025
af70625
Marked models as obsolete
mwetter Mar 10, 2025
a4b6ba5
Updated release notes
mwetter Mar 10, 2025
0b1ebbd
Updated conversion script
mwetter Mar 10, 2025
c30d545
Restored mos script and reference results for chiller example model (…
AntoineGautier Mar 11, 2025
86f6644
replaced external link
hcasperfu Mar 11, 2025
4ad9e00
Merge branch 'master' into IBPSASync_issue1987_missingSemicolon
mwetter Mar 12, 2025
8ad25b9
Corrected annotation
mwetter Mar 12, 2025
2711d1d
Master branch, increase timeout (#4146)
mwetter Mar 12, 2025
916d340
Increased timeout
mwetter Mar 13, 2025
9569ff4
Updated path to relative directory
mwetter Mar 13, 2025
141f360
Merge branch 'master' into issue4149_obsolete
mwetter Mar 13, 2025
3c8bfd6
Merge branch 'ibpsa1989_fixWAMAKLink'
mwetter Mar 13, 2025
67b17a0
Merge branch 'master' into IBPSASync_issue1987_missingSemicolon
mwetter Mar 13, 2025
c53dee6
Merge branch 'master' into issue4149_obsolete
mwetter Mar 13, 2025
1f38dab
Updated package.order
mwetter Mar 13, 2025
868a858
Updated release notes and date
mwetter Mar 13, 2025
28fde80
Updated release notes and date
mwetter Mar 13, 2025
a9503d6
Added release notes of previous versions
mwetter Mar 13, 2025
ca276a9
Merged IBPSA master with update to modular heat pump
mwetter Mar 14, 2025
1771249
Updated BuildingsPy to v5.2.0
mwetter Mar 14, 2025
2cd2403
Merge branch 'issue4149_obsolete' into issue4153_releasePrep
mwetter Mar 14, 2025
2594cb2
Added conversion entry that was mistakenly removed [ci skip]
mwetter Mar 15, 2025
6794bb3
Corrected condition for spawn binary installations
mwetter Mar 16, 2025
87dac29
Updated versions and directories for Spawn testing
mwetter Mar 16, 2025
a5078eb
Merge branch 'issue4149_obsolete' into issue4153_releasePrep
mwetter Mar 16, 2025
a192df3
Increased timeout
mwetter Mar 16, 2025
11e6a6f
Merge branch 'issue4149_obsolete' into issue4153_releasePrep
mwetter Mar 16, 2025
ff06eed
Added files to exclude list
mwetter Mar 17, 2025
20754a3
Corrected typo in release notes
mwetter Mar 17, 2025
4175de9
Add files for developments past version 12.0.0 (#4166)
mwetter Mar 18, 2025
e2b490a
fixed typo (#4173)
JayHuLBL Mar 22, 2025
97f14e6
IBPSA Sync - wind cut off power, kMeans for borefield, and line thick…
mwetter Apr 14, 2025
0dc21f2
Updated reference link to the climate constant (#4187)
JayHuLBL Apr 15, 2025
534ab35
Issue4183 damper example (#4185)
mwetter Apr 18, 2025
a15d21d
Issue2884 pid autotuning (#2957)
mwetter Apr 21, 2025
feee8eb
Merge remote-tracking branch 'upstream/master' into issue3544_HeatPum…
karthikeyad-pnnl Apr 24, 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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 19 additions & 3 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Skip if the commit message contains "ci skip"
if: "!contains(github.event.head_commit.message, 'ci skip')"

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
# Checks-out repository under $GITHUB_WORKSPACE, so job can access it
Expand All @@ -40,7 +40,7 @@ jobs:
run: pip3 install --upgrade pip wheel

- name: "Install BuildingsPy"
run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@50ac74d8e4fd067179bb38bc23140c2c9254c94c
run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@v5.2.0

- name: Check for UTF-8 BOM
run : |
Expand All @@ -55,9 +55,11 @@ jobs:
- name: "Test experiment setup"
run : ../bin/runUnitTests.py --validate-experiment-setup

- name: "Test if package.order are correct"
- name: "Test if package.order are correct, and revert order in UsersGuide"
run : |
python -c 'import buildingspy.development.refactor as r; r.write_package_order(".", recursive=True)'
git checkout UsersGuide/ReleaseNotes/package.order
git checkout UsersGuide/package.order
git diff --exit-code .

- name: "Verify files for invalid strings"
Expand Down Expand Up @@ -119,3 +121,17 @@ jobs:
chmod u=rw,og=rw $ff
done
done

test-checksum:
# Skip if the commit message contains "ci skip"
if: "!contains(github.event.head_commit.message, 'ci skip')"

runs-on: ubuntu-22.04

steps:
# Checks-out repository under $GITHUB_WORKSPACE, so job can access it
- name: Checkout code
uses: actions/checkout@v3

- name: Compute the checksum and check that it matches the value from the last commit
run: ./Resources/Scripts/travis/templates/checkandrun.sh --checksum --skip --diffhead
55 changes: 30 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ services:

env:
global:
- BUILDINGSPY_VERSION=BuildingsPy@v5.0.0
- OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
- OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4
- DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1
- DOCKER_REPONAME=lbnlblum
- BUILDINGSPY_VERSION=BuildingsPy@v5.2.0
- OMC_VERSION=ubuntu-2204-omc:1.24.0-1
- OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.55.11
- DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64_rev-1
- ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64
- ENERGYPLUS_23_1_0=EnergyPlus-23.1.0-87ed9199d4-Linux-Ubuntu20.04-x86_64
- MODELICA_JSON_VERSION=6d950c3592fa021aa914ba4ff34a67cbb69962c6
Expand All @@ -46,9 +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.ThermalZones.EnergyPlus_9_6_0\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
- 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\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
Expand All @@ -67,15 +68,12 @@ env:
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Applications\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Applications\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Applications\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\" SINGLEPROC=\"true\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\" SINGLEPROC=\"true\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.DHC.Examples\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples\" SINGLEPROC=\"true\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.DHC.Examples\""
- TEST_ARG="make test-dymola PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
- TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
- TEST_ARG="make test-optimica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
Expand Down Expand Up @@ -109,15 +107,16 @@ 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"

before_install:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
docker pull "$DOCKER_USERNAME"/${DYMOLA_VERSION};
- if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-templates-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then
docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION};
cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
fi;
- if [[ "$TEST_ARG" == *test-optimica* ]]; then
docker pull "$DOCKER_USERNAME"/${OPTIMICA_VERSION};
- if [[ "$TEST_ARG" == *test-optimica* || "$TEST_ARG" == *test-templates-optimica* ]]; then
docker pull "$DOCKER_REPONAME"/${OPTIMICA_VERSION};
cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
fi;
# The Spawn idf reference results are generated with EnergyPlus 9.6.0,
Expand All @@ -143,8 +142,8 @@ before_install:
cd -;
echo "Installed modelica-json in ${MODELICA_JSON_HOME}";
fi;
- if [[ "$TEST_ARG" == *test-openmodelica* ]]; then
docker pull "$DOCKER_USERNAME"/${OMC_VERSION};
- if [[ "$TEST_ARG" == *test-openmodelica* || "$TEST_ARG" == *test-templates-openmodelica* ]]; then
docker pull lbnlblum/${OMC_VERSION};
cp Buildings/Resources/Scripts/travis/omc/omc $HOME/bin/omc;
fi;

Expand All @@ -157,12 +156,12 @@ install:
- 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* ]]; then
- 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;
fi;
- if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
- 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";
Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only;
fi;
Expand All @@ -174,7 +173,13 @@ install:

# Execute tests
script:
- (cd Buildings/Resources/Scripts/travis && travis_wait 90 $TEST_ARG)
- |
TRAVIS_WAIT=90
if [[ "$TEST_ARG" == *test-templates* ]]; then
TRAVIS_WAIT=120
fi
(cd Buildings/Resources/Scripts/travis && travis_wait $TRAVIS_WAIT $TEST_ARG)


after_failure:
- |
Expand Down
Loading