Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #7029 - IP conversion report units #7032

Merged
merged 4 commits into from Nov 13, 2018
Merged

Fix #7029 - IP conversion report units #7032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cd62a8
#7029 - Add person/m2 conversion
jmarrec Oct 25, 2018
c1fecbc
#7029 - Properly format unit to be X/Y-Z and not X/Y/Z or unit conver…
jmarrec Oct 25, 2018
efc80be
Add new unitConv to unit test
jmarrec Oct 25, 2018
7867190
Merge remote-tracking branch 'upstream/develop' into PR_opened/7029_I…
Myoldmopar Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/EnergyPlus/HeatBalanceAirManager.cc
View file
Open in desktop
Expand Up @@ -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 - "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, so m3/s-m2 is already the accepted unit conversion in E+, this output was simply entered incorrectly in this string. 👍

"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}";

Expand Down Expand Up @@ -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 "
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion src/EnergyPlus/OutputReportTabular.cc
View file
Open in desktop
Expand Up @@ -15351,7 +15351,7 @@ namespace OutputReportTabular {

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
// na
UnitConvSize = 115;
UnitConvSize = 116;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problems here.

UnitConv.allocate(UnitConvSize);
UnitConv(1).siName = "%";
UnitConv(2).siName = "�C";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion tst/EnergyPlus/unit/OutputReportTabular.unit.cc
View file
Open in desktop
Expand Up @@ -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);
Expand Down