Native E+ CSV output and conditional output file selection#7904
Native E+ CSV output and conditional output file selection#7904Myoldmopar merged 48 commits intodevelopfrom
Conversation
…improve_file_io_with_fmt_refactor
…improve_file_io_with_fmt_refactor
…improve_file_io_with_fmt_refactor
|
The Mac and Linux CI issues are related to #7907 and not this PR. |
# Conflicts: # src/EnergyPlus/CommandLineInterface.cc # src/EnergyPlus/DElightManagerF.cc # src/EnergyPlus/DataStringGlobals.hh # src/EnergyPlus/DataSystemVariables.cc # src/EnergyPlus/DaylightingManager.cc # src/EnergyPlus/EMSManager.cc # src/EnergyPlus/HeatBalanceManager.cc # src/EnergyPlus/HeatBalanceSurfaceManager.cc # src/EnergyPlus/IOFiles.cc # src/EnergyPlus/OutputFiles.hh # src/EnergyPlus/OutputProcessor.cc # src/EnergyPlus/OutputReportTabular.cc # src/EnergyPlus/OutputReports.cc # src/EnergyPlus/ResultsFramework.cc # src/EnergyPlus/ResultsFramework.hh # src/EnergyPlus/ScheduleManager.cc # src/EnergyPlus/SimulationManager.cc # src/EnergyPlus/SizingManager.cc # src/EnergyPlus/StateManagement.cc # src/EnergyPlus/UtilityRoutines.cc # src/EnergyPlus/WindowManager.cc # src/EnergyPlus/api/EnergyPlusPgm.cc # tst/EnergyPlus/unit/OutputReportTabular.unit.cc
|
Minor build warning popped up on Mac, but otherwise this last commit is looking fantastic. I have not looked at the changes yet, though. If we got the build warning fixed up, does this address the discussion during the call yesterday or are there still more changes to make? |
|
Outside of the ERR diffs, this looks good. I'm assuming we don't actually want those warnings popping up in there, right? I think I'm going to make an "IO-Freeze-Release-Candidate" just to make sure packages are doing OK since it has been a while since we made them on CI. I will plan on closing the IO freeze door by tomorrow morning, so if you can get the ERR diffs cleaned up, that would be great. If not, we can discuss dropping this in with those temporarily in there. Assuming it's otherwise ready to go. |
Myoldmopar
left a comment
There was a problem hiding this comment.
This is an incredibly awesome new feature. I am hopeful that the CI results continue to look promising and we can get this merged in right away. I think at this point, even if there are a few rough edges, I'm still inclined to get it in and clean up anything remaining with a follow-up issue.
idd/Energy+.idd.in
Outdated
|
|
||
|
|
||
| OutputControl:Files, | ||
| \memo Conditionally turn on/off output from EnergyPlus. |
There was a problem hiding this comment.
Tab character got left in here.
| ResultsSchema.cc | ||
| ResultsSchema.hh | ||
| ResultsFramework.cc | ||
| ResultsFramework.hh |
|
Gah, tons of diffs due to develop moving. |
|
I don't know where that unit test failure on Mac came from, but I don't think it's the changes made here. This looks great. @mbadams5 are you satisfied with where it is at? If so I'll pull it and test it out a bit. |
|
@Myoldmopar, yes I think this is ready to go. Please feel free to review it and test it out. |
|
OK, so I built and tested this locally. Some issues, but I think I'm going to merge it in for now to get the I/O side done for freeze.
Obviously there is still some work to do here, but the I/O is settled, and as long as you don't use the new object, EnergyPlus runs fine. I'm going to merge and we can open up a follow-up ticket to address these post-freeze. Thanks @mbadams5, once polished this is going to be a really great addition! |
| print(state.files.rdd, "Program Version,{},{}{}", VerString, IDDVerString, DataStringGlobals::NL); | ||
| print(state.files.rdd, "Var Type (reported time step),Var Report Type,Variable Name [Units]{}", DataStringGlobals::NL); | ||
|
|
||
| print(state.files.mdd, "Program Version,{},{}{}", VerString, IDDVerString, DataStringGlobals::NL); | ||
| print(state.files.mdd, "Var Type (reported time step),Var Report Type,Variable Name [Units]{}", DataStringGlobals::NL); |
There was a problem hiding this comment.
@mbadams5 @Myoldmopar This reintroduced DataStringGloblas::NL which was removed in #8178. The rdd and mdd files now have an extra line ending character in the header line 0D 0D 0A. This causes text editors on Windows to prompt to fix line endings.
Pull request overview
This pull request implements a native E+ CSV output capability as well as add a new object to conditionally turn on/off output files.
Fixes #6552
Overall E+ runtime
Native E+ vs ReadVarsESO
Pull Request Author
Add to this list or remove from it as applicable. This is a simple templated set of guidelines.
Reviewer
This will not be exhaustively relevant to every PR.