Merge pull request #10201 from NREL/6919-FixBlankNameOutTabSumRep

Fix 6919 when blanks are present in some tabular output reports

Author: Myoldmopar

src/EnergyPlus/OutputReportTabular.cc

@@ -366,7 +366,10 @@ void GetInputTabularMonthly(EnergyPlusData &state)
         int const curTable = AddMonthlyReport(state, AlphArray(1), int(NumArray(1)));
         for (int jField = 2; jField <= NumAlphas; jField += 2) {
             if (AlphArray(jField).empty()) {
-                ShowFatalError(state, "Blank report name in Output:Table:Monthly");
+                ShowWarningError(state,
+                                 format("{}: Blank column specified in '{}', need to provide a variable or meter name ",
+                                        CurrentModuleObject,
+                                        ort->MonthlyInput(TabNum).name));
             }
             std::string const curAggString = AlphArray(jField + 1);
             AggType curAggType; // kind of aggregation identified (see AggType parameters)
@@ -402,7 +405,9 @@ void GetInputTabularMonthly(EnergyPlusData &state)
                 ShowWarningError(state, format("{}={}, Variable name={}", CurrentModuleObject, ort->MonthlyInput(TabNum).name, AlphArray(jField)));
                 ShowContinueError(state, format("Invalid aggregation type=\"{}\"  Defaulting to SumOrAverage.", curAggString));
             }
-            AddMonthlyFieldSetInput(state, curTable, AlphArray(jField), "", curAggType);
+            if (!AlphArray(jField).empty()) {
+                AddMonthlyFieldSetInput(state, curTable, AlphArray(jField), "", curAggType);
+            }
         }
     }
 }
@@ -1492,7 +1497,7 @@ void GetInputOutputTableSummaryReports(EnergyPlusData &state)
         for (int iReport = 1; iReport <= NumAlphas; ++iReport) {
             bool nameFound = false;
             if (AlphArray(iReport).empty()) {
-                ShowFatalError(state, "Blank report name in Output:Table:SummaryReports");
+                ShowWarningError(state, "Blank report name in Output:Table:SummaryReports");
             } else if (Util::SameString(AlphArray(iReport), "AnnualBuildingUtilityPerformanceSummary")) {
                 ort->displayTabularBEPS = true;
                 ort->WriteTabularFiles = true;

src/EnergyPlus/OutputReportTabularAnnual.cc

@@ -130,7 +130,10 @@ void GetInputTabularAnnual(EnergyPlusData &state)
             for (jAlpha = 4; jAlpha <= numAlphas; jAlpha += 2) {
                 curVarMtr = alphArray(jAlpha);
                 if (curVarMtr.empty()) {
-                    ShowFatalError(state, "Blank report name in Output:Table:Annual");
+                    ShowWarningError(state,
+                                     format("{}: Blank column specified in '{}', need to provide a variable or meter or EMS variable name ",
+                                            currentModuleObject,
+                                            alphArray(1)));
                 }
                 if (jAlpha <= numAlphas) {
                     std::string aggregationString = alphArray(jAlpha + 1);
@@ -144,7 +147,9 @@ void GetInputTabularAnnual(EnergyPlusData &state)
                 } else {
                     curNumDgts = 2;
                 }
-                annualTables.back().addFieldSet(curVarMtr, curAgg, curNumDgts);
+                if (!curVarMtr.empty()) {
+                    annualTables.back().addFieldSet(curVarMtr, curAgg, curNumDgts);
+                }
             }
             annualTables.back().setupGathering(state);
         } else {
@@ -1353,7 +1358,9 @@ std::vector<Real64> AnnualTable::calculateBins(int const numberOfBins,
         } else {
             // determine which bin the results are in
             binNum = int((*valueIt - bottomOfBins) / intervalSize);
-            returnBins[binNum] += *elapsedTimeIt;
+            if (binNum < numberOfBins && binNum >= 0) {
+                returnBins[binNum] += *elapsedTimeIt;
+            }
         }
         ++elapsedTimeIt;
     }

tst/EnergyPlus/unit/OutputReportTabular.unit.cc

@@ -12772,6 +12772,64 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_WarnMonthlyDisplayExtraWarn
     compare_err_stream(expected_error);
 }
 
+TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_WarnMonthlyBlankVariable)
+{
+    // #6919 - Warn instead of fatal on blank monthly table
+    std::string const idf_objects = delimited_string({
+        "Output:Table:Monthly,",
+        "  Space Gains Annual Report, !- Name",
+        "  2, !-  Digits After Decimal",
+        "  , !- Variable or Meter 1 Name",
+        "  SumOrAverage; !- Aggregation Type for Variable or Meter 1",
+
+        "Output:Table:SummaryReports,",
+        "  AllSummaryAndMonthly;              !- Report 1 Name",
+    });
+
+    ASSERT_TRUE(process_idf(idf_objects));
+
+    Real64 extLitUse;
+
+    SetupOutputVariable(*state,
+                        "Exterior Lights Electricity Energy",
+                        Constant::Units::J,
+                        extLitUse,
+                        OutputProcessor::SOVTimeStepType::Zone,
+                        OutputProcessor::SOVStoreType::Summed,
+                        "Lite1",
+                        Constant::eResource::Electricity,
+                        OutputProcessor::SOVEndUseCat::ExteriorLights,
+                        "General");
+
+    SetupOutputVariable(*state,
+                        "Exterior Lights Electricity Energy",
+                        Constant::Units::J,
+                        extLitUse,
+                        OutputProcessor::SOVTimeStepType::Zone,
+                        OutputProcessor::SOVStoreType::Summed,
+                        "Lite2",
+                        Constant::eResource::Electricity,
+                        OutputProcessor::SOVEndUseCat::ExteriorLights,
+                        "General");
+
+    state->dataGlobal->DoWeathSim = true;
+    state->dataGlobal->KindOfSim = Constant::KindOfSim::RunPeriodWeather; // Trigger the extra warning
+    state->dataGlobal->TimeStepZone = 0.25;
+    state->dataGlobal->TimeStepZoneSec = state->dataGlobal->TimeStepZone * 60.0;
+    state->dataGlobal->DisplayExtraWarnings = true;
+
+    GetInputTabularMonthly(*state);
+    EXPECT_EQ(state->dataOutRptTab->MonthlyInputCount, 1);
+    GetInputOutputTableSummaryReports(*state);
+    EXPECT_EQ(state->dataOutRptTab->MonthlyInputCount, numNamedMonthly + 1);
+
+    InitializeTabularMonthly(*state);
+
+    std::string const expected_error = delimited_string(
+        {"   ** Warning ** Output:Table:Monthly: Blank column specified in 'SPACE GAINS ANNUAL REPORT', need to provide a variable or meter name "});
+    compare_err_stream(expected_error);
+}
+
 TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_NoWarnMonthlIfNoWeatherFileRun)
 {
     // #9621 - Only warn if a bad variable is defined in a Monthly table user requested, not on the AllSummaryAndMonthly ones

tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc

@@ -566,3 +566,40 @@ TEST_F(SQLiteFixture, OutputReportTabularAnnual_CurlyBraces)
         EXPECT_TRUE(false) << "Missing braces in monthly table for : " << colHeader;
     }
 }
+
+TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_WarnBlankVariable)
+{
+    std::string const idf_objects = delimited_string({
+        "Output:Table:Annual,",
+        "Space Gains Annual Report, !- Name",
+        "Filter1, !- Filter",
+        "Schedule2, !- Schedule Name",
+        "Zone People Total Heating Energy, !- Variable or Meter 1 Name",
+        "SumOrAverage, !- Aggregation Type for Variable or Meter 1",
+        "4, !- field Digits After Decimal 1",
+        ", !- Variable or Meter 2 Name",
+        "hoursNonZero, !- Aggregation Type for Variable or Meter 2",
+        ", !- field Digits After Decimal 2",
+        "Zone Electric Equipment Total Heating Energy; !- Variable or Meter 3 Name",
+    });
+
+    ASSERT_TRUE(process_idf(idf_objects));
+
+    state->dataGlobal->DoWeathSim = true;
+
+    EXPECT_FALSE(state->dataOutRptTab->WriteTabularFiles);
+    GetInputTabularAnnual(*state);
+    EXPECT_TRUE(state->dataOutRptTab->WriteTabularFiles);
+
+    EXPECT_EQ(state->dataOutputReportTabularAnnual->annualTables.size(), 1u);
+
+    std::vector<AnnualTable>::iterator firstTable = state->dataOutputReportTabularAnnual->annualTables.begin();
+
+    std::vector<std::string> tableParams = firstTable->inspectTable();
+
+    std::string const expected_error = delimited_string({"   ** Warning ** Output:Table:Annual: Blank column specified in 'SPACE GAINS ANNUAL "
+                                                         "REPORT', need to provide a variable or meter or EMS variable name ",
+                                                         "   ** Warning ** Invalid aggregation type=\"\"  Defaulting to SumOrAverage."});
+
+    compare_err_stream(expected_error);
+}