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.

Sign up for GitHub

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

Jump to bottom

Update to v22.1.0-IOFreeze #4540

Merged
merged 34 commits into from
Mar 23, 2022
Merged

Update to v22.1.0-IOFreeze #4540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f81a653
Update cmakelists for new eplus versions.
joseph-robertson Feb 24, 2022
b84ff9a
Update proposed idd.
joseph-robertson Feb 24, 2022
2ff029e
Updates to os idd.
joseph-robertson Feb 24, 2022
94522bf
Update ft hpp.
joseph-robertson Feb 24, 2022
f53f036
Updates for schedule file.
joseph-robertson Feb 24, 2022
be328c7
Clang format.
joseph-robertson Feb 24, 2022
feb0ed3
Cleanup.
joseph-robertson Feb 26, 2022
0f01437
More updates for version.
joseph-robertson Feb 28, 2022
a19335f
Updates for window property frame and divider.
joseph-robertson Feb 28, 2022
e40c7ed
Clang format.
joseph-robertson Feb 28, 2022
176a016
Sql file updates.
joseph-robertson Feb 28, 2022
b659dcb
Clang format.
joseph-robertson Feb 28, 2022
ae7a0bc
Update new sql.
joseph-robertson Feb 28, 2022
1f5e35f
Clean up proposed idd.
joseph-robertson Feb 28, 2022
00b008d
Allow eplus version to have more major digits.
joseph-robertson Feb 28, 2022
6bc02d4
Merge branch 'develop' into v22.1.0-IOFreeze
joseph-robertson Feb 28, 2022
8b1b27a
Rename new sql file.
joseph-robertson Feb 28, 2022
3cf6321
Minor stuff in os idd.
joseph-robertson Mar 1, 2022
eeec365
Update surf prop cc model test.
joseph-robertson Mar 1, 2022
c804a5c
Fix setter in window prop frame and dividier.
joseph-robertson Mar 1, 2022
99bd270
Merge branch 'develop' into v22.1.0-IOFreeze
joseph-robertson Mar 3, 2022
fec1f73
Update getters for cooling towers.
joseph-robertson Mar 7, 2022
7590bd8
Update model tests.
joseph-robertson Mar 7, 2022
12646aa
Clang format.
joseph-robertson Mar 7, 2022
88f58c0
Fixes and additions for plant loop.
joseph-robertson Mar 7, 2022
092de3d
Add valid values methods for consistency.
joseph-robertson Mar 7, 2022
400c2bc
Few fixes.
joseph-robertson Mar 8, 2022
82abf91
Merge branch 'develop' into v22.1.0-IOFreeze
joseph-robertson Mar 10, 2022
18c0272
Update CMakeLists.txt to put back arm64 block
jmarrec Mar 14, 2022
74424e8
Merge branch 'develop' into issue-4531
joseph-robertson Mar 14, 2022
6e9ba6d
Add defaulted method for common pipe simulation, and new model test.
joseph-robertson Mar 14, 2022
16eb7db
Merge branch 'v22.1.0-IOFreeze' into issue-4531
joseph-robertson Mar 14, 2022
591f144
Update test.
joseph-robertson Mar 14, 2022
313107d
Merge pull request #4548 from NREL/issue-4531
jmarrec Mar 16, 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
22 changes: 11 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
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.3.1)
project(OpenStudio VERSION 3.4.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 @@ -186,16 +186,16 @@ if(hasParent)
endif()

# EnergyPlus Idd version
set(ENERGYPLUS_VERSION_MAJOR 9)
set(ENERGYPLUS_VERSION_MINOR 6)
set(ENERGYPLUS_VERSION_MAJOR 22)
set(ENERGYPLUS_VERSION_MINOR 1)
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 "4b123cf80f")
set(ENERGYPLUS_BUILD_SHA "4fa778ec59")

# ENERGYPLUS_RELEASE_NAME is used to locate the E+ download
# from the github releases
set(ENERGYPLUS_RELEASE_NAME "v9.6.0_PlusSpaceFix1")
set(ENERGYPLUS_RELEASE_NAME "v22.1.0-IOFreeze")

# Radiance
set(RADIANCE_VERSION "5.0.a.12")
Expand Down Expand Up @@ -580,10 +580,10 @@ endif()
if(UNIX)
if(APPLE)
if (ARCH MATCHES "arm64")
set(ENERGYPLUS_EXPECTED_HASH 104a0c77e4e60a457e295f9d7591d7ad)
set(ENERGYPLUS_EXPECTED_HASH c1f5db40f79ea531de9b38dc10850809)
set(ENERGYPLUS_PLATFORM "Darwin-macOS11.2-arm64")
else()
set(ENERGYPLUS_EXPECTED_HASH e330eb7b658cb0987d4fee27cf956659)
set(ENERGYPLUS_EXPECTED_HASH 54aabff4be7645d81aa181a425cf775a)
set(ENERGYPLUS_PLATFORM "Darwin-macOS10.15-x86_64")
endif()
elseif(EXISTS "/etc/redhat-release")
Expand All @@ -592,9 +592,9 @@ if(UNIX)
set(ENERGYPLUS_PLATFORM "Redhat-x86_64")
else()
if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
set(ENERGYPLUS_EXPECTED_HASH 3a725c159b9196655156c0944173e8a3)
set(ENERGYPLUS_EXPECTED_HASH 0e6a0f5b555fb81ab9484f97d7a36cde)
else() # 18.04
set(ENERGYPLUS_EXPECTED_HASH 4e48feacb8fd25cb51255fe5e1fe5f20)
set(ENERGYPLUS_EXPECTED_HASH bd4962a2bdad6bb49946ebf3d641b453)
endif()
set(ENERGYPLUS_PLATFORM "Linux${ENERGYPLUS_SYSTEM_VERSION}-x86_64")
endif()
Expand Down Expand Up @@ -626,11 +626,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 c2c99502daac7f8ec0eb9e9bc307ba59)
set(ENERGYPLUS_EXPECTED_HASH 5273ef6bf4a7ecb5eed65938a589a77f)
else()
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
set(ENERGYPLUS_ARCH 32)
set(ENERGYPLUS_EXPECTED_HASH 98c54dd9034e7db96a903c5bd726d268)
set(ENERGYPLUS_EXPECTED_HASH e328305e1d81001b2172369a86edaf52)
endif()
if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip")
file(MD5 "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip" ENERGYPLUS_HASH)
Expand Down
1 change: 1 addition & 0 deletions resources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ set(utilities_resources_src
utilities/SqlFile/1ZoneEvapCooler-V9-4-0.sql
utilities/SqlFile/1ZoneEvapCooler-V9-5-0.sql
utilities/SqlFile/1ZoneEvapCooler-V9-6-0.sql
utilities/SqlFile/1ZoneEvapCooler-V22-1-0.sql
utilities/Zip/test1.zip
)

Expand Down