Print . in 0 precision tablular output

NREL · May 7, 2020 · 69a8940 · 69a8940 · nrel-bot-2c · May 7, 2020
1 parent bc2bc0c
commit 69a8940
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/EnergyPlus/OutputReportPredefined.cc b/src/EnergyPlus/OutputReportPredefined.cc
@@ -2697,7 +2697,7 @@ namespace OutputReportPredefined {
         }
 
         if (tableEntryReal < 1e8) { // change from 1e10 for more robust entry writing
-            tableEntry(numTableEntry).charEntry = format("{:12.{}F}", tableEntryReal, sigDigitCount);
+            tableEntry(numTableEntry).charEntry = format("{:#12.{}F}", tableEntryReal, sigDigitCount);
         } else {
             tableEntry(numTableEntry).charEntry = format("{:12.{}Z}", tableEntryReal, sigDigitCount);
         }

diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc
@@ -15691,12 +15691,10 @@ namespace OutputReportTabular {
         // na
 
         // FUNCTION LOCAL VARIABLE DECLARATIONS:
-        const auto nDigits = [&]() {
-                if (RealIn < 0.0) return numDigits - 1;
-                if (numDigits > 9) return 9;
-                if (numDigits < 0) return 0;
-                return numDigits;
-            }();
+        int nDigits = numDigits;
+        if (RealIn < 0.0) --nDigits;
+        if (nDigits > 9) nDigits = 9;
+        if (nDigits < 0) nDigits = 0;
 
         if (std::abs(RealIn) > maxvalDigitsA.at(nDigits)) {
             return format("{:12.6Z}", RealIn);