diff --git a/CMakeLists.txt b/CMakeLists.txt index 7777bfd0aca..b12e7d9ddb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,11 +194,11 @@ 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 "c854ba6bfe") +set(ENERGYPLUS_BUILD_SHA "7636e6b3e9") # ENERGYPLUS_RELEASE_NAME is used to locate the E+ download # from the github releases -set(ENERGYPLUS_RELEASE_NAME "v23.2.0-IOFreeze") +set(ENERGYPLUS_RELEASE_NAME "v23.2.0") set(ENERGYPLUS_REPO "NREL") @@ -625,25 +625,25 @@ endif() if(UNIX) if(APPLE) if (ARCH MATCHES "arm64") - set(ENERGYPLUS_EXPECTED_HASH e9b7bb608d59c9d56086ce5d11675b79) + set(ENERGYPLUS_EXPECTED_HASH 918a4544793aafc32df5910c83f05f1a) set(ENERGYPLUS_PLATFORM "Darwin-macOS12.1-arm64") else() - set(ENERGYPLUS_EXPECTED_HASH 7d0529d830c44435ac8fef55046f3f50) + set(ENERGYPLUS_EXPECTED_HASH b8c1ee3fe45318a4575078de07cc5656) set(ENERGYPLUS_PLATFORM "Darwin-macOS10.15-x86_64") endif() elseif(LSB_RELEASE_ID_SHORT MATCHES "CentOS") # TODO: There aren't any redhat releases anymore, see PR #3145 too - set(ENERGYPLUS_EXPECTED_HASH d86b59f08e6f47ac9110a4ddf8e6cdcd) + set(ENERGYPLUS_EXPECTED_HASH 0edcf8a13c7f0e05b65e1559cb7624cd) set(ENERGYPLUS_PLATFORM "Linux-CentOS7.9.2009-x86_64") else() if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04") if (ARCH MATCHES "arm64") - set(ENERGYPLUS_EXPECTED_HASH 1a440609a037316d10e590028e22baca) + set(ENERGYPLUS_EXPECTED_HASH 363c537aff1f9c664192451139a85964) else() - set(ENERGYPLUS_EXPECTED_HASH 42983212f5c43dde01345671e228fa8c) + set(ENERGYPLUS_EXPECTED_HASH 773dc61ddb6f3dc633ac4df0bdaa3337) endif() elseif(LSB_RELEASE_VERSION_SHORT MATCHES "20.04") - set(ENERGYPLUS_EXPECTED_HASH 9d9ea4c05c96a7def4384cffd056e4d6) + set(ENERGYPLUS_EXPECTED_HASH b8644c02e287e3ffee89023e98ac5a13) else() # 18.04 message(FATAL_ERROR "EnergyPlus no longer provides packages for Ubuntu 18.04") endif() @@ -679,11 +679,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 b70fcf8685fbc461cb245c60986ef024) + set(ENERGYPLUS_EXPECTED_HASH 7fbc694629ba6abbe400854661ebe1ae) else() set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386") set(ENERGYPLUS_ARCH 32) - set(ENERGYPLUS_EXPECTED_HASH b7ed694efe0dc4e946420f7b9421393d) + set(ENERGYPLUS_EXPECTED_HASH TODO_TDB_TODO) # TODO: not posted on the release page yet endif() if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip") file(MD5 "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip" ENERGYPLUS_HASH) diff --git a/resources/energyplus/ProposedEnergy+.idd b/resources/energyplus/ProposedEnergy+.idd index 7aef3a2a4a5..33a501c7b26 100644 --- a/resources/energyplus/ProposedEnergy+.idd +++ b/resources/energyplus/ProposedEnergy+.idd @@ -13845,14 +13845,14 @@ ZoneEarthtube:Parameters, \maximum 10 \default 3 N3, \field Earth Tube Dimensionless Boundary Above - \note When set to 1.0, the upper boundary is one earth tube radius below ground. + \note When set to 1.0, the total thickness of the solution space above the earth tube node is equal to the maximum vertical dimension above the earth tube. \type real \units dimensionless \minimum 0.25 \maximum 1.0 \default 1.0 N4, \field Earth Tube Dimensionless Boundary Below - \note When set to 1.0, the lower boundary is one earth tube radius below the earth tube. + \note When set to 1.0, the total thickness of the solution space below the earth tube node is equal to the maximum vertical dimension above the earth tube. \type real \units dimensionless \minimum 0.25 diff --git a/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.idf b/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.idf index ddfc6f98b4c..04939cf8ea5 100644 --- a/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.idf +++ b/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.idf @@ -640,3 +640,4 @@ Output:SQLite, SimpleAndTabular; !- Option Type + diff --git a/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.sql b/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.sql index dd776b64ba1..2fa72811fac 100644 Binary files a/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.sql and b/resources/utilities/SqlFile/1ZoneEvapCooler-V23-2-0.sql differ diff --git a/resources/utilities/SqlFile/update_all.sh b/resources/utilities/SqlFile/update_all.sh index db03c3a7a7c..9b096926a65 100755 --- a/resources/utilities/SqlFile/update_all.sh +++ b/resources/utilities/SqlFile/update_all.sh @@ -8,7 +8,7 @@ fi; # All versions you want to run # declare -a all_versions=("8.5.0" "8.6.0" "8.7.0" "8.8.0" "8.9.0" "9.0.1" "9.1.0" "9.2.0" "9.3.0", "9.4.0", "9.5.0", "9.6.0", "22.1.0", "22.2.0", "23.1.0", "23.2.0") -declare -a all_versions=("23.2.0-IOFreeze") +declare -a all_versions=("23.2.0") # DO NOT RERUN IF SQL ALREADY THERE rerun_if_already_there=false @@ -52,7 +52,7 @@ for ep_version in "${all_versions[@]}"; do fi; # If not already installed, get it from GitHub - ep_exe=$(find /usr/local/EnergyPlus-$ep_version_dash -name "energyplus") + ep_exe=$(find /usr/local/EnergyPlus-$ep_version_dash -maxdepth 1 -name "energyplus") if [ -z "$ep_exe" ]; then # Prefer using the tar.gz (doesn't require install via sh, which needs sudo generally speaking, and more importantly needs manual input) diff --git a/src/utilities/sql/Test/SqlFile_GTest.cpp b/src/utilities/sql/Test/SqlFile_GTest.cpp index f7f1799a2c8..dff4f800657 100644 --- a/src/utilities/sql/Test/SqlFile_GTest.cpp +++ b/src/utilities/sql/Test/SqlFile_GTest.cpp @@ -75,15 +75,10 @@ TEST_F(SqlFileFixture, FuelTypes) { EXPECT_NEAR(409.97, *(sqlFile3.districtCoolingTotalEndUses()), 2); EXPECT_NEAR(378.43, *(sqlFile3.districtHeatingWaterExteriorEquipment()), 2); EXPECT_NEAR(378.43, *(sqlFile3.districtHeatingWaterTotalEndUses()), 2); - if (energyPlusBuildSHA() == "c854ba6bfe") { - GTEST_SKIP() << "\nFIXME: Skip the checks for DistrictHeatingSteam pending new E+ package after https://github.com/NREL/EnergyPlus/pull/10212\n"; - } else { - EXPECT_TRUE(false) << "Please come remove the special check now that a new E+ package is out"; - EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamExteriorEquipment()), 2); - EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamTotalEndUses()), 2); - EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingExteriorEquipment()), 2); - EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingTotalEndUses()), 2); - } + EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamExteriorEquipment()), 2); + EXPECT_NEAR(346.90, *(sqlFile3.districtHeatingSteamTotalEndUses()), 2); + EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingExteriorEquipment()), 2); + EXPECT_NEAR(725.33, *(sqlFile3.districtHeatingTotalEndUses()), 2); } TEST_F(SqlFileFixture, EnvPeriods) {