A few cases that didn't pass visual code inspection

NREL · Dec 23, 2024 · d26c66d · d26c66d · nrel-bot-2 · Dec 23, 2024
1 parent c6833bb
commit d26c66d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 30 deletions.
diff --git a/src/EnergyPlus/DemandManager.cc b/src/EnergyPlus/DemandManager.cc
@@ -357,44 +357,45 @@ void GetDemandManagerListInput(EnergyPlusData &state)
                 ShowContinueError(state, format("Entered in {} = {}", cCurrentModuleObject, thisDemandMgrList.Name));
                 ErrorsFound = true;
 
+            } else if ((state.dataOutputProcessor->meters[thisDemandMgrList.Meter]->resource == Constant::eResource::Electricity) ||
+                       (state.dataOutputProcessor->meters[thisDemandMgrList.Meter]->resource == Constant::eResource::ElectricityNet)) {
             } else {
-                if ((state.dataOutputProcessor->meters[thisDemandMgrList.Meter]->resource == Constant::eResource::Electricity) ||
-                    (state.dataOutputProcessor->meters[thisDemandMgrList.Meter]->resource == Constant::eResource::ElectricityNet)) {
-                } else {
-                    ShowSevereError(state,
-                                    format("{} = \"{}\" invalid value {} = \"{}\".",
-                                           cCurrentModuleObject,
-                                           thisDemandMgrList.Name,
-                                           s_ipsc->cAlphaFieldNames(2),
-                                           s_ipsc->cAlphaArgs(2)));
-                    ShowContinueError(state, "Only Electricity and ElectricityNet meters are currently allowed.");
-                    ErrorsFound = true;
-                }
+                ShowSevereError(state,
+                                format("{} = \"{}\" invalid value {} = \"{}\".",
+                                       cCurrentModuleObject,
+                                       thisDemandMgrList.Name,
+                                       s_ipsc->cAlphaFieldNames(2),
+                                       s_ipsc->cAlphaArgs(2)));
+                ShowContinueError(state, "Only Electricity and ElectricityNet meters are currently allowed.");
+                ErrorsFound = true;
             }
 
             // Further checking for conflicting DEMAND MANAGER LISTs
 
-            if (!s_ipsc->lAlphaFieldBlanks(3)) {
-                if ((thisDemandMgrList.limitSched = Sched::GetSchedule(state, s_ipsc->cAlphaArgs(3))) == nullptr) {
-                    ShowSevereItemNotFound(state, eoh, s_ipsc->cAlphaFieldNames(3), s_ipsc->cAlphaArgs(3));
-                    ErrorsFound = true;
-                }
+            if (s_ipsc->lAlphaFieldBlanks(3)) {
+                ShowSevereEmptyField(state, eoh, s_ipsc->cAlphaFieldNames(3));
+                ErrorsFound = true;
+            } else if ((thisDemandMgrList.limitSched = Sched::GetSchedule(state, s_ipsc->cAlphaArgs(3))) == nullptr) {
+                ShowSevereItemNotFound(state, eoh, s_ipsc->cAlphaFieldNames(3), s_ipsc->cAlphaArgs(3));
+                ErrorsFound = true;
             }
 
             thisDemandMgrList.SafetyFraction = s_ipsc->rNumericArgs(1);
 
-            if (!s_ipsc->lAlphaFieldBlanks(4)) {
-               if ((thisDemandMgrList.billingSched = Sched::GetSchedule(state, s_ipsc->cAlphaArgs(4))) == nullptr) { 
-                    ShowSevereItemNotFound(state, eoh, s_ipsc->cAlphaFieldNames(4), s_ipsc->cAlphaArgs(4));
-                    ErrorsFound = true;
-                }
+            if (s_ipsc->lAlphaFieldBlanks(4)) {
+                ShowSevereEmptyField(state, eoh, s_ipsc->cAlphaFieldNames(4));
+                ErrorsFound = true;
+            } else if ((thisDemandMgrList.billingSched = Sched::GetSchedule(state, s_ipsc->cAlphaArgs(4))) == nullptr) { 
+                ShowSevereItemNotFound(state, eoh, s_ipsc->cAlphaFieldNames(4), s_ipsc->cAlphaArgs(4));
+                ErrorsFound = true;
             }
 
-            if (!s_ipsc->lAlphaFieldBlanks(5)) {
-                if ((thisDemandMgrList.peakSched = Sched::GetSchedule(state, s_ipsc->cAlphaArgs(5))) == nullptr) {
-                    ShowSevereItemNotFound(state, eoh, s_ipsc->cAlphaFieldNames(5), s_ipsc->cAlphaArgs(5));
-                    ErrorsFound = true;
-                }
+            if (s_ipsc->lAlphaFieldBlanks(5)) {
+                ShowSevereEmptyField(state, eoh, s_ipsc->cAlphaFieldNames(5));
+                ErrorsFound = true;
+            } else if ((thisDemandMgrList.peakSched = Sched::GetSchedule(state, s_ipsc->cAlphaArgs(5))) == nullptr) {
+                ShowSevereItemNotFound(state, eoh, s_ipsc->cAlphaFieldNames(5), s_ipsc->cAlphaArgs(5));
+                ErrorsFound = true;
             }
 
             thisDemandMgrList.AveragingWindow = max(int(s_ipsc->rNumericArgs(2) / state.dataGlobal->MinutesInTimeStep), 1);

diff --git a/src/EnergyPlus/Fans.cc b/src/EnergyPlus/Fans.cc
@@ -767,7 +767,7 @@ void GetFanInput(EnergyPlusData &state)
         BranchNodeConnections::TestCompSet(state, cCurrentModuleObject, cAlphaArgs(1), cAlphaArgs(2), cAlphaArgs(3), "Air Nodes");
 
         if (lAlphaFieldBlanks(4)) {
-            fan->availSched = nullptr;
+            fan->availSched = Sched::GetScheduleAlwaysOn(state);
         } else if ((fan->availSched = Sched::GetSchedule(state, cAlphaArgs(4))) == nullptr) {
             ShowSevereItemNotFound(state, eoh, cAlphaFieldNames(4), cAlphaArgs(4));
             ErrorsFound = true;
@@ -862,7 +862,7 @@ void GetFanInput(EnergyPlusData &state)
         fan->type = HVAC::FanType::SystemModel;
 
         if (lAlphaFieldBlanks(2)) {
-            fan->availSched = Sched::GetScheduleAlwaysOn(state);
+            fan->availSched = Sched::GetScheduleAlwaysOn(state); // nullptr
         } else if ((fan->availSched = Sched::GetSchedule(state, cAlphaArgs(2))) == nullptr) {
             ShowSevereItemNotFound(state, eoh, cAlphaFieldNames(2), cAlphaArgs(2));
             ErrorsFound = true;

diff --git a/src/EnergyPlus/RefrigeratedCase.cc b/src/EnergyPlus/RefrigeratedCase.cc
@@ -2242,7 +2242,7 @@ void GetRefrigerationInput(EnergyPlusData &state)
             }
 
             ++AlphaNum; // A6
-            if (lAlphaBlanks(AlphaNum)) {
+            if (!lAlphaBlanks(AlphaNum)) {
                 WarehouseCoil(CoilID).heaterAvailSched = Sched::GetScheduleAlwaysOn(state);
             } else if ((WarehouseCoil(CoilID).heaterAvailSched = Sched::GetSchedule(state, Alphas(AlphaNum))) == nullptr) {
                 ShowSevereItemNotFound(state, eoh, cAlphaFieldNames(AlphaNum), Alphas(AlphaNum));