Merge pull request #7032 from jmarrec/PR_opened/7029_IPConversionReport

#7029 - Fix IP conversion report units
NREL · Nov 13, 2018 · 34b1cf1 · 34b1cf1 · nrel-bot-3 · Nov 13, 2018
2 parents 022bd03 + 7867190
commit 34b1cf1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/EnergyPlus/HeatBalanceAirManager.cc b/src/EnergyPlus/HeatBalanceAirManager.cc
@@ -3462,7 +3462,7 @@ namespace HeatBalanceAirManager {
             if (Loop == 1)
                 gio::write(OutputFileInits, Format_721)
                     << "ZoneInfiltration"
-                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s/m2},Volume Flow Rate/Exterior Surface Area {m3/s/m2},ACH - "
+                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s-m2},Volume Flow Rate/Exterior Surface Area {m3/s-m2},ACH - "
                        "Air Changes per Hour,Equation A - Constant Term Coefficient {},Equation B - Temperature Term Coefficient {1/C},Equation C - "
                        "Velocity Term Coefficient {s/m}, Equation D - Velocity Squared Term Coefficient {s2/m2}";
 
@@ -3548,7 +3548,7 @@ namespace HeatBalanceAirManager {
             if (Loop == 1)
                 gio::write(OutputFileInits, Format_721)
                     << "ZoneVentilation"
-                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s/m2},Volume Flow Rate/person Area {m3/s/person},ACH - Air "
+                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s-m2},Volume Flow Rate/person Area {m3/s-person},ACH - Air "
                        "Changes per Hour,Fan Type {Exhaust;Intake;Natural},Fan Pressure Rise {Pa},Fan Efficiency {},Equation A - Constant Term "
                        "Coefficient {},Equation B - Temperature Term Coefficient {1/C},Equation C - Velocity Term Coefficient {s/m}, Equation D - "
                        "Velocity Squared Term Coefficient {s2/m2},Minimum Indoor Temperature{C}/Schedule,Maximum Indoor "
@@ -3713,7 +3713,7 @@ namespace HeatBalanceAirManager {
             if (Loop == 1)
                 gio::write(OutputFileInits, Format_721)
                     << "Mixing"
-                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s/m2},Volume Flow Rate/person Area {m3/s/person},ACH - Air "
+                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s-m2},Volume Flow Rate/person Area {m3/s-person},ACH - Air "
                        "Changes per Hour,From/Source Zone,Delta Temperature {C}";
 
             ZoneNum = Mixing(Loop).ZonePtr;
@@ -3778,7 +3778,7 @@ namespace HeatBalanceAirManager {
             if (Loop == 1)
                 gio::write(OutputFileInits, Format_721)
                     << "CrossMixing"
-                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s/m2},Volume Flow Rate/person Area {m3/s/person},ACH - Air "
+                    << "Design Volume Flow Rate {m3/s},Volume Flow Rate/Floor Area {m3/s-m2},Volume Flow Rate/person Area {m3/s-person},ACH - Air "
                        "Changes per Hour,From/Source Zone,Delta Temperature {C}";
 
             ZoneNum = CrossMixing(Loop).ZonePtr;

diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc
@@ -15351,7 +15351,7 @@ namespace OutputReportTabular {
 
         // SUBROUTINE LOCAL VARIABLE DECLARATIONS:
         //    na
-        UnitConvSize = 115;
+        UnitConvSize = 116;
         UnitConv.allocate(UnitConvSize);
         UnitConv(1).siName = "%";
         UnitConv(2).siName = "�C";
@@ -15468,6 +15468,7 @@ namespace OutputReportTabular {
         UnitConv(113).siName = "REV/MIN";
         UnitConv(114).siName = "NM";
         UnitConv(115).siName = "BTU/W-H"; // Used for AHRI rating metrics (e.g. SEER)
+        UnitConv(116).siName = "PERSON/M2";
 
         UnitConv(1).ipName = "%";
         UnitConv(2).ipName = "F";
@@ -15584,6 +15585,7 @@ namespace OutputReportTabular {
         UnitConv(113).ipName = "rev/min";
         UnitConv(114).ipName = "lbf-ft";
         UnitConv(115).ipName = "Btu/W-h";
+        UnitConv(116).ipName = "person/ft2";
 
         UnitConv(1).mult = 1.0;
         UnitConv(2).mult = 1.8;
@@ -15700,6 +15702,7 @@ namespace OutputReportTabular {
         UnitConv(113).mult = 1.0;
         UnitConv(114).mult = 0.737562149277;
         UnitConv(115).mult = 1.0;
+        UnitConv(116).mult = 0.09290304;
 
         UnitConv(2).offset = 32.0;
         UnitConv(11).offset = 32.0;

diff --git a/tst/EnergyPlus/unit/OutputReportTabular.unit.cc b/tst/EnergyPlus/unit/OutputReportTabular.unit.cc
@@ -358,7 +358,9 @@ TEST_F(EnergyPlusFixture, OutputReportTabularTest_GetUnitConversion)
                                       "[W/m2-C]",
                                       "[W/m2-K]",
                                       "[W/W]",
-                                      "[W]"};
+                                      "[W]",
+                                      "[person/m2]",
+    };
 
     for (auto u : units) {
         LookupSItoIP(u, indexUnitConv, curUnits);