Round2 init state use

src/EnergyPlus/CurveManager.cc

@@ -571,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.");
@@ -610,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");

src/EnergyPlus/Data/EnergyPlusData.cc

@@ -572,6 +572,8 @@ 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
@@ -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/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;