refactor: replace hand-written CSVs with the Table infrastructure #4039
Open
kdrienCG wants to merge 13 commits into
Open
refactor: replace hand-written CSVs with the Table infrastructure #4039kdrienCG wants to merge 13 commits into
kdrienCG wants to merge 13 commits into
Conversation
Add an overload constructor in TableLayout to accept only a vector of columns (without a title, similar to the constructor with only an initializer_list)
kdrienCG
requested review from
MelReyCG,
OmarDuran,
corbett5,
dkachuma,
rrsettgast,
tjb-ltk and
wrtobin
as code owners
Contributor
jafranc
approved these changes
May 7, 2026
dkachuma
approved these changes
May 14, 2026
MelReyCG
reviewed
Jun 22, 2026
MelReyCG
left a comment
MelReyCG
left a comment
Contributor
There was a problem hiding this comment.
Same remarks for single-phase
Comment on lines
+24
to
+31
| #include "common/Path.hpp" | ||
| #include "common/StdContainerWrappers.hpp" | ||
| #include "common/TimingMacros.hpp" | ||
| #include "common/format/Format.hpp" | ||
| #include "common/format/table/TableData.hpp" | ||
| #include "common/format/table/TableFormatter.hpp" | ||
| #include "common/format/table/TableLayout.hpp" | ||
| #include "common/logger/Logger.hpp" |
Contributor
There was a problem hiding this comment.
Please do not add already added includes (maybe deactivate clangd auto-include?)
(also for the <filesystem> below)
Comment on lines
+2211
to
+2225
| stdVector< string > columnNames; | ||
| columnNames.reserve( 5 + numPhase + numComp ); | ||
| columnNames.emplace_back( GEOS_FMT( "Time [{}]", units::getSymbol( units::Unit::Time ) ) ); | ||
| columnNames.emplace_back( GEOS_FMT( "dt [{}]", units::getSymbol( units::Unit::Time ) ) ); | ||
| columnNames.emplace_back( GEOS_FMT( "BHP [{}]", units::getSymbol( units::Unit::Pressure ) ) ); | ||
| columnNames.emplace_back( GEOS_FMT( "Total rate [{}/s]", massUnit ) ); | ||
| columnNames.emplace_back( GEOS_FMT( "Total {} volumetric rate [{}m3/s]", conditionKey, unitKey ) ); | ||
| for( integer ip = 0; ip < numPhase; ++ip ) | ||
| { | ||
| outputFile.open( m_ratesOutputDir + "/" + wellControlsName + ".csv", std::ios_base::app ); | ||
| outputFile << time_n << "," << dt; | ||
| columnNames.emplace_back( GEOS_FMT( "Phase {} {} volumetric rate [{}m3/s]", ip, conditionKey, unitKey ) ); | ||
| } | ||
| for( integer ic = 0; ic < numComp; ++ic ) | ||
| { | ||
| columnNames.emplace_back( GEOS_FMT( "Component {} rate [{}/s]", ic, massUnit ) ); | ||
| } |
Contributor
There was a problem hiding this comment.
If possible, relocate this work at initialization or only for the first time.
Contributor
There was a problem hiding this comment.
Same request for TableLayout & Table*Formatter instances.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR replaces "hand-written" CSV tables in two well files with the Tables infrastructure (
TableLayout,TableData).