Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update to v22.2.0 #4658

Merged
merged 302 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
302 commits
Select commit Hold shift + click to select a range
ba9b8f6
Add new ft test file for airloophvacunitaryhpairtoairmultispeed.
joseph-robertson Sep 1, 2022
497b9cd
Add new ft tests for ptac and pthp.
joseph-robertson Sep 1, 2022
46df68b
Updates for getters and setters.
joseph-robertson Sep 1, 2022
c7a8360
Update containingXXX virtual methods.
joseph-robertson Sep 1, 2022
9646829
Add required includes.
joseph-robertson Sep 1, 2022
5d8b852
Typo in ctor.
joseph-robertson Sep 1, 2022
2061978
Add required includes.
joseph-robertson Sep 1, 2022
67db61f
Write model tests.
joseph-robertson Sep 1, 2022
3ab649c
Stub ft tests.
joseph-robertson Sep 1, 2022
9853180
Include node.
joseph-robertson Sep 1, 2022
fc2524f
Modify a few num field values.
joseph-robertson Sep 1, 2022
580d037
Correct var spelling.
joseph-robertson Sep 1, 2022
870b4d5
Missing includes.
joseph-robertson Sep 1, 2022
60cfcc4
Improve epJSON testing to drill down and show where things differ bet…
jmarrec Sep 2, 2022
6a3aaa4
Fixup the epJSON tests: E+ added some fields at the end of People whe…
jmarrec Sep 2, 2022
e4a0a1c
#4668 - Add new fields for People
jmarrec Sep 2, 2022
f692354
Adjust FT and RT
jmarrec Sep 2, 2022
460ea49
Write a full detailed FT test for People
jmarrec Sep 2, 2022
76ca256
Write a full RT test for People
jmarrec Sep 2, 2022
f7988f1
People is no longer extensible
jmarrec Sep 2, 2022
4e4e161
Merge pull request #4669 from NREL/4668_People_New_Fields
jmarrec Sep 2, 2022
e008d5f
Fix IddFactory_Units test
jmarrec Sep 2, 2022
ff9e3c7
New 'integer' type in the json schema
jmarrec Sep 2, 2022
40bf3d1
Update old vt test related to coilcoolingdxsinglespeed.
joseph-robertson Sep 2, 2022
1ba5b16
Update model and ft tests.
joseph-robertson Sep 2, 2022
5cb57df
Merge branch 'v22.2.0-IOFreeze' into new-coil-flow-rate-field
joseph-robertson Sep 2, 2022
eba62bd
Formatting.
joseph-robertson Sep 2, 2022
adaec90
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 2, 2022
861f2e6
Merge branch 'v22.2.0-IOFreeze' into new-space-fields
joseph-robertson Sep 2, 2022
b26581e
Merge branch 'v22.2.0-IOFreeze' into new-coil-flow-rate-field
joseph-robertson Sep 2, 2022
7df95e8
Merge branch 'v22.2.0-IOFreeze' into new-cooling-coil-type
joseph-robertson Sep 2, 2022
5e08d40
Update and add new tests.
joseph-robertson Sep 6, 2022
58242dc
Update proposed idd and zone hvac cpp.
joseph-robertson Sep 6, 2022
c21a591
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 6, 2022
05b84a8
Typo in cpp files.
joseph-robertson Sep 6, 2022
aa1a60d
Support coilcoolingdx as heating source.
joseph-robertson Sep 6, 2022
fa3555d
Typos in new ft tests.
joseph-robertson Sep 6, 2022
5bfbb1e
Update os idd.
joseph-robertson Sep 6, 2022
f89da36
Add model getters and setters.
joseph-robertson Sep 6, 2022
dbc0640
Update ft for new fields.
joseph-robertson Sep 6, 2022
a2278c5
Update vt and add tests.
joseph-robertson Sep 6, 2022
1ea7c95
Formatting.
joseph-robertson Sep 6, 2022
1de1ae4
Missed a few includes.
joseph-robertson Sep 6, 2022
a302c95
Fill out new ft tests.
joseph-robertson Sep 6, 2022
d40d3e6
Typo in new cpp setter.
joseph-robertson Sep 6, 2022
1720aaf
Collapse extensible groups in idd.
joseph-robertson Sep 7, 2022
67c9963
Update requires in ft test files.
joseph-robertson Sep 7, 2022
2701257
Clean up cpp files a bit.
joseph-robertson Sep 7, 2022
761ae77
Forgot to begin extensible in proposed idd.
joseph-robertson Sep 7, 2022
7391bcd
Fill out extensible fields in ft.
joseph-robertson Sep 7, 2022
e16c507
Clean up setter methods.
joseph-robertson Sep 7, 2022
61ef95e
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 7, 2022
b05eb6c
Update vt test folder name.
joseph-robertson Sep 7, 2022
64deee8
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 7, 2022
e39a1c0
Fix new ft test names.
joseph-robertson Sep 7, 2022
6d70223
Merge branch 'v22.2.0-IOFreeze' into new-watertoair-fields
joseph-robertson Sep 7, 2022
7dd1240
Fix formatting in vt cpp.
joseph-robertson Sep 7, 2022
968cb7a
Merge branch 'develop' into v22.2.0-IOFreeze
jmarrec Sep 8, 2022
d272653
Clarify VT m_startVersions (since it was wrong)
jmarrec Sep 8, 2022
39e478d
Use getSpaceLoadParent(SpaceLoad&) and not SpaceLoadInstance
jmarrec Sep 8, 2022
c4adcc4
Fix #4645 - Map SpaceInfiltration to Space/SpaceList
jmarrec Sep 8, 2022
be67d32
#4645 - Adjust Gtest now that it maps to a Space/SpaceList
jmarrec Sep 8, 2022
2f7a98f
cf #4649 - SwimmingPool:Indoor: field Make-up Water Supply Schedule …
jmarrec Sep 8, 2022
6807402
#4648 #4654 - naive IDD addition for SurfaceProperty:GroundSurfaces a…
jmarrec Sep 8, 2022
8996bab
IDD adjustments
jmarrec Sep 8, 2022
0ca9ce1
Start to implement model files for SurfacePropertyIncidentSolarMultip…
jmarrec Sep 8, 2022
af7bee0
Add a TODO: not sure if I want IncidentSolarMultiplierSchedule to bre…
jmarrec Sep 8, 2022
4e32b57
Add extensible schedule registry for SurroundingSurfaces (existing ob…
jmarrec Sep 8, 2022
658456e
Start model gtests
jmarrec Sep 8, 2022
60ac7ba
Commit FT/RT stubs from generate class
jmarrec Sep 8, 2022
f820452
Update unitary ft files for new coil.
joseph-robertson Sep 8, 2022
ef7664b
Update new ft test files.
joseph-robertson Sep 8, 2022
4ef2c73
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 8, 2022
99e88ad
Minor idd fix.
joseph-robertson Sep 8, 2022
eee96c5
Merge branch 'v22.2.0-IOFreeze' into new-watertoair-fields
joseph-robertson Sep 8, 2022
2ab883c
Merge branch 'v22.2.0-IOFreeze' into new-space-fields
joseph-robertson Sep 8, 2022
f37c7c5
Newline.
joseph-robertson Sep 8, 2022
ae317ea
Missing a public implementation
jmarrec Sep 9, 2022
cc9e9c7
Finish model tests and fixup issues
jmarrec Sep 9, 2022
7f166ae
Merge branch 'v22.2.0-IOFreeze' into new-cooling-coil-type
joseph-robertson Sep 9, 2022
e9c3a53
Formatting.
joseph-robertson Sep 9, 2022
af7efb0
Merge branch 'v22.2.0-IOFreeze' into new-coil-flow-rate-field
joseph-robertson Sep 9, 2022
fc7f514
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 9, 2022
c0543ab
Merge branch 'v22.2.0-IOFreeze' into new-watertoair-fields
joseph-robertson Sep 9, 2022
8bf1a05
Fix vt and tests.
joseph-robertson Sep 10, 2022
a3764cd
Update old test.
joseph-robertson Sep 10, 2022
d910f3d
Change remaining 341 to 350 in vt.
joseph-robertson Sep 10, 2022
e2125b3
Merge branch 'v22.2.0-IOFreeze' into new-watertoair-fields
joseph-robertson Sep 10, 2022
d40a8ad
Typo.
joseph-robertson Sep 10, 2022
28bf869
Merge branch 'v22.2.0-IOFreeze' into new-coil-flow-rate-field
joseph-robertson Sep 10, 2022
28a9c43
Merge branch 'new-coil-flow-rate-field' of github.com:NREL/OpenStudio…
joseph-robertson Sep 10, 2022
c7bcaeb
Fix merge conflict.
joseph-robertson Sep 10, 2022
630ec7e
Fix merge conflicts.
joseph-robertson Sep 10, 2022
e5f9cb1
Adjust object-list in IDD
jmarrec Sep 12, 2022
c33e284
add a getter SubSurface::surfacePropertyIncidentSolarMultiplier()
jmarrec Sep 12, 2022
a826977
Register + Test for FT and RT
jmarrec Sep 12, 2022
6f50d6b
Write a FT and RT for SurfacePropertyIncidentSolarMultiplier and Surf…
jmarrec Sep 12, 2022
a412757
Merge remote-tracking branch 'origin/v22.2.0-IOFreeze' into 4648_4654…
jmarrec Sep 12, 2022
40a0f91
remove debug save
jmarrec Sep 12, 2022
7fc202f
Regression test is showing the subsurface that has the IncidentSolarM…
jmarrec Sep 12, 2022
19cc1e2
I was actually getting owned by SurfacePropertyLocalEnvironment
jmarrec Sep 12, 2022
bb0ca64
Fixup issue where SubSurface is duplicated during FT: register the Su…
jmarrec Sep 12, 2022
4a35503
Naive insert new fields in Sizing:Zone
jmarrec Sep 12, 2022
ba392cc
whitespace
jmarrec Sep 12, 2022
3045168
Make the Schedule fields \object-list (!)
jmarrec Sep 12, 2022
76553eb
Implement new model fields
jmarrec Sep 12, 2022
e604ed9
model Gtest for new fields
jmarrec Sep 12, 2022
5c98531
Add a full RT + extend FT test for Sizing:Zone
jmarrec Sep 12, 2022
ae172c5
Adjust RT and FT for new fields (+ several already missing fields in RT)
jmarrec Sep 12, 2022
912f001
The E+ Idd has the wrong type for the Sizing:Zone Dehum/hum schedules
jmarrec Sep 12, 2022
5668a41
Add a VT test for the new fields' insertion
jmarrec Sep 12, 2022
4d5a2e8
Write VT
jmarrec Sep 12, 2022
0d463f7
Merge branch 'v22.2.0-IOFreeze' into 4645_Infltration_to_Space
joseph-robertson Sep 12, 2022
c93e374
Add test for ee ite aircooled enums.
joseph-robertson Sep 12, 2022
e9de771
Merge branch 'v22.2.0-IOFreeze' into 4648_4654_SurfaceProperties
joseph-robertson Sep 12, 2022
111288a
Formatting.
joseph-robertson Sep 12, 2022
e89dca9
Formatting.
joseph-robertson Sep 12, 2022
6960cae
Add in output var names.
joseph-robertson Sep 12, 2022
bb0a6f0
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 12, 2022
2b4b3a5
I had hardcoded the IDF to do epJSON testing for during the refactor...
jmarrec Sep 13, 2022
8cb167e
make and iddRegex for `\s?[0-9]+` with a Meyers singleton to avoid re…
jmarrec Sep 13, 2022
fedfcef
Fixup epJSON Translator: due to field names starting with a number (t…
jmarrec Sep 13, 2022
41c653c
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 13, 2022
7973988
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 13, 2022
b631fbf
Merge branch 'develop' into v22.2.0-IOFreeze
jmarrec Sep 13, 2022
0b5e9c3
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
jmarrec Sep 13, 2022
4ede343
Merge pull request #4672 from NREL/4645_Infltration_to_Space
jmarrec Sep 14, 2022
62c0196
Merge branch 'v22.2.0-IOFreeze' into 4648_4654_SurfaceProperties
jmarrec Sep 15, 2022
a32c51a
Remove "Schedule" from schedule type registry to match GenerateClass.rb
jmarrec Sep 15, 2022
02e9bdb
Merge pull request #4676 from NREL/4648_4654_SurfaceProperties
jmarrec Sep 15, 2022
f5d2bc8
Merge pull request #4661 from NREL/new-space-fields
jmarrec Sep 15, 2022
73f713d
Fix #4684 - renamed TableName in SQLFile
jmarrec Sep 15, 2022
3d9ef95
SurfaceProperty:GroundSurfaces New Object Output Variables
jmarrec Sep 15, 2022
2933d44
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 15, 2022
fd833d0
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 15, 2022
aaf45d0
Merge branch 'develop' into v22.2.0-IOFreeze
jmarrec Sep 15, 2022
1e2cd04
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
jmarrec Sep 15, 2022
38858ac
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 15, 2022
f54b457
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 15, 2022
9072883
Merge branch 'v22.2.0-IOFreeze' into new-coil-flow-rate-field
joseph-robertson Sep 15, 2022
a99160b
Merge branch 'v22.2.0-IOFreeze' into new-cooling-coil-type
joseph-robertson Sep 15, 2022
9fac3d9
Merge branch 'v22.2.0-IOFreeze' into new-watertoair-fields
joseph-robertson Sep 15, 2022
f35bdae
Add new ft test for watertoairhp objects.
joseph-robertson Sep 15, 2022
61801d1
Formatting.
joseph-robertson Sep 15, 2022
ccd7531
Naive IDD add Chiller:Electric:ASHRAE205
jmarrec Sep 15, 2022
22b2099
Adjust for ConnectionObject + ExternalFileNames
jmarrec Sep 15, 2022
75b2316
Make everything rquired-field where appropriate
jmarrec Sep 15, 2022
7f278fc
Commit stub files
jmarrec Sep 15, 2022
65b57af
Switch the Ambient Temperature Outdoor Air Node Name to an alpha, not…
jmarrec Sep 15, 2022
4a9d4c4
First pass a model implementation for ChillerElectricASHRAE205
jmarrec Sep 15, 2022
c599454
Progress on model implementation + Gtest
jmarrec Sep 15, 2022
180ec11
Fixup model / tests + add a clone gtest
jmarrec Sep 16, 2022
dcb6cf1
Start implementing connection to Oil Cooler / Auxiliary Loop
jmarrec Sep 16, 2022
e4a2fc4
Add `addDemandBranchOnOilCoolerLoop` + Need to override the clone met…
jmarrec Sep 16, 2022
15f5ec5
Need to override edges too for the oil cooler and aux loops...
jmarrec Sep 16, 2022
201491a
Wrap up the model side!
jmarrec Sep 16, 2022
1a7147b
Write FT + FT test
jmarrec Sep 16, 2022
f53424a
Write a RT
jmarrec Sep 16, 2022
0a6d3fe
Extend FT testign to check the PlantEquipmentOperation
jmarrec Sep 16, 2022
c2e7925
Missed a field
jmarrec Sep 16, 2022
3c59e26
Fill out new ft test fields.
joseph-robertson Sep 16, 2022
125e979
Try test again.
joseph-robertson Sep 16, 2022
cfd2d0b
Use isEmpty method for non translated fields.
joseph-robertson Sep 16, 2022
ebecd2c
Formatting.
joseph-robertson Sep 16, 2022
7de096e
Wrap up FT testing
jmarrec Sep 19, 2022
bc3e48e
Write a RT test and fix RT: when a Zone is RT'ed, a Space is returned…
jmarrec Sep 19, 2022
6d1b68e
Caught a few of the same issue in existing RTs: when a Zone is trnasl…
jmarrec Sep 19, 2022
2de0acb
Clarify why I'm not allowing ChillerElectricASRHAE205 to be present T…
jmarrec Sep 19, 2022
0cb44c7
Openstudio-resources reg tests showed that I must write a full path t…
jmarrec Sep 19, 2022
1679b2f
Cosmetic AutoSize > Autosize
jmarrec Sep 19, 2022
352b01f
OpenStudio-resources test showed that checking the loop isn't enough,…
jmarrec Sep 19, 2022
1211428
Disable Heat Recovery as it's 1) Not implemented in E+, 2) Make E+ Fatal
jmarrec Sep 19, 2022
a191e20
Log warn for deprecated methods.
joseph-robertson Sep 19, 2022
e89570e
Update release notes for deprecated methods.
joseph-robertson Sep 19, 2022
7d79f16
Clean up ft files.
joseph-robertson Sep 19, 2022
d33bfd6
Clean up ft files.
joseph-robertson Sep 19, 2022
f4fa781
Improve ft and vt tests.
joseph-robertson Sep 19, 2022
7d5f38f
But of model cleanup.
joseph-robertson Sep 19, 2022
af0f364
Typo.
joseph-robertson Sep 19, 2022
26ae52a
Typos.
joseph-robertson Sep 19, 2022
7cc8064
Fix up ft test.
joseph-robertson Sep 19, 2022
b93b85b
Formatting.
joseph-robertson Sep 19, 2022
497d5e6
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 19, 2022
a1192c6
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 19, 2022
9a67761
Check node connections.
joseph-robertson Sep 19, 2022
f10eb5e
Merge branch 'v22.2.0-IOFreeze' into new-watertoair-fields
joseph-robertson Sep 19, 2022
b8f0050
Merge pull request #4665 from NREL/new-coil-flow-rate-field
jmarrec Sep 20, 2022
45b97a3
Merge remote-tracking branch 'refs/remotes/origin/v22.2.0-IOFreeze'
jmarrec Sep 20, 2022
d04a448
Redo full test FT Tests for ZoneHVACWaterToAirHeatPump + Coils
jmarrec Sep 20, 2022
731a156
Merge pull request #4671 from NREL/new-watertoair-fields
jmarrec Sep 20, 2022
7ee3189
Merge branch 'v22.2.0-IOFreeze'
jmarrec Sep 20, 2022
f5eccf0
Sizing:Zone new fields: Make fields with a default \required-field
jmarrec Sep 20, 2022
ef4ad08
Missed a couple in RT test
jmarrec Sep 20, 2022
ea4bb1d
Merge pull request #4677 from NREL/4675_SizingZone_newFields
jmarrec Sep 20, 2022
2502031
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 20, 2022
afaacea
Add several stage methods to multistage objects.
joseph-robertson Sep 20, 2022
b7331a6
Partial classes.
joseph-robertson Sep 20, 2022
f3b62bb
Changes to availability schedule.
joseph-robertson Sep 20, 2022
51241f1
Update model tests.
joseph-robertson Sep 20, 2022
2176a10
Change stagedata classes to parent objects.
joseph-robertson Sep 20, 2022
16f27ab
Fixes to model.
joseph-robertson Sep 20, 2022
c9ee067
Fixes to ft.
joseph-robertson Sep 20, 2022
cb81e46
Update model tests.
joseph-robertson Sep 20, 2022
99ea6d3
Update ft tests.
joseph-robertson Sep 20, 2022
829175f
Missing numberofstages method.
joseph-robertson Sep 20, 2022
58f8312
Update release notes for breaking changes.
joseph-robertson Sep 20, 2022
34f04cc
Fix typos in tests.
joseph-robertson Sep 20, 2022
6338e13
Fix tests and get passing.
joseph-robertson Sep 21, 2022
130c711
Add vt for coilheatingasmultistage availability schedule.
joseph-robertson Sep 21, 2022
e9d6ee7
Add vt test for new rule.
joseph-robertson Sep 21, 2022
8ba89c0
Clean up fts a bit.
joseph-robertson Sep 21, 2022
24917ed
Merge branch 'develop' into v22.2.0-IOFreeze
joseph-robertson Sep 21, 2022
cdbb571
Try to fix new vt.
joseph-robertson Sep 21, 2022
c6eb392
Fix up VT for Coil:Cooling:DX:SingleSpeed (and reorganize for clarity)
jmarrec Sep 22, 2022
67bbf1c
Merge remote-tracking branch 'origin/develop' into v22.2.0-IOFreeze
jmarrec Sep 22, 2022
69d6e55
Merge branch 'v22.2.0-IOFreeze' into new-cooling-coil-type
jmarrec Sep 22, 2022
810e029
Write a Model test for addToNode (airLoop)
jmarrec Sep 22, 2022
ce502de
Add a failing FT test for CoilCoolignDX when directly on AirLoopHVAC
jmarrec Sep 22, 2022
c7ff24f
Fixup FT
jmarrec Sep 22, 2022
600d4c8
Merge pull request #4662 from NREL/new-cooling-coil-type
joseph-robertson Sep 22, 2022
1db25a3
Merge branch 'v22.2.0-IOFreeze' into new-heating-multistage-coil
joseph-robertson Sep 22, 2022
88bacf3
Make CoilHeatingElectricMultiStage(Gas|Electric) back to ModelObject
jmarrec Sep 26, 2022
5931343
Register and adjust CoilHeatingElectricMultiStageStageData_GTest
jmarrec Sep 26, 2022
8551752
Extend testing for API for CoilheatingElectricMultiStage
jmarrec Sep 26, 2022
d595463
Fixup the CoilHeatingElectricMultiStage::clone
jmarrec Sep 26, 2022
1b421e9
Extend CoilHeatingElectricMultiStageStageData testing
jmarrec Sep 26, 2022
67dab71
CoilHeatingGasMultiStage: extend testing + fixup clone
jmarrec Sep 26, 2022
a948f15
Extend FT Testing to check node names
jmarrec Sep 26, 2022
b9c76c1
Merge pull request #4666 from NREL/new-heating-multistage-coil
jmarrec Sep 26, 2022
a9b3b8d
Update cmakelists for new eplus versions.
joseph-robertson Sep 26, 2022
9dafc01
remove ligcc_s.1.dylib on mac
jmarrec Sep 26, 2022
95a15f4
Fixup error in OSRunner
jmarrec Sep 26, 2022
dafe882
Only FT new space fields if hard set.
joseph-robertson Sep 27, 2022
35a09b2
Clean up new ft.
joseph-robertson Sep 27, 2022
550efdd
Update space ft tests.
joseph-robertson Sep 27, 2022
88a9096
Update mac and linux.
joseph-robertson Sep 28, 2022
4d21db8
Update windows.
joseph-robertson Sep 28, 2022
e758e89
Merge branch 'v22.2.0-RC2' into v22.2.0-official
jmarrec Sep 28, 2022
9c46ec2
Update hash for E+ arm64 + adjust fortran libs
jmarrec Sep 28, 2022
634963c
Merge pull request #4687 from NREL/4656_ChillerElectricASHRAE205
jmarrec Sep 28, 2022
a6d6a16
Merge pull request #4698 from NREL/v22.2.0-official
jmarrec Sep 28, 2022
7bd9cce
Fix a -Wunused-lambda-capture on Apple-Clang 14.0
jmarrec Sep 28, 2022
2536fd4
use if not isXXXDefaulted => setDouble(index, mo.xXX())
jmarrec Sep 28, 2022
7cdd3d3
Fix partial classes for MultiStage coils
jmarrec Sep 28, 2022
e53d573
Fix WindowPropertyFrameAndDivider test
jmarrec Sep 28, 2022
5d81db4
Fixup VT (test was failing) for Construction with AirWall: handle Sur…
jmarrec Sep 28, 2022
8a2e6b4
Adjust AnnualTotalCosts test: there's a GIGANTIC deviation in End use…
jmarrec Sep 28, 2022
9abf9e4
Office_with_many_HVAC_Types: PTHP/PTAC -> Use a Fan:OnOff with Supply…
jmarrec Sep 28, 2022
e19dc8c
Merge pull request #4697 from NREL/new-space-fields-2
jmarrec Sep 28, 2022
f6af133
Fix parallel execution of ChillerElectricASHRAE205 tests by using a u…
jmarrec Sep 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 11 additions & 23 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(CCACHE_PROGRAM)
endif()

# Project macro can only take digits in the version, it splits these out to specific variables
project(OpenStudio VERSION 3.4.1)
project(OpenStudio VERSION 3.5.0)

# The RT Manifest file and C# SDK only support the digit portion of patch
string(APPEND PROJECT_VERSION_PATCH_DIGIT ${PROJECT_VERSION_PATCH})
Expand Down Expand Up @@ -187,15 +187,15 @@ endif()

# EnergyPlus Idd version
set(ENERGYPLUS_VERSION_MAJOR 22)
set(ENERGYPLUS_VERSION_MINOR 1)
set(ENERGYPLUS_VERSION_MINOR 2)
set(ENERGYPLUS_VERSION_PATCH 0)
set(ENERGYPLUS_VERSION "${ENERGYPLUS_VERSION_MAJOR}.${ENERGYPLUS_VERSION_MINOR}.${ENERGYPLUS_VERSION_PATCH}")
# Build SHA is not required to have a value, but if it does OpenStudio will require this build.
set(ENERGYPLUS_BUILD_SHA "ed759b17ee")
set(ENERGYPLUS_BUILD_SHA "c249759bad")

# ENERGYPLUS_RELEASE_NAME is used to locate the E+ download
# from the github releases
set(ENERGYPLUS_RELEASE_NAME "v22.1.0")
set(ENERGYPLUS_RELEASE_NAME "v22.2.0")

# Radiance
set(RADIANCE_VERSION "5.0.a.12")
Expand Down Expand Up @@ -579,10 +579,10 @@ endif()
if(UNIX)
if(APPLE)
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH f8ccbd2a907c82ee3319f8105f00efe0)
set(ENERGYPLUS_EXPECTED_HASH 48af06ee5b4b0393444e6e57f4adadd5)
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-arm64")
else()
set(ENERGYPLUS_EXPECTED_HASH a8b7727f57273d6e80c5763b1c73945d)
set(ENERGYPLUS_EXPECTED_HASH 92a76c5d60cf91536bdeacbe780d135a)
set(ENERGYPLUS_PLATFORM "Darwin-macOS10.15-x86_64")
endif()
elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
Expand All @@ -591,9 +591,9 @@ if(UNIX)
set(ENERGYPLUS_PLATFORM "Centos7-x86_64")
else()
if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
set(ENERGYPLUS_EXPECTED_HASH 70dde5907e3e7f6aeee45bdff5145bc2)
set(ENERGYPLUS_EXPECTED_HASH f8a45aa0a01523b5f904d5c2ae8302f8)
else() # 18.04
set(ENERGYPLUS_EXPECTED_HASH dc9f4b3d30260c625aaaaf6e53046412)
set(ENERGYPLUS_EXPECTED_HASH 58b8397f55c2a1ede7ed08c5892e62ed)
endif()
set(ENERGYPLUS_PLATFORM "Linux${ENERGYPLUS_SYSTEM_VERSION}-x86_64")
endif()
Expand Down Expand Up @@ -625,11 +625,11 @@ elseif(WIN32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bit
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-x86_64")
set(ENERGYPLUS_ARCH 64)
set(ENERGYPLUS_EXPECTED_HASH 871afa6f931f295eb203bc892468fbce)
set(ENERGYPLUS_EXPECTED_HASH c6d296be45420d6e497f33727f044676)
else()
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
set(ENERGYPLUS_ARCH 32)
set(ENERGYPLUS_EXPECTED_HASH e5c8b2fa8b71c3c04e06ff366ab7fefc)
set(ENERGYPLUS_EXPECTED_HASH 68108677fceb17bd58be1c9c7a68f418)
endif()
if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip")
file(MD5 "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip" ENERGYPLUS_HASH)
Expand Down Expand Up @@ -1310,16 +1310,7 @@ install(DIRECTORY "${ENERGYPLUS_DIR}/python_standard_lib" DESTINATION ./EnergyPl
install(DIRECTORY "${ENERGYPLUS_DIR}/pyenergyplus" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)

if(APPLE)
install(PROGRAMS "${ENERGYPLUS_DIR}/libgfortran.5.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
if (ARCH MATCHES arm64)
install(PROGRAMS "${ENERGYPLUS_DIR}/libgcc_s.1.1.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
install(PROGRAMS "${ENERGYPLUS_DIR}/libintl.8.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
# TODO: quadmath / intl?
else()
install(PROGRAMS "${ENERGYPLUS_DIR}/libquadmath.0.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
install(PROGRAMS "${ENERGYPLUS_DIR}/libgcc_s.1.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
install(PROGRAMS "${ENERGYPLUS_DIR}/libintl.8.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
endif()
install(PROGRAMS "${ENERGYPLUS_DIR}/libintl.8.dylib" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
#install(PROGRAMS "${ENERGYPLUS_DIR}/Python" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
file(GLOB ENERGYPLUS_PYTHON_LIBS "${ENERGYPLUS_DIR}/libpython*")
foreach(python_lib IN LISTS ENERGYPLUS_PYTHON_LIBS)
Expand Down Expand Up @@ -1357,9 +1348,6 @@ elseif(UNIX)
foreach(python_lib IN LISTS ENERGYPLUS_PYTHON_LIBS)
install(PROGRAMS "${python_lib}" DESTINATION ./EnergyPlus/ COMPONENT EnergyPlus)
endforeach()
else()
#install(PROGRAMS "${ENERGYPLUS_PATH}/libgfortran.5.dylib" DESTINATION ./EnergyPlus/)
#install(PROGRAMS "${ENERGYPLUS_PATH}/libquadmath.0.dylib" DESTINATION ./EnergyPlus/)
endif()

if(WIN32)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,17 @@ You can also refer to the [OpenStudio SDK Python Binding Version Compatibility M
* [#4642](https://github.com/NREL/OpenStudio/pull/4642) - Addresses #4575, API change for EvaporativeCoolerFluid:SingleSpeed
* `EvaporativeCoolerFluid:SingleSpeed` has an API-breaking change related to its `performanceInputMethod` getter. It is now a required field that returns `std::string` instead of `boost::optional<std::string>`.
* [#4644](https://github.com/NREL/OpenStudio/pull/4644) - Addresses #4575, API change for Coil:Cooling:DX:SingleSpeed and Coil:Cooling:DX:TwoSpeed
* ` Coil:Cooling:DX:SingleSpeed` and `Coil:Cooling:DX:TwoSpeed` have API-breaking changes related to many of their getters. They are now required fields that return `double` instead of `boost::optional<double>`. Also removes many deprecated methods.
* `Coil:Cooling:DX:SingleSpeed` and `Coil:Cooling:DX:TwoSpeed` have API-breaking changes related to many of their getters. They are now required fields that return `double` instead of `boost::optional<double>`. Also removes many deprecated methods.
* [#4632](https://github.com/NREL/OpenStudio/pull/4632) - Remove deprecated methods for AirWallMaterial, Node, SizingSystem, ZoneAirMassFlowConservation
* Removes the deprecated `AirWallMaterial` class completely, in favor of `ConstructionAirBoundary`
* Removes functions in `Node` that have been deprecated for 9+ years
* Removes deprecated methods in the `SizingSystem`, `ZoneAirMassFlowConservation`, `PlantLoop` & `AirLoopHVAC`, `AvailablilityManagerNightCycle`, `ZoneVentilationDesignFlowRate` classes
* Refer to the CSV file at [developer/ruby/deprecated_methods.csv](https://github.com/NREL/OpenStudio/blob/develop/developer/ruby/deprecated_methods.csv) for more information
* [#4665](https://github.com/NREL/OpenStudio/pull/4665) - Deprecate methods on Coil DX objects
* `Coil:Cooling:DX:SingleSpeed`, `Coil:Cooling:DX:MultiSpeed:StageData`, and `Coil:Cooling:DX:CurveFit:Speed`: `ratedEvaporatorFanPowerPerVolumeFlowRate` and `setRatedEvaporatorFanPowerPerVolumeFlowRate` in favor of `ratedEvaporatorFanPowerPerVolumeFlowRate2017` and `setRatedEvaporatorFanPowerPerVolumeFlowRate2017`
* `Coil:Heating:DX:SingleSpeed` and `Coil:Heating:DX:MultiSpeed:StageData`: `ratedSupplyFanPowerPerVolumeFlowRate` and `setRatedSupplyFanPowerPerVolumeFlowRate` in favor of `ratedSupplyFanPowerPerVolumeFlowRate2017` and `setRatedSupplyFanPowerPerVolumeFlowRate2017`
* [#4666](https://github.com/NREL/OpenStudio/pull/4666) - Changes related to availability schedule methods
* `Coil:Heating:Gas:MultiStage` has an API-breaking change related to its `availabilitySchedule` getter. It is now a required field that returns `Schedule` instead of `boost::optional<Schedule>`. Method `resetAvailabilitySchedule` is also removed.


## Minor changes and bug fixes
Expand Down
2 changes: 1 addition & 1 deletion developer/ruby/GenerateClass.rb
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def forwardTranslate(options)

# VIRTUAL DESTRUCTORS

hpp << " virtual ~" << className << "() {}\n\n"
hpp << " virtual ~" << className << "() = default;\n\n"
hpp << " //@}\n\n"

if pImpl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def cppPublicClassProtectedImpl()
if @baseClassName.empty?
result << " : m_impl(impl)\n"
else
result << " : " << baseClassName << "(impl)\n"
result << " : " << baseClassName << "(std::move(impl))\n"
end
result << "{}\n"
end
Expand Down
2 changes: 2 additions & 0 deletions resources/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ set(utilities_resources_src
utilities/SqlFile/1ZoneEvapCooler-V9-5-0.sql
utilities/SqlFile/1ZoneEvapCooler-V9-6-0.sql
utilities/SqlFile/1ZoneEvapCooler-V22-1-0.sql
utilities/SqlFile/1ZoneEvapCooler-V22-2-0.sql
utilities/xml/base.xml
utilities/xml/hpxml_with_error.xml
utilities/xml/schema/HPXML.xsd
Expand Down Expand Up @@ -161,6 +162,7 @@ set(model_resources_src
model/offset_tests.osm
model/ParkUnder_Retail_Office_C2.osm
model/ASHRAECourthouse.osm
model/A205ExampleChiller.RS0001.a205.cbor
)


Expand Down
7 changes: 5 additions & 2 deletions resources/eefg/dummy.idf
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
! Version,
! 9.1; !- Version Identifier

! Version,
! 22.2; !- Version Identifier

Building,
Building1, !- Name
Big, !- North Axis {deg}
Suburbs, !- Terrain
.04, !- Loads Convergence Tolerance Value
.04, !- Loads Convergence Tolerance Value {W}
.4, !- Temperature Convergence Tolerance Value {deltaC}
FullExterior, !- Solar Distribution
25, !- Maximum Number of Warmup Days
Expand All @@ -15,7 +18,7 @@
Building2, !- Name
Small, !- North Axis {deg}
Suburbs, !- Terrain
.04, !- Loads Convergence Tolerance Value
.04, !- Loads Convergence Tolerance Value {W}
.4, !- Temperature Convergence Tolerance Value {deltaC}
FullExterior, !- Solar Distribution
25, !- Maximum Number of Warmup Days
Expand Down
77 changes: 56 additions & 21 deletions resources/energyplus/5ZoneAirCooled/in.idf
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
! Environmental Emissions: None
! Utility Tariffs: None

Version,22.1;
Version,22.2;

Building,
Building, !- Name
Expand Down Expand Up @@ -820,12 +820,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE1-1 Infil 1, !- Name
SPACE1-1, !- Zone or ZoneList Name
SPACE1-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.032, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1035,12 +1035,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE2-1 Infil 1, !- Name
SPACE2-1, !- Zone or ZoneList Name
SPACE2-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.014, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1215,12 +1215,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE3-1 Infil 1, !- Name
SPACE3-1, !- Zone or ZoneList Name
SPACE3-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.032, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1410,12 +1410,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE4-1 Infil 1, !- Name
SPACE4-1, !- Zone or ZoneList Name
SPACE4-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.014, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1590,12 +1590,12 @@

ZoneInfiltration:DesignFlowRate,
SPACE5-1 Infil 1, !- Name
SPACE5-1, !- Zone or ZoneList Name
SPACE5-1, !- Zone or ZoneList or Space or SpaceList Name
INFIL-SCH, !- Schedule Name
flow/zone, !- Design Flow Rate Calculation Method
0.062, !- Design Flow Rate {m3/s}
, !- Flow per Zone Floor Area {m3/s-m2}
, !- Flow per Exterior Surface Area {m3/s-m2}
, !- Flow Rate per Floor Area {m3/s-m2}
, !- Flow Rate per Exterior Surface Area {m3/s-m2}
, !- Air Changes per Hour {1/hr}
0, !- Constant Term Coefficient
0, !- Temperature Term Coefficient
Expand Down Expand Up @@ -1774,7 +1774,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE1-1, !- Name
Expand Down Expand Up @@ -1810,7 +1817,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE2-1, !- Name
Expand Down Expand Up @@ -1846,7 +1860,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE3-1, !- Name
Expand Down Expand Up @@ -1882,7 +1903,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE4-1, !- Name
Expand Down Expand Up @@ -1918,7 +1946,14 @@
No, !- Account for Dedicated Outdoor Air System
NeutralSupplyAir, !- Dedicated Outdoor Air System Control Strategy
autosize, !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
autosize; !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
autosize, !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
Sensible Load Only No Latent Load, !- Zone Load Sizing Method
HumidityRatioDifference, !- Zone Latent Cooling Design Supply Air Humidity Ratio Input Method
, !- Zone Dehumidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005, !- Zone Cooling Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}
HumidityRatioDifference, !- Zone Latent Heating Design Supply Air Humidity Ratio Input Method
, !- Zone Humidification Design Supply Air Humidity Ratio {kgWater/kgDryAir}
0.005; !- Zone Humidification Design Supply Air Humidity Ratio Difference {kgWater/kgDryAir}

DesignSpecification:OutdoorAir,
SZ DSOA SPACE5-1, !- Name
Expand Down