Merge pull request #10155 from NREL/output-json-tabular-data

Fixes `Output:JSON` tabular data output incorrectly dependent on `OutputControl:Files input`
NREL · Jan 5, 2024 · bc827aa · bc827aa · nrel-bot-2b · Jan 5, 2024
2 parents fb265cd + 51a6a08
commit bc827aa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/src/EnergyPlus/EconomicTariff.cc b/src/EnergyPlus/EconomicTariff.cc
@@ -2716,7 +2716,7 @@ void ComputeTariff(EnergyPlusData &state)
 
     Real64 annualAggregate;
 
-    if (!(state.files.outputControl.tabular || state.files.outputControl.sqlite)) {
+    if (!state.files.outputControl.writeTabular(state)) {
         state.dataOutRptTab->WriteTabularFiles = false;
         return;
     }

diff --git a/src/EnergyPlus/IOFiles.cc b/src/EnergyPlus/IOFiles.cc
@@ -319,6 +319,14 @@ std::vector<std::string> InputOutputFile::getLines()
     return std::vector<std::string>();
 }
 
+bool IOFiles::OutputControl::writeTabular(EnergyPlusData &state)
+{
+    bool const htmlTabular = state.files.outputControl.tabular;
+    bool const jsonTabular = state.files.outputControl.json && state.dataResultsFramework->resultsFramework->timeSeriesAndTabularEnabled();
+    bool const sqliteTabular = state.files.outputControl.sqlite; // && @JasonGlazer thinks something else maybe?
+    return (htmlTabular || jsonTabular || sqliteTabular);
+}
+
 void IOFiles::OutputControl::getInput(EnergyPlusData &state)
 {
     auto &ip = state.dataInputProcessing->inputProcessor;

diff --git a/src/EnergyPlus/IOFiles.hh b/src/EnergyPlus/IOFiles.hh
@@ -673,6 +673,7 @@ public:
         OutputControl() = default;
 
         void getInput(EnergyPlusData &state);
+        bool writeTabular(EnergyPlusData &state);
 
         bool csv = false;
         bool mtr = true;

diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc
@@ -323,7 +323,7 @@ void GetInputTabularMonthly(EnergyPlusData &state)
     // SUBROUTINE LOCAL VARIABLE DECLARATIONS:
     auto &ort = state.dataOutRptTab;
 
-    if (!(state.files.outputControl.tabular || state.files.outputControl.sqlite)) {
+    if (!state.files.outputControl.writeTabular(state)) {
         ort->WriteTabularFiles = false;
         return;
     }
@@ -1053,7 +1053,7 @@ void GetInputTabularTimeBins(EnergyPlusData &state)
 
     auto &ort = state.dataOutRptTab;
 
-    if (!(state.files.outputControl.tabular || state.files.outputControl.sqlite)) {
+    if (!state.files.outputControl.writeTabular(state)) {
         ort->WriteTabularFiles = false;
         return;
     }
@@ -1461,7 +1461,7 @@ void GetInputOutputTableSummaryReports(EnergyPlusData &state)
     auto &ort = state.dataOutRptTab;
     bool ErrorsFound = false;
 
-    if (!(state.files.outputControl.tabular || state.files.outputControl.sqlite)) {
+    if (!state.files.outputControl.writeTabular(state)) {
         ort->WriteTabularFiles = false;
         return;
     }