Merge remote-tracking branch 'origin/develop' into fixVRFhighCOP

NREL · Oct 7, 2024 · aba83c7 · aba83c7 · nrel-bot-2c · Oct 8, 2024
2 parents 55c51df + 94a8878
commit aba83c7
Show file tree

Hide file tree

Showing 4 changed files with 16,025 additions and 2 deletions.
diff --git a/src/EnergyPlus/MoistureBalanceEMPDManager.cc b/src/EnergyPlus/MoistureBalanceEMPDManager.cc
@@ -249,9 +249,9 @@ void GetMoistureBalanceEMPDInput(EnergyPlusData &state)
 
         auto const &constr = state.dataConstruction->Construct(surf.Construction);
         auto const *mat = dynamic_cast<const MaterialEMPD *>(s_mat->materials(constr.LayerPoint(constr.TotLayers)));
-        assert(mat != nullptr);
+        // assert(mat != nullptr);
 
-        if (mat->mu > 0.0 && surf.Zone > 0) {
+        if (mat && mat->mu > 0.0 && surf.Zone > 0) {
             EMPDzone(surf.Zone) = true;
         } else {
             ++state.dataMoistureBalEMPD->ErrCount;

diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt
@@ -763,6 +763,9 @@ add_simulation_test(IDF_FILE WCE_Interior_VB_-45_deg.idf EPW_FILE USA_IL_Chicago
 add_simulation_test(IDF_FILE _5ZoneAirCooled_annual.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw ANNUAL_SIMULATION)
 add_simulation_test(IDF_FILE _5ZoneAirCooled_LeapYear_annual.idf EPW_FILE MadeUpLeapYear.epw ANNUAL_SIMULATION)
 add_simulation_test(IDF_FILE UnitarySystem_MultiSpeedDX_EconoStaging.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw ANNUAL_SIMULATION)
+add_simulation_test(IDF_FILE _ResidentialBase.idf EPW_FILE USA_CO_Denver-Aurora-Buckley.AFB.724695_TMY3.epw ANNUAL_SIMULATION)
+add_simulation_test(IDF_FILE _ResidentialBaseboardHardSize.idf EPW_FILE USA_CO_Denver-Aurora-Buckley.AFB.724695_TMY3.epw)
+
 
 # ASHRAE 90.1-2019 DOE commercial prototype models
 add_simulation_test(IDF_FILE ASHRAE901_ApartmentHighRise_STD2019_Denver.idf EPW_FILE USA_CO_Denver-Aurora-Buckley.AFB.724695_TMY3.epw)