Round2 init state use

src/EnergyPlus/CurveManager.cc

@@ -61,7 +61,6 @@
 
 // EnergyPlus Headers
 #include <EnergyPlus/CurveManager.hh>
-#include <EnergyPlus/Data/EnergyPlusData.hh>
 #include <EnergyPlus/DataBranchAirLoopPlant.hh>
 #include <EnergyPlus/DataIPShortCuts.hh>
 #include <EnergyPlus/DataLoopNode.hh>
@@ -572,7 +571,6 @@ namespace Curve {
         bool GetInputErrorsFound = false;
 
         GetCurveInputData(state, GetInputErrorsFound);
-        state.dataCurveManager->GetCurvesInputFlag = false;
 
         if (GetInputErrorsFound) {
             ShowFatalError(state, "GetCurveInput: Errors found in getting Curve Objects.  Preceding condition(s) cause termination.");
@@ -611,6 +609,8 @@ namespace Curve {
         int IOStatus;                    // Used in GetObjectItem
         std::string CurrentModuleObject; // for ease in renaming.
 
+        if (!state.dataCurveManager->GetCurvesInputFlag) return;
+        state.dataCurveManager->GetCurvesInputFlag = false;
         // Find the number of each type of curve (note: Current Module object not used here, must rename manually)
 
         int const NumBiQuad = state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "Curve:Biquadratic");
@@ -653,6 +653,7 @@ namespace Curve {
         // initialize the array
 
         int CurveNum = 0; // keep track of the current curve index in the main curve array
+        state.dataCurveManager->UniqueCurveNames.clear();
 
         // Loop over biquadratic curves and load data
         CurrentModuleObject = "Curve:Biquadratic";

src/EnergyPlus/CurveManager.hh

@@ -65,6 +65,7 @@
 
 // EnergyPlus Headers
 #include <EnergyPlus/Data/BaseData.hh>
+#include <EnergyPlus/Data/EnergyPlusData.hh>
 #include <EnergyPlus/DataBranchAirLoopPlant.hh>
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/EPVector.hh>
@@ -469,8 +470,11 @@ struct CurveManagerData : BaseGlobalStruct
             this->PerfCurve.push_back(new EnergyPlus::Curve::Curve);
     }
 
-    void init_state([[maybe_unused]] EnergyPlusData &state) override
+    void init_state(EnergyPlusData &state) override
     {
+        Curve::GetCurveInput(state);
+        Curve::GetPressureSystemInput(state);
+        state.dataCurveManager->GetCurvesInputFlag = false;
     }
 
     void clear_state() override

src/EnergyPlus/Data/EnergyPlusData.cc

@@ -572,14 +572,18 @@ void EnergyPlusData::clear_state()
 void EnergyPlusData::init_state(EnergyPlusData &state)
 {
     if (this->init_state_called) return;
+
+    state.dataGlobal->InputsFlag = true;
     this->init_state_called = true;
     // The order in which we do this matters.  We're going to try to
     // do this in "topological" order meaning the first to go are the
     // objects that do not reference any other objects, like fluids,
     // schedules, curves, etc.
-    this->dataSimulationManager->init_state(state); // GetProjectData
+    this->dataSimulationManager->init_state(state); // OpenOutputFiles, GetProjectData, SetPreConstructionInputParameters
     this->dataFluidProps->init_state(state);        // GetFluidPropertiesData
     this->dataPsychrometrics->init_state(state);    // InitializePsychRoutines
+    this->dataScheduleMgr->init_state(state);       // ProcessScheduleInput - requires NumOfTimeStepInHour and AnyEnergyManagementSystemInModel
+    this->dataCurveManager->init_state(state);      // GetCurveInput, GetPressureSystemInput
 
     this->dataAirLoop->init_state(state);
     this->dataAirLoopHVACDOAS->init_state(state);
@@ -614,7 +618,6 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
     this->dataCoolTower->init_state(state);
     this->dataCostEstimateManager->init_state(state);
     this->dataCrossVentMgr->init_state(state);
-    this->dataCurveManager->init_state(state);
     this->dataDXCoils->init_state(state);
     this->dataDXFEarClipping->init_state(state);
     this->dataDaylightingDevices->init_state(state);
@@ -758,7 +761,6 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
     this->dataRuntimeLang->init_state(state);
     this->dataRuntimeLangProcessor->init_state(state);
     this->dataSQLiteProcedures->init_state(state);
-    this->dataScheduleMgr->init_state(state);
     this->dataSetPointManager->init_state(state);
     this->dataShadowComb->init_state(state);
     this->dataSimAirServingZones->init_state(state);
@@ -826,6 +828,8 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
     this->dataZoneEquipmentManager->init_state(state);
     this->dataZonePlenum->init_state(state);
     this->dataZoneTempPredictorCorrector->init_state(state);
+
+    state.dataGlobal->InputsFlag = false;
 }
 
 } // namespace EnergyPlus

src/EnergyPlus/DataErrorTracking.hh

@@ -210,6 +210,8 @@ struct ErrorTrackingData : BaseGlobalStruct
     int NumRecurringErrors = 0;              // Number of stored recurring error messages
     int TotalSevereErrors = 0;               // Counter
     int TotalWarningErrors = 0;              // Counter
+    int TotalSevereErrorsDuringInputs = 0;   // Counter
+    int TotalWarningErrorsDuringInputs = 0;  // Counter
     int TotalSevereErrorsDuringWarmup = 0;   // Counter
     int TotalWarningErrorsDuringWarmup = 0;  // Counter
     int TotalSevereErrorsDuringSizing = 0;   // Counter

src/EnergyPlus/DataGlobals.hh

@@ -111,6 +111,7 @@ struct DataGlobal : BaseGlobalStruct
     int numSpaceTypes = 0;           // Number of unique space types
     int TimeStep = 0;                // Counter for time steps (fractional hours)
     Real64 TimeStepZone = 0.0;       // Zone time step in fractional hours
+    bool InputsFlag = false;         // True during the init_state portion of a simulation
     bool WarmupFlag = false;         // True during the warmup portion of a simulation
     Int64 StdOutputRecordCount = 0;  // Count of Standard output records
     Int64 StdMeterRecordCount = 0;   // Count of Meter output records

src/EnergyPlus/ScheduleManager.hh

@@ -409,8 +409,10 @@ struct ScheduleManagerData : BaseGlobalStruct
     Array1D<ScheduleManager::WeekScheduleData> WeekSchedule; // Week Schedule Storage
     Array1D<ScheduleManager::ScheduleData> Schedule;         // Schedule Storage
 
-    void init_state([[maybe_unused]] EnergyPlusData &state) override
+    void init_state(EnergyPlusData &state) override
     {
+        ScheduleManager::ProcessScheduleInput(state);
+        ScheduleInputProcessed = true;
     }
 
     void clear_state() override

src/EnergyPlus/SimulationManager.cc

@@ -87,7 +87,6 @@ extern "C" {
 #include <EnergyPlus/DemandManager.hh>
 #include <EnergyPlus/DisplayRoutines.hh>
 #include <EnergyPlus/DualDuct.hh>
-#include <EnergyPlus/EMSManager.hh>
 #include <EnergyPlus/EconomicLifeCycleCost.hh>
 #include <EnergyPlus/EconomicTariff.hh>
 #include <EnergyPlus/ElectricPowerServiceManager.hh>
@@ -102,7 +101,6 @@ extern "C" {
 #include <EnergyPlus/HVACSizingSimulationManager.hh>
 #include <EnergyPlus/HeatBalanceAirManager.hh>
 #include <EnergyPlus/HeatBalanceIntRadExchange.hh>
-#include <EnergyPlus/HeatBalanceManager.hh>
 #include <EnergyPlus/HeatBalanceSurfaceManager.hh>
 #include <EnergyPlus/InputProcessing/InputProcessor.hh>
 #include <EnergyPlus/MixedAir.hh>
@@ -211,10 +209,11 @@ namespace SimulationManager {
 
         state.init_state(state);
 
+        // these checks report warnings for SimulationControl setup, no actual inputs are read in
         CheckForMisMatchedEnvironmentSpecifications(state);
         CheckForRequestedReporting(state);
+        // set up pre-defined reports, no actual inputs are read in
         OutputReportPredefined::SetPredefinedTables(state);
-        SetPreConstructionInputParameters(state); // establish array bounds for constructions early
 
         OutputProcessor::SetupTimePointers(
             state, OutputProcessor::TimeStepType::Zone, state.dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation
@@ -2635,7 +2634,6 @@ namespace SimulationManager {
         // there is no need to process that data if there are no DOAS used in the simulation
         state.dataGlobal->AirLoopHVACDOASUsedInSim =
             state.dataInputProcessing->inputProcessor->getNumObjectsFound(state, "AirLoopHVAC:DedicatedOutdoorAirSystem") > 0;
-        EMSManager::CheckIfAnyEMS(state);
         PlantManager::CheckIfAnyPlant(state);
         PlantPipingSystemsManager::CheckIfAnySlabs(state);
         PlantPipingSystemsManager::CheckIfAnyBasements(state);

src/EnergyPlus/SimulationManager.hh

@@ -50,8 +50,10 @@
 
 // EnergyPlus Headers
 #include <EnergyPlus/Data/BaseData.hh>
+#include <EnergyPlus/EMSManager.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 #include <EnergyPlus/FileSystem.hh>
+#include <EnergyPlus/HeatBalanceManager.hh>
 
 namespace EnergyPlus {
 
@@ -103,6 +105,8 @@ struct SimulationManagerData : BaseGlobalStruct
     {
         SimulationManager::OpenOutputFiles(state);
         SimulationManager::GetProjectData(state);
+        EMSManager::CheckIfAnyEMS(state);                             // required prior to ProcessScheduleInput
+        HeatBalanceManager::SetPreConstructionInputParameters(state); // establish array bounds for constructions early
     }
 
     void clear_state() override

src/EnergyPlus/UtilityRoutines.cc

@@ -548,8 +548,10 @@ int AbortEnergyPlus(EnergyPlusData &state)
     CloseMiscOpenFiles(state);
     NumWarnings = fmt::to_string(state.dataErrTracking->TotalWarningErrors);
     NumSevere = fmt::to_string(state.dataErrTracking->TotalSevereErrors);
-    NumWarningsDuringWarmup = fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringWarmup);
-    NumSevereDuringWarmup = fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringWarmup);
+    NumWarningsDuringWarmup =
+        fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringWarmup + state.dataErrTracking->TotalWarningErrorsDuringInputs);
+    NumSevereDuringWarmup =
+        fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringWarmup + state.dataErrTracking->TotalSevereErrorsDuringInputs);
     NumWarningsDuringSizing = fmt::to_string(state.dataErrTracking->TotalWarningErrorsDuringSizing);
     NumSevereDuringSizing = fmt::to_string(state.dataErrTracking->TotalSevereErrorsDuringSizing);
 
@@ -928,6 +930,7 @@ void ShowSevereError(EnergyPlusData &state, std::string const &ErrorMessage, Opt
     }
 
     ++state.dataErrTracking->TotalSevereErrors;
+    if (state.dataGlobal->InputsFlag) ++state.dataErrTracking->TotalSevereErrorsDuringInputs;
     if (state.dataGlobal->WarmupFlag && !state.dataGlobal->DoingSizing && !state.dataGlobal->KickOffSimulation &&
         !state.dataErrTracking->AbortProcessing)
         ++state.dataErrTracking->TotalSevereErrorsDuringWarmup;
@@ -1129,6 +1132,7 @@ void ShowWarningError(EnergyPlusData &state, std::string const &ErrorMessage, Op
     }
 
     ++state.dataErrTracking->TotalWarningErrors;
+    if (state.dataGlobal->InputsFlag) ++state.dataErrTracking->TotalWarningErrorsDuringInputs;
     if (state.dataGlobal->WarmupFlag && !state.dataGlobal->DoingSizing && !state.dataGlobal->KickOffSimulation &&
         !state.dataErrTracking->AbortProcessing)
         ++state.dataErrTracking->TotalWarningErrorsDuringWarmup;

tst/EnergyPlus/unit/DXCoils.unit.cc

@@ -4633,7 +4633,7 @@ TEST_F(EnergyPlusFixture, TestMultiSpeedCoilsAutoSizingOutput)
  DX Cooling Coil AHRI 2023 Standard Rating Information, Coil:Cooling:DX:MultiSpeed, ASHP CLG COIL, 31156.1, 3.73, 12.72, 15.17, 15.98, 15.0
 )EIO";
     replace_pipes_with_spaces(clg_coil_eio_output);
-    EXPECT_TRUE(compare_eio_stream_substring(clg_coil_eio_output, true));
+    EXPECT_TRUE(compare_eio_stream(clg_coil_eio_output, true));
 
     // check multi-speed DX heating coil
     EXPECT_EQ("ASHP HTG COIL", state->dataDXCoils->DXCoil(2).Name);

tst/EnergyPlus/unit/Fixtures/EnergyPlusFixture.cc

@@ -183,15 +183,6 @@ bool EnergyPlusFixture::compare_eio_stream(std::string const &expected_string, b
     return are_equal;
 }
 
-bool EnergyPlusFixture::compare_eio_stream_substring(std::string const &search_string, bool reset_stream)
-{
-    auto const stream_str = state->files.eio.get_output();
-    bool const found = stream_str.find(search_string) != std::string::npos;
-    EXPECT_TRUE(found);
-    if (reset_stream) state->files.eio.open_as_stringstream();
-    return found;
-}
-
 bool EnergyPlusFixture::compare_mtr_stream(std::string const &expected_string, bool reset_stream)
 {
     auto const stream_str = state->files.mtr.get_output();
@@ -360,7 +351,7 @@ bool EnergyPlusFixture::process_idf(std::string_view const idf_snippet, bool use
     inputProcessor->initializeMaps();
     SimulationManager::PostIPProcessing(*state);
 
-    state->init_state(*state);
+    FluidProperties::GetFluidPropertiesData(*state);
 
     if (state->dataSQLiteProcedures->sqlite) {
         bool writeOutputToSQLite = false;

tst/EnergyPlus/unit/Fixtures/EnergyPlusFixture.hh

@@ -171,13 +171,6 @@ protected:
     // Will return true if string matches the stream and false if it does not
     bool compare_eio_stream(std::string const &expected_string, bool reset_stream = true);
 
-    // Check if EIO string contains a substring. The default is to reset the EIO stream after every call.
-    // It is easier to test successive functions if the EIO stream is 'empty' before the next call.
-    // This calls EXPECT_* within the function as well as returns a boolean so you can call [ASSERT/EXPECT]_[TRUE/FALSE] depending
-    // if it makes sense for the unit test to continue after returning from function.
-    // Will return true if string matches the stream and false if it does not
-    bool compare_eio_stream_substring(std::string const &expected_string, bool reset_stream = true);
-
     // Compare an expected string against the MTR stream. The default is to reset the MTR stream after every call.
     // It is easier to test successive functions if the MTR stream is 'empty' before the next call.
     // This calls EXPECT_* within the function as well as returns a boolean so you can call [ASSERT/EXPECT]_[TRUE/FALSE] depending

tst/EnergyPlus/unit/Furnaces.unit.cc

@@ -87,7 +87,7 @@ namespace EnergyPlus {
 TEST_F(EnergyPlusFixture, SetVSHPAirFlowTest_VSFurnaceFlowTest)
 {
 
-    state->init_state(*state);
+    state->init_state(*state); // get FluidProperties
     int FurnaceNum(1);
     Real64 OnOffAirFlowRatio; // This is a return value
     Real64 PartLoadRatio(1.0);

tst/EnergyPlus/unit/MixedAir.unit.cc

@@ -6563,10 +6563,10 @@ TEST_F(EnergyPlusFixture, CO2ControlDesignOARateTest)
         "   **   ~~~   ** This may be overriding desired ventilation controls. Check inputs for Minimum Outdoor Air Flow Rate, Minimum Outdoor Air "
         "Schedule Name and Controller:MechanicalVentilation",
         "   **   ~~~   ** Minimum OA fraction = 2.9412E-003, Mech Vent OA fraction = 1.5603E-003",
-        "   **   ~~~   **  Environment=, at Simulation time= 00:00 - 00:00",
+        "   **   ~~~   **  Environment=, at Simulation time= 00:15 - 00:15",
     });
 
-    EXPECT_TRUE(compare_err_stream_substring(error_string, true));
+    EXPECT_TRUE(compare_err_stream(error_string, true));
 
     state->dataAirLoop->AirLoopControlInfo.deallocate();
     state->dataSize->OARequirements.deallocate();

tst/EnergyPlus/unit/OutdoorAirUnit.unit.cc

@@ -378,7 +378,7 @@ TEST_F(EnergyPlusFixture, OutdoorAirUnit_AutoSize)
         "   **   ~~~   ** Air mass balance is required by other outdoor air units: Fan:ZoneExhaust, ZoneMixing, ZoneCrossMixing, or other air flow "
         "control inputs.",
         "   **   ~~~   ** The outdoor mass flow rate = 0.602 and the exhaust mass flow rate = 0.000.",
-        "   **   ~~~   **  Environment=, at Simulation time= 00:00 - 00:00",
+        "   **   ~~~   **  Environment=, at Simulation time= 00:15 - 00:15",
     });
 
     EXPECT_TRUE(compare_err_stream(error_string, true));

tst/EnergyPlus/unit/OutputFiles.unit.cc

@@ -276,6 +276,8 @@ TEST_F(EnergyPlusFixture, OutputControlFiles)
         "   **   ~~~   **  See InputOutputReference document for more details.",
         "   ************* Object=Building=Bldg",
         "   **   ~~~   ** Object=GlobalGeometryRules",
+        "   **   ~~~   ** Object=Timestep",
+        "   **   ~~~   ** Object=Version",
     });
 
     compare_err_stream(expected_error);