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 v24.2.0-IOFreeze #5242

Open
wants to merge 92 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
9505514
Update cmakelists.
joseph-robertson Aug 26, 2024
48870bc
Update proposed idd.
joseph-robertson Aug 26, 2024
5b6a2d8
Stub ft, vt, and idd version change.
joseph-robertson Aug 27, 2024
120b087
Formatting.
joseph-robertson Aug 27, 2024
9de4c78
Updates for illuminancemap and internalmass.
joseph-robertson Aug 27, 2024
e72ad98
Update idd.
joseph-robertson Aug 27, 2024
86372d2
Update model, ft, and rt files.
joseph-robertson Aug 27, 2024
c6bd269
Update vt and add test.
joseph-robertson Aug 27, 2024
91318b2
Formatting.
joseph-robertson Aug 27, 2024
1fe9b3c
Update idd.
joseph-robertson Aug 27, 2024
5206884
Start updating model files.
joseph-robertson Aug 27, 2024
87063c3
Updates for vt.
joseph-robertson Aug 27, 2024
5432994
Formatting.
joseph-robertson Aug 27, 2024
fd72e0e
Few fixes in vt and test.
joseph-robertson Aug 28, 2024
843c4b5
Bump project version in cmakelists.
joseph-robertson Aug 28, 2024
9760e4b
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-ocfiles
joseph-robertson Aug 28, 2024
5b52841
Remove misplaced line in vt.
joseph-robertson Aug 28, 2024
b90e787
Update idd.
joseph-robertson Aug 28, 2024
44184d2
Update aterm model files.
joseph-robertson Aug 28, 2024
f8cc5d5
Update aterm ft files.
joseph-robertson Aug 28, 2024
5271416
Add tertiary getters and setters.
joseph-robertson Aug 29, 2024
0bde9d0
Fixes in idd and vt.
joseph-robertson Aug 30, 2024
cee2981
Update ft.
joseph-robertson Aug 30, 2024
be8b1d6
Add model tests for heat recovery loop.
joseph-robertson Aug 30, 2024
af4ff2c
Update setter logic for fan control types.
joseph-robertson Aug 30, 2024
7bbf479
Add model tests for new fields and methods.
joseph-robertson Aug 30, 2024
b8e22c4
Formatting.
joseph-robertson Aug 30, 2024
d73397b
Support new Site field.
joseph-robertson Aug 30, 2024
685236c
Support new SizingZone field.
joseph-robertson Aug 30, 2024
ddb581e
Formatting.
joseph-robertson Aug 30, 2024
8f8b293
Add vt and test.
joseph-robertson Aug 30, 2024
911d1e0
Minor fixes.
joseph-robertson Sep 3, 2024
085e23d
Fill out vt test.
joseph-robertson Sep 3, 2024
791fc56
Fix vt indexes.
joseph-robertson Sep 4, 2024
af2143f
Clean up cpp files.
joseph-robertson Sep 4, 2024
aea320c
Clean up cpp and ft.
joseph-robertson Sep 4, 2024
0fbae8a
Change zone sum to space sum in field name.
joseph-robertson Sep 4, 2024
7ef2476
Missed a return in modified fan setter.
joseph-robertson Sep 4, 2024
a047d51
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-heatpump-pl
joseph-robertson Sep 4, 2024
5173975
Wrong variable in rt.
joseph-robertson Sep 4, 2024
a7ef05e
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-heatpump-pl
joseph-robertson Sep 4, 2024
3c7da0b
Finish methods in cpp.
joseph-robertson Sep 4, 2024
ccee2bb
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-aterm
joseph-robertson Sep 4, 2024
8df9552
FT type updates and model test updates.
joseph-robertson Sep 4, 2024
cf3faab
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-heatpump-pl
joseph-robertson Sep 4, 2024
1ff3bd0
Shift old HeatPumpPlantLoopEIR vt tests by index of 3.
joseph-robertson Sep 5, 2024
7ed2f78
Clean up typos in idd files.
joseph-robertson Sep 5, 2024
8fc6d5b
Another update in new model test.
joseph-robertson Sep 5, 2024
43e50f3
Update heatpump-pl idd with remaining fields.
joseph-robertson Sep 9, 2024
883ed2b
Update heatpump-pl model files with remaining fields.
joseph-robertson Sep 9, 2024
309894e
Update heatpump-pl ft files with remaining fields.
joseph-robertson Sep 9, 2024
c1cd217
Update heatpump-pl vt with remaining fields.
joseph-robertson Sep 9, 2024
06ce9a8
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-heatpump-pl
joseph-robertson Sep 9, 2024
0613336
Formatting.
joseph-robertson Sep 9, 2024
d22158b
Update vt and all tests.
joseph-robertson Sep 10, 2024
ecab9c8
Fix curve types in model and ft tests.
joseph-robertson Sep 10, 2024
60faa3b
Include missing choice type in new Condenser Flow Control fields.
joseph-robertson Sep 10, 2024
7ba2423
Fix a -Werror=pessimizing-move on gcc 13
jmarrec Sep 9, 2024
36f0603
Add centos SHA after building and hosting it on the EnergyPlus release
jmarrec Sep 11, 2024
a7a9c28
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-heatpump-pl
joseph-robertson Sep 11, 2024
7bae483
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-aterm
joseph-robertson Sep 11, 2024
e503e91
Add heating control type reset.
joseph-robertson Sep 11, 2024
fe89da0
Update model tests for heating control type.
joseph-robertson Sep 11, 2024
2de9606
Missing lines in new vt rules.
joseph-robertson Sep 11, 2024
8018afb
Add new setters and getters to model files.
joseph-robertson Sep 16, 2024
6c5b0e5
Update ft and vt for new fields.
joseph-robertson Sep 16, 2024
d48105e
Formatting.
joseph-robertson Sep 16, 2024
bb3fd09
Update idd with fan type restriction.
joseph-robertson Sep 16, 2024
0543d59
Stub fan type change in cpp setter.
joseph-robertson Sep 16, 2024
c67a258
Remove fan variable vol from ft.
joseph-robertson Sep 16, 2024
0028015
Stub vt updates.
joseph-robertson Sep 16, 2024
89a39dc
Formatting.
joseph-robertson Sep 16, 2024
e2abd87
Missing Name for curve and schedule fields.
joseph-robertson Sep 16, 2024
0a5d0e1
Typos in cpp.
joseph-robertson Sep 16, 2024
963ebda
Write the vt and test.
joseph-robertson Sep 16, 2024
faaa2bb
Couple of field name typos.
joseph-robertson Sep 16, 2024
41b1e9e
Typo in vt test.
joseph-robertson Sep 16, 2024
5114a7a
Typos in ft files.
joseph-robertson Sep 16, 2024
8e4db10
Try fan type change in setter.
joseph-robertson Sep 16, 2024
47c46ac
Missing includes.
joseph-robertson Sep 16, 2024
8983d60
Minor fixes.
joseph-robertson Sep 17, 2024
3453f09
Add unit test for fan type change.
joseph-robertson Sep 17, 2024
bb68d87
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-ocfiles
joseph-robertson Sep 24, 2024
e223963
Merge pull request #5243 from NREL/v24.2.0-IOFreeze-ocfiles
joseph-robertson Sep 24, 2024
b9c1c01
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-heatpump-pl
joseph-robertson Sep 24, 2024
5306ce4
Merge pull request #5244 from NREL/v24.2.0-IOFreeze-heatpump-pl
joseph-robertson Sep 24, 2024
267ae2c
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-aterm
joseph-robertson Sep 24, 2024
fbbc896
Merge pull request #5245 from NREL/v24.2.0-IOFreeze-aterm
joseph-robertson Sep 24, 2024
950257e
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-chiller
joseph-robertson Sep 24, 2024
bb8c8f5
Merge pull request #5254 from NREL/v24.2.0-IOFreeze-chiller
joseph-robertson Sep 24, 2024
d8df697
Merge branch 'v24.2.0-IOFreeze' into v24.2.0-IOFreeze-vrf
joseph-robertson Sep 24, 2024
a16c884
Merge pull request #5255 from NREL/v24.2.0-IOFreeze-vrf
joseph-robertson Sep 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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.8.0)
project(OpenStudio VERSION 3.9.0)

include(CMake/compiler_flags.cmake)

Expand Down Expand Up @@ -192,15 +192,15 @@ endif()

# EnergyPlus Idd version
set(ENERGYPLUS_VERSION_MAJOR 24)
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 "9d7789a3ac")
set(ENERGYPLUS_BUILD_SHA "a99cc59429")

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

set(ENERGYPLUS_REPO "NREL")

Expand Down Expand Up @@ -639,24 +639,30 @@ endif()
if(UNIX)
if(APPLE)
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 3b465e87fc07e18db458e1d058da447b)
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-arm64")
set(ENERGYPLUS_EXPECTED_HASH 7e2a4bf570e8f94e37f94668e2855ec1)
set(ENERGYPLUS_PLATFORM "Darwin-macOS13-arm64")
else()
set(ENERGYPLUS_EXPECTED_HASH 4f15adccac3df1e699d26f815800c783)
set(ENERGYPLUS_PLATFORM "Darwin-macOS11.6-x86_64")
set(ENERGYPLUS_EXPECTED_HASH b6493ab5580f8b494b51cdfd0e583b9d)
set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-x86_64")
endif()
elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS")
set(ENERGYPLUS_EXPECTED_HASH c31dfb86d8967636fca0a1ecf4052f22)
set(ENERGYPLUS_EXPECTED_HASH 92764fe6197b35843236f2cc10c1513a)
set(ENERGYPLUS_PLATFORM "Linux-CentOS7.9.2009-x86_64")
else()
if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04")
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 2e1e9516b39ca8046b7cf79ad3a81fa7)
# set(ENERGYPLUS_EXPECTED_HASH 7ce649525157b6e18b170eb72916e83c) ???
else()
set(ENERGYPLUS_EXPECTED_HASH fb171a5da7d41da80da7868686b41126)
set(ENERGYPLUS_EXPECTED_HASH 67b3c4971de2b75fdcbf07cfdf3a77b1)
endif()
elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 7ce649525157b6e18b170eb72916e83c)
else()
set(ENERGYPLUS_EXPECTED_HASH 10c5e4d2d795de9ef94cbdb36d977578)
endif()
elseif(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
set(ENERGYPLUS_EXPECTED_HASH 4ea21126c3989cad35078a711573572e)
set(ENERGYPLUS_EXPECTED_HASH 47dd8f60252fab92b6f0859dd66806c1)
else() # 18.04
message(FATAL_ERROR "EnergyPlus no longer provides packages for Ubuntu 18.04")
endif()
Expand Down Expand Up @@ -692,11 +698,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 c9dd8a23b64d1327d00c5d85896b46bb)
set(ENERGYPLUS_EXPECTED_HASH 9aca9b49d6a0870cb639790604328899)
else()
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
set(ENERGYPLUS_ARCH 32)
set(ENERGYPLUS_EXPECTED_HASH 766cf42388ca5b682800fe6ded8ac3ee)
# set(ENERGYPLUS_EXPECTED_HASH 766cf42388ca5b682800fe6ded8ac3ee) ?
set(ENERGYPLUS_REPO "jmarrec")
endif()
if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip")
Expand Down
Loading
Loading