From 059ea82a2a07cb6ea30ce149be9b44bf5e26cdbb Mon Sep 17 00:00:00 2001 From: amirroth Date: Sun, 25 Aug 2024 12:50:10 -0400 Subject: [PATCH 1/2] Fix bug introduced in previous PR --- src/EnergyPlus/SolarShading.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/EnergyPlus/SolarShading.cc b/src/EnergyPlus/SolarShading.cc index 08e52b8fef0..7458b06f22c 100644 --- a/src/EnergyPlus/SolarShading.cc +++ b/src/EnergyPlus/SolarShading.cc @@ -6441,7 +6441,7 @@ void CalcInteriorSolarDistribution(EnergyPlusData &state) if (state.dataSurface->SurfWinWindowModelType(SurfNum) != WindowModel::EQL && ANY_BLIND(ShadeFlag)) { int SlatsAngIndexLower = state.dataSurface->SurfWinSlatsAngIndex(SurfNum); int ProfAngIndexLower = state.dataSurface->SurfWinProfAngIndex(SurfNum); - int SlatsAngIndexUpper = std::min(Material::MaxProfAngs, SlatsAngIndexLower + 1); + int SlatsAngIndexUpper = std::min(Material::MaxSlatAngs, SlatsAngIndexLower + 1); int ProfAngIndexUpper = std::min(Material::MaxProfAngs, ProfAngIndexLower + 1); Real64 SlatsAngInterpFac = state.dataSurface->SurfWinSlatsAngInterpFac(SurfNum); Real64 ProfAngInterpFac = state.dataSurface->SurfWinProfAngInterpFac(SurfNum); @@ -7583,7 +7583,7 @@ void CalcInteriorSolarDistribution(EnergyPlusData &state) int SlatsAngIndexLowerBack = state.dataSurface->SurfWinSlatsAngIndex(BackSurfNum); int ProfAngIndexLowerBack = state.dataSurface->SurfWinProfAngIndex(BackSurfNum); - int SlatsAngIndexUpperBack = std::min(Material::MaxProfAngs, SlatsAngIndexLowerBack + 1); + int SlatsAngIndexUpperBack = std::min(Material::MaxSlatAngs, SlatsAngIndexLowerBack + 1); int ProfAngIndexUpperBack = std::min(Material::MaxProfAngs, ProfAngIndexLowerBack + 1); Real64 SlatsAngInterpFacBack = state.dataSurface->SurfWinSlatsAngInterpFac(BackSurfNum); Real64 ProfAngInterpFacBack = state.dataSurface->SurfWinProfAngInterpFac(BackSurfNum); From 8a1341f8f8ad3e4b9b8e9c10a7d13a53cc6c599d Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Wed, 28 Aug 2024 07:39:49 -0500 Subject: [PATCH 2/2] Remove third party nested gtest folder --- third_party/btwxt/vendor/courierr/vendor/googletest | 1 - 1 file changed, 1 deletion(-) delete mode 160000 third_party/btwxt/vendor/courierr/vendor/googletest diff --git a/third_party/btwxt/vendor/courierr/vendor/googletest b/third_party/btwxt/vendor/courierr/vendor/googletest deleted file mode 160000 index e2239ee6043..00000000000 --- a/third_party/btwxt/vendor/courierr/vendor/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e2239ee6043f73722e7aa812a459f54a28552929