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

refactor: Refactor log & CSV statistics #3406

Open
wants to merge 343 commits into
base: develop
Choose a base branch
from
Open

refactor: Refactor log & CSV statistics #3406

wants to merge 343 commits into from
+2,304 −1,004

Conversation

arng40
Copy link
Contributor

@arng40 arng40 commented Oct 21, 2024 •
edited by paveltomin
Loading

This PR aims to improve log statitistics by using tables.
Additionally, the table log output now includes enhanced features for greater flexibility:

  • Possibility to add sub-columns,
  • Support for merging cells in data,
  • Possibility to add separators.

Allowing this kind of output:

             ----------------------------------------------------------------------------
             |  Cras egestas  |  CoordX  |  C   |    CoordZ     |   Prev    |   Next    |
             |                |          |      |               |  element  |  element  |
             ----------------------------------------------------------------------------
             |      ProductA  |    1234  |  40  |  ProductName  |     5678  |       60  |
             ----------------------------------------------------------------------------
             |            P1  |    2002  |                3003  |     4004  |           |
             |            P2  |    2003  |                      |           |           |
             |            P3  |    2004  |                      |           |           |
             |          3.14  |   2.718  |               1.618  |    0.577  |           |
             ----------------------------------------------------------------------------
             |                                                                   Item2  |
             ----------------------------------------------------------------------------
             |          1500  |    2500  |                                              |
             ----------------------------------------------------------------------------
             |          1.23  |    4.56  |                7.89  |     0.12  |       40  |
             ----------------------------------------------------------------------------
             |         Alpha  |    1001  |   8  |         Beta  |     2002  |           |
             |                |          |      |        water  |      1.0  |           |
             ----------------------------------------------------------------------------

Statitistics output improves, for SinglePhaseStatistics for instance:

SinglePhaseFlowStatistics, Channel (time 5000 s): Pressure (min, average, max): -3780035.4055568296, 150575.0804809972, 6003777.073592767 Pa
SinglePhaseFlowStatistics, Channel (time 5000 s): Delta pressure (min, max): -3780035.4055568296, 6003777.073592767 Pa
SinglePhaseFlowStatistics, Channel (time 5000 s): Temperature (min, average, max): 0, 0, 0 K
SinglePhaseFlowStatistics, Channel (time 5000 s): Total dynamic pore volume: 50.007528754192336 rm^3
SinglePhaseFlowStatistics, Channel (time 5000 s): Total fluid mass: 50011.30583965373 kg

-----------------------------------------------------------------------------------------------------------------
|                                   compflowStatistics, leakyWell (time 1 s):                                   |
-----------------------------------------------------------------------------------------------------------------
|              statistics               |         min          |       average        |           max           |
-----------------------------------------------------------------------------------------------------------------
|                         Pressure[Pa]  |   6852287.971327121  |   7668119.995536645  |      8491215.639425274  |
|                  Delta pressure [Pa]  |                   0  |                   /  |                      0  |
|                      Temperature [K]  |  302.39500000000004  |  304.74998595102636  |     307.12749999999994  |
-----------------------------------------------------------------------------------------------------------------
-----------------------------------------------------------------------------------------------------------------
|                           statistics  |               phase  |                                         value  |
-----------------------------------------------------------------------------------------------------------------
|     Total dynamic pore volume [rm^3]  |                 all  |                             1.695591360000082  |
-----------------------------------------------------------------------------------------------------------------
|    Phase dynamic pore volume: [rm^3]  |                 gas  |                                             0  |
|                                       |               water  |                                       1.69559  |
-----------------------------------------------------------------------------------------------------------------
|                      Phase mass [kg]  |                 gas  |                                             0  |
|                                       |               water  |                                       1795.74  |
-----------------------------------------------------------------------------------------------------------------
|   Trapped phase mass (metric 1) [kg]  |                 gas  |                                             0  |
|                                       |               water  |                                       359.149  |
-----------------------------------------------------------------------------------------------------------------
|             nonTrappedPhaseMass [kg]  |                 gas  |                                             0  |
|                                       |               water  |                                        1436.6  |
-----------------------------------------------------------------------------------------------------------------
|  Immobile phase mass (metric 2) [kg]  |                 gas  |                                             0  |
|                                       |               water  |                                             0  |
-----------------------------------------------------------------------------------------------------------------
|    Mobile phase mass (metric 2) [kg]  |                 gas  |                                             0  |
|                                       |               water  |                                       1795.74  |
-----------------------------------------------------------------------------------------------------------------
|                  Component mass [kg]  |            gas, co2  |                                             0  |
|                                       |          gas, water  |                                             0  |
|                                       |          water, co2  |                         0.0017957448773396687  |
|                                       |        water, water  |                            1795.7430815947907  |
-----------------------------------------------------------------------------------------------------------------

arng40 added 30 commits April 4, 2024 12:03
@arng40
move table to fileIO
7f6b79b
@arng40
update some doc
73f8374
@arng40
first part test 2D table crash
ae4968b
@arng40
add test/warning for table conversion 2D => 1D and warning for fillin…
92a1644 
…g table columns from rows
@arng40
ci correction
e6b2e6d
@arng40
test ci correction for c++ < 17
18db533
@arng40
test ci table2D example 1
31126e1
@arng40
test ci Table2D test 1 & 2
d481454
@arng40
test ci Table2D test 1 & 2 & 3
6a7bfe8
@arng40
add virtual destructor TableFormatter + minor variable refacto
e01523b
@arng40
bug correction + missing doc + test small refacto
978674e
@arng40
missig doc ...
da95c91
@arng40
start management logError in table + todo refacto functions in TableF…
79acc00 
…ormatter
@arng40
TableFormatter refacto + clean up
24f92d9
@arng40
uncrustify
5a70c33
@arng40
small doc update
95f3a9d
@arng40
some error management update
77351b9
@arng40
renaming & simplifying
da67c05
@arng40
add case for fill all column in case of table 2D
a9612bb
@arng40
Merge remote-tracking branch 'origin/develop' into feature/dudes/tabl…
0f1bbe2 
…e-layout
@arng40
simplification
89f859a
@arng40
code optimization
ef5085c
@arng40
remove useless std::move
294db78
@arng40
refacto build separator + reviews
9f23f62
@arng40
final review correction
9809699
@arng40
Merge remote-tracking branch 'origin/feature/dudes/table-layout' into…
66895d6 
… pvt-logs-cp
@arng40
method display layout added
46a6abe
@arng40
small correction after merge
9de9d63
@arng40
review correction #1
fe80c59
@arng40
variables renamed
abb994e
@arng40 arng40 added ci: run CUDA builds Allows to triggers (costly) CUDA jobs and removed DO NOT MERGE ! labels Jan 10, 2025
@arng40 arng40 added the ci: run integrated tests Allows to run the integrated tests in GEOS CI label Jan 10, 2025
@arng40 arng40 requested a review from paveltomin January 10, 2025 10:53
paveltomin
paveltomin approved these changes Jan 10, 2025
View reviewed changes
Copy link
Contributor

@paveltomin paveltomin left a comment

Choose a reason for hiding this comment

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

just a few minor things to clean up

@paveltomin paveltomin added ci: run code coverage enables running of the code coverage CI jobs flag: no rebaseline Does not require rebaseline labels Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wrtobin wrtobin wrtobin left review comments

@paveltomin paveltomin paveltomin approved these changes

@MelReyCG MelReyCG MelReyCG approved these changes

@rrsettgast rrsettgast rrsettgast approved these changes

@CusiniM CusiniM Awaiting requested review from CusiniM CusiniM is a code owner

@corbett5 corbett5 Awaiting requested review from corbett5 corbett5 is a code owner

@castelletto1 castelletto1 Awaiting requested review from castelletto1 castelletto1 is a code owner

@jhuang2601 jhuang2601 Awaiting requested review from jhuang2601 jhuang2601 is a code owner

@ryar9534 ryar9534 Awaiting requested review from ryar9534 ryar9534 is a code owner

@untereiner untereiner Awaiting requested review from untereiner untereiner is a code owner

@cssherman cssherman Awaiting requested review from cssherman cssherman is a code owner

@dkachuma dkachuma Awaiting requested review from dkachuma

@matteofrigo5 matteofrigo5 Awaiting requested review from matteofrigo5

@VidarStiernstrom VidarStiernstrom Awaiting requested review from VidarStiernstrom

Assignees

@arng40 arng40

Labels
ci: run code coverage enables running of the code coverage CI jobs ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI flag: no rebaseline Does not require rebaseline type: cleanup / refactor Non-functional change (NFC) type: feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use data tables for log, and CSV / HDF5 to output statistics [EPIC] Outputs in GEOS
6 participants
@arng40 @paveltomin @wrtobin @rrsettgast @MelReyCG @CusiniM