First round of fixes

NREL · Dec 7, 2024 · d0b7ff9 · d0b7ff9 · nrel-bot-2c · Dec 7, 2024
1 parent 6a339a8
commit d0b7ff9
Show file tree

Hide file tree

Showing 18 changed files with 354 additions and 469 deletions.
diff --git a/src/EnergyPlus/AirflowNetwork/src/Solver.cpp b/src/EnergyPlus/AirflowNetwork/src/Solver.cpp
@@ -3283,7 +3283,7 @@ namespace AirflowNetwork {
                 case VentControlType::CEN15251:
                 case VentControlType::NoVent:
                 case VentControlType::ZoneLevel: {
-                    MultizoneSurfaceData(i).ventSched = nullptr;
+                    MultizoneSurfaceData(i).ventSched = Sched::GetScheduleAlwaysOff(m_state);
                     MultizoneSurfaceData(i).VentSchName = "";
                 } break;
                 default:

diff --git a/src/EnergyPlus/Data/EnergyPlusData.cc b/src/EnergyPlus/Data/EnergyPlusData.cc
@@ -578,9 +578,11 @@ void EnergyPlusData::init_constant_state(EnergyPlusData &state)
 
     this->init_constant_state_called = true;
 
-    this->dataSimulationManager->init_constant_state(state); // GetProjectData
-    this->dataFluidProps->init_constant_state(state);        // GetFluidPropertiesData
-    this->dataPsychrometrics->init_constant_state(state);    // InitializePsychRoutines
+    // The order of these should not matter, but we are mirroring init_state() order which does matter.
+    this->dataSimulationManager->init_constant_state(state); 
+    this->dataEMSMgr->init_constant_state(state);            
+    this->dataFluidProps->init_constant_state(state);        
+    this->dataPsychrometrics->init_constant_state(state);    
     this->dataSched->init_constant_state(state);
 
     this->dataAirLoop->init_constant_state(state);
@@ -629,7 +631,6 @@ void EnergyPlusData::init_constant_state(EnergyPlusData &state)
     this->dataDualDuct->init_constant_state(state);
     this->dataEIRFuelFiredHeatPump->init_constant_state(state);
     this->dataEIRPlantLoopHeatPump->init_constant_state(state);
-    this->dataEMSMgr->init_constant_state(state);
     this->dataEarthTube->init_constant_state(state);
     this->dataEcoRoofMgr->init_constant_state(state);
     this->dataEconLifeCycleCost->init_constant_state(state);
@@ -842,9 +843,10 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
     // objects that do not reference any other objects, like fluids,
     // schedules, curves, etc.
     this->dataSimulationManager->init_state(state); // GetProjectData
+    this->dataEMSMgr->init_state(state);            // CheckIfAnyEMS
     this->dataFluidProps->init_state(state);        // GetFluidPropertiesData
     this->dataPsychrometrics->init_state(state);    // InitializePsychRoutines
-    this->dataSched->init_state(state);
+    this->dataSched->init_state(state);             // GetScheduleData
 
     this->dataAirLoop->init_state(state);
     this->dataAirLoopHVACDOAS->init_state(state);
@@ -892,7 +894,6 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
     this->dataDualDuct->init_state(state);
     this->dataEIRFuelFiredHeatPump->init_state(state);
     this->dataEIRPlantLoopHeatPump->init_state(state);
-    this->dataEMSMgr->init_state(state);
     this->dataEarthTube->init_state(state);
     this->dataEcoRoofMgr->init_state(state);
     this->dataEconLifeCycleCost->init_state(state);

diff --git a/src/EnergyPlus/DataRuntimeLanguage.hh b/src/EnergyPlus/DataRuntimeLanguage.hh
@@ -806,9 +806,7 @@ struct RuntimeLanguageData : BaseGlobalStruct
     DataRuntimeLanguage::ErlValueType True = DataRuntimeLanguage::ErlValueType(
         DataRuntimeLanguage::Value::Null, 0.0, "", 0, 0, false, 0, "", true); // special "True" Erl variable value instance, gets reset
 
-    // EMS Actuator fast duplicate check lookup support
-    std::unordered_set<std::tuple<std::string, std::string, std::string>, DataRuntimeLanguage::EMSActuatorKey_hash>
-        EMSActuator_lookup; // Fast duplicate lookup structure
+    std::map<std::tuple<std::string_view, std::string_view, std::string_view>, int> EMSActuatorAvailableMap;
 
     void init_constant_state([[maybe_unused]] EnergyPlusData &state) override
     {
@@ -865,10 +863,11 @@ struct RuntimeLanguageData : BaseGlobalStruct
         this->EMSInternalVarsAvailable.deallocate();
         this->EMSInternalVarsUsed.deallocate();
         this->EMSProgramCallManager.deallocate();
-        this->EMSActuator_lookup.clear();
         this->Null = DataRuntimeLanguage::ErlValueType(DataRuntimeLanguage::Value::Null, 0.0, "", 0, 0, false, 0, "", true);
         this->False = DataRuntimeLanguage::ErlValueType(DataRuntimeLanguage::Value::Null, 0.0, "", 0, 0, false, 0, "", true);
         this->True = DataRuntimeLanguage::ErlValueType(DataRuntimeLanguage::Value::Null, 0.0, "", 0, 0, false, 0, "", true);
+
+        this->EMSActuatorAvailableMap.clear();
     }
 };
 

diff --git a/src/EnergyPlus/DaylightingDevices.cc b/src/EnergyPlus/DaylightingDevices.cc
@@ -919,7 +919,8 @@ namespace Dayltg {
                             state.dataDaylightingDevices->GetShelfInputErrorsFound = true;
                         }
 
-                        if (state.dataSurface->Surface(SurfNum).shadowSurfSched != nullptr) {
+                        if (state.dataSurface->Surface(SurfNum).shadowSurfSched != nullptr &&
+                            state.dataSurface->Surface(SurfNum).shadowSurfSched != Sched::GetScheduleAlwaysOff(state)) {
                             ShowSevereError(state,
                                             format("{} = {}:  Outside shelf {} must not have a transmittance schedule.",
                                                    cCurrentModuleObject,