Skip to content

Commit 7dde935

Browse files
authored
Merge pull request #11260 from NREL/TableFormatFollowup
Fix eio output for table style
2 parents a94ab1f + c042f65 commit 7dde935

2 files changed

Lines changed: 19 additions & 9 deletions

File tree

src/EnergyPlus/OutputReportTabular.cc

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,15 +1376,8 @@ void GetInputTabularStyle(EnergyPlusData &state)
13761376
ort->formatReals_Tabular = getYesNoValue(AlphArray(3)) == BooleanSwitch::Yes;
13771377
}
13781378

1379-
if (ort->WriteTabularFiles) {
1380-
print(state.files.eio, "! <Tabular Report>,Style,Unit Conversion\n");
1381-
if (AlphArray(1) != "HTML") {
1382-
ConvertCaseToLower(AlphArray(1), AlphArray(2));
1383-
AlphArray(1).erase(1);
1384-
AlphArray(1) += AlphArray(2).substr(1);
1385-
}
1386-
print(state.files.eio, "Tabular Report,{},{}\n", AlphArray(1), AlphArray(2));
1387-
}
1379+
print(state.files.eio, "! <Tabular Report>,Style,Unit Conversion, Format Reals\n");
1380+
print(state.files.eio, "Tabular Report,{},{},{}\n", AlphArray(1), AlphArray(2), ort->formatReals_Tabular ? "Yes" : "No");
13881381
}
13891382

13901383
UnitsStyle SetUnitsStyleFromString(std::string const &unitStringIn)

src/Transition/OutputRulesFiles/OutputChanges25-1-0-to-25-2-0.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,23 @@ Several new columns were added to the ElectricComponentsOfPeakDemandMonthly repo
311311
- Refrigeration:Electricity {At Max/Min}
312312
- Cogeneration:Electricity {At Max/Min}
313313

314+
### Tabular Report output to eio
315+
- Add a new field for "Format Reals" to the eio output for "Tabular Report".
316+
- Fix unit conversion value when format is not HTML.
317+
- Always report this to eio, even if table reports are not active.
318+
319+
Example before:
320+
```
321+
! <Tabular Report>,Style,Unit Conversion
322+
Tabular Report,HTML,NONE
323+
```
324+
325+
New:
326+
```
327+
! <Tabular Report>,Style,Unit Conversion, Format Reals
328+
Tabular Report,HTML,NONE,Yes
329+
```
330+
See Pull Request [#11260](https://github.com/NREL/EnergyPlus/pull/11260).
314331
See pull request [#10209](https://github.com/NREL/EnergyPlus/pull/10209)
315332

316333
### Table and eio Output Changes Related to Zone Multipliers

0 commit comments

Comments
 (0)