feat: Log refactor - Output PVT #3149

arng40 · 2024-05-29T08:55:24Z

This PR follows the #2984 that aim to standardize logs.
Currently PVT tables are only accessible through .csv files. In this PR, logs will indicate which csv files are generated along with their associated path

CSV Generated to inputFiles/compositionalMultiphaseWell/test.xml/fluid1_phaseModel1_PhillipsBrineDensity_table.csv :

---------------------------------------------------------------------------------------
|                    fluid1_phaseModel1_PhillipsBrineDensity_table                    |
---------------------------------------------------------------------------------------
|  The fluid1_phaseModel1_PhillipsBrineDensity_table PVT table exceeding 500 rows.    |
|  To visualize the tables, go to the generated csv                                   |
---------------------------------------------------------------------------------------

In addition to csv files, PVT Tables with dimensions n <= 2 can be written in log by meetings 2 conditions :

have sufficient logLevel
Rows in the table < 500 lines

CSV Generated to inputFiles/compositionalMultiphaseWell/test.xml/fluid1_phaseModel1_PhillipsBrineViscosity_table.csv

---------------------------------------------------------
|    fluid1_phaseModel1_PhillipsBrineViscosity_table    |
---------------------------------------------------------
|    temperature [C]     |       viscosity [Pa*s]       |
---------------------------------------------------------
|          0.01          |          0.0017914           |
|           10           |           0.001306           |
|           20           |          0.0010016           |
|           25           |           0.00089            |
|           30           |          0.0007972           |
---------------------------------------------------------

An example of 2D table :

----------------------------------------------------------------------------------------------------------
|                             fluid1_phaseModel2_SpanWagnerCO2Density_table                              |
----------------------------------------------------------------------------------------------------------
|           density [kg/m3]  |  temperature [C] = 12  |  temperature [C] = 62  |  temperature [C] = 112  |
----------------------------------------------------------------------------------------------------------
|    pressure [Pa] = 100000  |     1.867036801109489  |    1.5846667997020552  |      1.377165506424985  |
|   pressure [Pa] = 1100000  |    21.873072823677948  |     18.05377355524998  |     15.472646535860257  |
|   pressure [Pa] = 2100000  |     45.02058216836334  |     35.79619626115461  |     30.190059516194083  |
|   pressure [Pa] = 3100000  |      73.0547505549322  |     55.06117914599007  |     45.580574187479066  |
						[...]
|  pressure [Pa] = 67100000  |     1107.292557196501  |     983.4638012355585  |      863.9649406367214  |
|  pressure [Pa] = 68100000  |    1109.1855359680847  |     986.2233300634709  |       867.698289923355  |
|  pressure [Pa] = 69100000  |    1111.0569954467694  |     988.9398867966821  |      871.3611145780119  |
|  pressure [Pa] = 70100000  |    1112.9074848288449  |      991.614907000032  |      874.9561390383249  |
|  pressure [Pa] = 71100000  |    1114.7375318533834  |     994.2497540203499  |      878.4859333715468  |
|  pressure [Pa] = 72100000  |    1116.5476438596384  |     996.8457238250027  |      881.9529245875995  |
|  pressure [Pa] = 73100000  |    1118.3383088824808  |     999.4040493886989  |      885.3594069497734  |
|  pressure [Pa] = 74100000  |    1120.1099966304896  |    1001.9259047775354  |      888.7075513940321  |
----------------------------------------------------------------------------------------------------------

…e-layout

…dudes/table-layout

…feature/dudes/table-layout" This reverts commit 8f74cfa.

…nto feature/dudes/table-layout

… pvt-logs-cp

…e-layout

arng40 · 2024-08-30T08:19:56Z

Hi @rrsettgast , @paveltomin, I only have this error in the integrated tests :

Rank 0 is comparing /tmp/tmp.LquJVkCo6y/GEOS_integratedTests_working/compositionalMultiphaseFlow/co2_hybrid_1d_02/0to10_restart_000000010/rank_0000000.hdf5 with /tmp/tmp.LquJVkCo6y/GEOS_integratedTests_baselines/compositionalMultiphaseFlow/co2_hybrid_1d_02/0to10_restart_000000010/rank_0000000.hdf5 
********************************************************************************
Error: /Problem/domain/Constitutive/fluid
	Group has a child 'writeCSV' in the file to compare but not the baseline file.
********************************************************************************

It seems normal to me because I added the writeCSV attribute in CO2BrineFluid file.
I think we can safely rebaseline.

MelReyCG

@arng40 I suggest you to go for the "option 2" I proposed.

arng40 · 2024-09-04T15:19:42Z

@arng40 I suggest you to go for the "option 2" I proposed.

It's good

MelReyCG · 2024-09-04T15:33:06Z

A few more adjustments may need to be done.

…output

arng40 · 2024-09-09T21:45:13Z

Hello @rrsettgast , All the comments has been addressed, I think we can safely rebase the PR and merge it

…output

rrsettgast

I only have a question about the removal of the catalog.

rrsettgast · 2024-09-25T10:30:35Z

src/coreComponents/common/format/table/TableFormatter.cpp

@@ -67,7 +68,8 @@ string TableCSVFormatter::dataToString( TableData const & tableData ) const
  return oss.str();
 }

-string TableCSVFormatter::toString( TableData const & tableData ) const
+template<>
+string TableCSVFormatter::toString< TableData >( TableData const & tableData ) const


what is the benefit of the template specialization here vs overload?

Formatting with a TableFunction is very different from formatting with a normal data source and is heavily coupled to TableFunctions, I did that to avoid to add dependancies to TableFunction

src/coreComponents/constitutive/fluid/multifluid/CO2Brine/functions/PVTFunctionBase.hpp

rrsettgast · 2024-10-01T03:47:43Z

@arng40 @MelReyCG There are some documentation errors. This can be a little hard to navigate, and as we have just started enforcing this, there is no documentation on the process of finding errors from the readthedocs logs.

… documentation on how to fix sphinx errors

arng40 added 30 commits February 9, 2024 16:11

Table function creation

751a919

add title off case

c84a06e

setMargin function added

57bc055

add comments + test for tiny table

6255f9b

value default optionnal variable changed

601a2c5

Merge remote-tracking branch 'origin/develop' into feature/dudes/tabl…

59a9bc8

…e-layout

add log to wellGeneratorBase

677fdb6

uncrustify + missing doc

623b6ad

first review with correction

37dc5dd

constness modification, doc/test updated

8678fc0

const declaration updated

9475286

doc + minor restructuring

1320651

doc + method for row from vector

f78bd83

clean code + doc + add test for rows from vector

294f075

doc updated

36dd7a4

Merge commit 'c11ad8ecd2d0d0aba5cd0661eb6e72951252409d' into feature/…

8f74cfa

…dudes/table-layout

Revert "Merge commit 'c11ad8ecd2d0d0aba5cd0661eb6e72951252409d' into …

ebb9fc0

…feature/dudes/table-layout" This reverts commit 8f74cfa.

revert last merge and Merge remote-tracking branch 'origin/develop' i…

cb41359

…nto feature/dudes/table-layout

Merge remote-tracking branch 'origin/feature/dudes/table-layout' into…

22659ec

… pvt-logs-cp

begin pvt tables logs - add write in log bool

ff37ac9

duplication log & csv fixed

628f56b

CI correction ( uncrustify, missing doc )

e11a2bf

optionnal added to datatype

a8f9271

update doxygen for ci

9ff17b9

more logs added

d90c8b5

remove static_assert + constness

958d542

Merge remote-tracking branch 'origin/develop' into feature/dudes/tabl…

550ca26

…e-layout

remove unused code

f67e3d9

factorisation log pvt

5b8689a

doxygen added

0fa76e3

arng40 added flag: requires rebaseline Requires rebaseline branch in integratedTests and removed DO NOT MERGE ! labels Aug 30, 2024

MelReyCG approved these changes Sep 4, 2024

View reviewed changes

MelReyCG requested changes Sep 4, 2024

View reviewed changes

move outputPvt to tableFunction

e6b63ca

uppercase correction

f45679f

arng40 added 4 commits September 5, 2024 11:37

removing dead code

4ea8034

remove unused code

3f35dc7

missing import

231bad7

Merge remote-tracking branch 'origin/develop' into feature/dudes/pvt-…

8879152

…output

MelReyCG approved these changes Sep 5, 2024

View reviewed changes

MelReyCG and others added 2 commits September 9, 2024 11:24

Merge branch 'develop' into feature/dudes/pvt-output

c069c2c

Merge remote-tracking branch 'origin/develop' into feature/dudes/pvt-…

d9bd822

…output

arng40 added 2 commits September 24, 2024 11:06

Merge remote-tracking branch 'origin/develop' into feature/dudes/pvt-…

fb7db66

…output

xsd

57f3a45

arng40 mentioned this pull request Sep 25, 2024

feat: Table subs division #3353

Closed

rrsettgast approved these changes Sep 25, 2024

View reviewed changes

Merge branch 'develop' into feature/dudes/pvt-output

f97a068

rrsettgast added the ci: run code coverage enables running of the code coverage CI jobs label Sep 30, 2024

update test baselines. removed stale rst files. added instructions to…

eb3729e

… documentation on how to fix sphinx errors

rrsettgast requested review from castelletto1 and jhuang2601 as code owners October 1, 2024 04:53

fix error in sphinx

a537cdd

paveltomin merged commit 0db85be into develop Oct 1, 2024
25 checks passed

paveltomin deleted the feature/dudes/pvt-output branch October 1, 2024 16:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Log refactor - Output PVT #3149

feat: Log refactor - Output PVT #3149

arng40 commented May 29, 2024 •

edited

Loading

arng40 commented Aug 30, 2024 •

edited

Loading

MelReyCG left a comment

arng40 commented Sep 4, 2024

MelReyCG commented Sep 4, 2024

arng40 commented Sep 9, 2024 •

edited by MelReyCG

Loading

rrsettgast left a comment

rrsettgast Sep 25, 2024

arng40 Sep 25, 2024

rrsettgast commented Oct 1, 2024

feat: Log refactor - Output PVT #3149

feat: Log refactor - Output PVT #3149

Conversation

arng40 commented May 29, 2024 • edited Loading

arng40 commented Aug 30, 2024 • edited Loading

MelReyCG left a comment

Choose a reason for hiding this comment

arng40 commented Sep 4, 2024

MelReyCG commented Sep 4, 2024

arng40 commented Sep 9, 2024 • edited by MelReyCG Loading

rrsettgast left a comment

Choose a reason for hiding this comment

rrsettgast Sep 25, 2024

Choose a reason for hiding this comment

arng40 Sep 25, 2024

Choose a reason for hiding this comment

rrsettgast commented Oct 1, 2024

arng40 commented May 29, 2024 •

edited

Loading

arng40 commented Aug 30, 2024 •

edited

Loading

arng40 commented Sep 9, 2024 •

edited by MelReyCG

Loading