Fix some audit, rdd, and eio diffs

NREL · Dec 9, 2024 · b8b9473 · b8b9473 · nrel-bot-2c · Dec 9, 2024
1 parent aa645ef
commit b8b9473
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/EnergyPlus/Pumps.cc b/src/EnergyPlus/Pumps.cc
@@ -402,6 +402,7 @@ void GetPumpInput(EnergyPlusData &state)
             thisPump.HasVFD = true;
             thisPump.VFD.VFDControlType =
                 static_cast<ControlTypeVFD>(getEnumValue(controlTypeVFDNamesUC, Util::makeUPPER(state.dataIPShortCut->cAlphaArgs(7))));
+
             switch (thisPump.VFD.VFDControlType) {
 
             case ControlTypeVFD::VFDManual: {
@@ -412,11 +413,14 @@ void GetPumpInput(EnergyPlusData &state)
                     Sched::ShowSevereBadMin(state, eoh, thisInput->cAlphaFieldNames(8), thisInput->cAlphaArgs(8), Clusive::Ex, 0.0);
                     ErrorsFound = true;
                 }
+
+                thisPump.VFD.minRPMSched = Sched::GetScheduleAlwaysOff(state);
+                thisPump.VFD.maxRPMSched = Sched::GetScheduleAlwaysOff(state);
             } break;
 
             case ControlTypeVFD::VFDAutomatic: {
                 if (thisInput->lAlphaFieldBlanks(9)) {
-                    ShowSevereEmptyField(state, eoh, thisInput->cAlphaFieldNames(9));
+                    ShowSevereEmptyField(state, eoh, thisInput->cAlphaFieldNames(9));                        
                     ErrorsFound = true;
                 } else if ((thisPump.VFD.lowerPsetSched = Sched::GetSchedule(state, thisInput->cAlphaArgs(9))) == nullptr) {
                     ShowSevereItemNotFound(state, eoh, thisInput->cAlphaFieldNames(9), thisInput->cAlphaArgs(9));
@@ -432,8 +436,7 @@ void GetPumpInput(EnergyPlusData &state)
                 }
 
                 if (thisInput->lAlphaFieldBlanks(11)) {
-                    ShowSevereEmptyField(state, eoh, thisInput->cAlphaFieldNames(11));
-                    ErrorsFound = true;
+                    thisPump.VFD.minRPMSched = Sched::GetScheduleAlwaysOff(state);
                 } else if ((thisPump.VFD.minRPMSched = Sched::GetSchedule(state, thisInput->cAlphaArgs(11))) == nullptr) {
                     ShowSevereItemNotFound(state, eoh, thisInput->cAlphaFieldNames(11), thisInput->cAlphaArgs(11));
                     ErrorsFound = true;
@@ -443,8 +446,7 @@ void GetPumpInput(EnergyPlusData &state)
                 }
 
                 if (thisInput->lAlphaFieldBlanks(12)) {
-                    ShowSevereEmptyField(state, eoh, thisInput->cAlphaFieldNames(12));
-                    ErrorsFound = true;
+                    thisPump.VFD.maxRPMSched = Sched::GetScheduleAlwaysOff(state);
                 } else if ((thisPump.VFD.maxRPMSched = Sched::GetSchedule(state, thisInput->cAlphaArgs(12))) == nullptr) {
                     ShowSevereItemNotFound(state, eoh, thisInput->cAlphaFieldNames(12), thisInput->cAlphaArgs(12));
                     ErrorsFound = true;
@@ -599,7 +601,8 @@ void GetPumpInput(EnergyPlusData &state)
         }
 
         // Input the optional schedule for the pump
-        if (thisInput->lAlphaFieldBlanks(5)) { // Initialized to zero, don't get a schedule for an empty
+        if (thisInput->lAlphaFieldBlanks(5)) {
+            thisPump.sched = Sched::GetScheduleAlwaysOff(state);
         } else if ((thisPump.sched = Sched::GetSchedule(state, thisInput->cAlphaArgs(5))) == nullptr) {
             ShowWarningItemNotFound(state, eoh, thisInput->cAlphaFieldNames(5), thisInput->cAlphaArgs(5), "");
         }

diff --git a/src/EnergyPlus/ScheduleManager.cc b/src/EnergyPlus/ScheduleManager.cc
@@ -2136,7 +2136,7 @@ namespace Sched {
                         ++NumF;
                     }
                 }
-                TimeHHMM(NumF) = format("{}:{}", HrField[hr], ShowMinute(s_glob->TimeStepsInHour));
+                TimeHHMM(NumF) = format("{}:{}", HrField[hr+1], ShowMinute(s_glob->TimeStepsInHour));
                 ++NumF;
             }
             --NumF;
@@ -2213,7 +2213,7 @@ namespace Sched {
                 } break;
 
                 case ReportLevel::TimeStep: {
-                    for (int hr = 1; hr < Constant::iHoursInDay; ++hr) {
+                    for (int hr = 0; hr < Constant::iHoursInDay; ++hr) {
                         for (int ts = 0; ts < s_glob->TimeStepsInHour; ++ts) {
                             print(state.files.eio, SchDFmtdata, RoundTSValue(ts+1, hr+1));
                         }
@@ -3500,7 +3500,10 @@ namespace Sched {
         auto const &s_sched = state.dataSched;
 
         if (s_sched->DoScheduleReportingSetup) { // CurrentModuleObject='Any Schedule'
-           for (auto *sched : s_sched->schedules) {
+            for (auto *sched : s_sched->schedules) {
+                // No variables for the built-in AlwaysOn and AlwaysOff schedules 
+                if (sched->Num == SchedNum_AlwaysOff || sched->Num == SchedNum_AlwaysOn) continue;
+
                 // Set Up Reporting
                 SetupOutputVariable(state,
                                     "Schedule Value",

diff --git a/src/EnergyPlus/WeatherManager.cc b/src/EnergyPlus/WeatherManager.cc
@@ -6665,7 +6665,7 @@ namespace Weather {
                         ErrorsFound = true;
                     } else {
                         if (envFound != 0) {
-                            if (std::find(state.dataWeather->spSiteSchedNums.begin(), state.dataWeather->spSiteSchedNums.end(), Found) ==
+                            if (std::find(state.dataWeather->spSiteSchedNums.begin(), state.dataWeather->spSiteSchedNums.end(), wpSkyTemp.sched->Num) ==
                                 state.dataWeather->spSiteSchedNums.end()) {
                                 state.dataWeather->spSiteSchedNums.emplace_back(wpSkyTemp.sched->Num);
                                 SetupOutputVariable(state,