feat: Additional information on the table log perforation #3966
feat: Additional information on the table log perforation #3966
Conversation
| /// The reservoir element that contains the perforation | ||
| globalIndex m_reservoirElementID; | ||
| /// the target region name for the reservoir element | ||
| string m_regionName; | ||
| /// the target sub region name for the reservoir element | ||
| string m_subRegionName; |
There was a problem hiding this comment.
A WellElementSubRegion can only have one communicating region cell element?
Isn't this data already stored somewhere?
There was a problem hiding this comment.
yep I revert wellElementSubRegion cpp & hpp
| localIndex & esrMatched, | ||
| localIndex & eiMatched, | ||
| globalIndex & giMatched, |
There was a problem hiding this comment.
As you may have a lot of parameters here, maybe a functor with a structured parameter would be simpler to call than a lot of in-out parameters.
Also, the return type is not documented, it is a EOF-style-bool, right? With a functor you could have the loop inside of the search method.
…tions-table-detail
commit 82269bc Merge: 28643c9 cf245f7 Author: Nicola Castelletto <38361926+castelletto1@users.noreply.github.com> Date: Thu Feb 12 17:31:28 2026 -0800 Merge branch 'develop' into feature/rey/negative-pressure-cells commit 28643c9 Merge: 9be8d0b f6d0663 Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Thu Feb 12 13:51:40 2026 +0100 Merge branch 'develop' into feature/rey/negative-pressure-cells commit 9be8d0b Merge: fe60222 be45914 Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Wed Feb 11 16:52:42 2026 +0100 Merge branch 'develop' into feature/rey/negative-pressure-cells commit fe60222 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon Feb 9 16:14:35 2026 +0100 🔊 pressures/densities equal to 0.0 are also reported (not only negatives) commit 168bd0c Merge: b3094e4 4103efd Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Tue Nov 18 11:30:20 2025 +0100 Merge branch 'develop' into feature/rey/negative-pressure-cells commit b3094e4 Merge: 370da84 889ea4e Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Wed Nov 5 09:48:33 2025 +0100 Merge branch 'develop' into feature/rey/negative-pressure-cells commit 370da84 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Nov 4 17:10:52 2025 +0100 🐛 unit test merge fix commit 89c5505 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Nov 4 15:17:52 2025 +0100 📝 doc fix commit b5d66be Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Nov 4 14:46:27 2025 +0100 🎨 📝 code style & docs commit b3bfe1a Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Nov 4 14:38:43 2025 +0100 🎨 copilot code checks commit 69cd64c Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Oct 29 10:50:29 2025 +0100 ⚰️ merge missing variable commit c46879b Merge: 9cf5abe 178874f Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Oct 29 10:28:02 2025 +0100 Merge remote-tracking branch 'origin/develop' into feature/rey/negative-pressure-cells commit 9cf5abe Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Oct 28 14:36:31 2025 +0100 🐛 typo 2 commit b78a3d7 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon Oct 27 16:52:03 2025 +0100 📝 small precision on loginfo commit 79e1b11 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Oct 28 14:22:50 2025 +0100 🐛 typo commit 2a45e98 Merge: e443151 7416c57 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Oct 28 11:54:26 2025 +0100 Merge remote-tracking branch 'origin/develop' into feature/rey/negative-pressure-cells commit e443151 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Aug 26 15:46:38 2025 +0200 ♻️ renamings (after Pavel review) commit 7812f75 Merge: f18cb8e 0cb3f1f Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Aug 26 10:46:30 2025 +0200 Merge branch 'develop' into feature/rey/negative-pressure-cells commit f18cb8e Merge: de56d0d 43216af Author: Pavel Tomin <paveltomin@users.noreply.github.com> Date: Thu Aug 7 12:43:10 2025 -0500 Merge branch 'develop' into feature/rey/negative-pressure-cells commit de56d0d Author: Pavel Tomin <ptls@PW0BMYGN.localdomain> Date: Wed Aug 6 17:16:17 2025 -0500 code style commit a32f7d7 Merge: 8bf3470 b7e609f Author: Pavel Tomin <paveltomin@users.noreply.github.com> Date: Wed Aug 6 11:54:24 2025 -0500 Merge branch 'develop' into feature/rey/negative-pressure-cells commit 8bf3470 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon Jul 21 16:01:43 2025 +0200 🐛 compil fix commit 96ffe23 Merge: 7a83961 b05541b Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon Jul 21 16:01:31 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/rey/negative-pressure-cells commit 7a83961 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Jul 18 15:42:12 2025 +0200 📝 added an idea commit 2e4193c Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Jul 18 15:33:57 2025 +0200 📝 previous commit fix commit 409f461 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Jul 18 14:24:51 2025 +0200 📝 documentation updates commit 937c446 Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu Jul 17 16:12:09 2025 +0200 ⚰️ removed dead code commit aeb8ea0 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jul 16 17:21:42 2025 +0200 📦 schema commit 4b46f19 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jul 16 17:21:18 2025 +0200 🐛 solve a bug where the last line of the table was cut (when the r0 had no content) commit 92e9abb Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jul 16 17:04:55 2025 +0200 🧪 adding a (failing) test to highlight a bug commit 63fe7e7 Merge: 8d50b4c aa33980 Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Wed Jul 16 16:13:07 2025 +0200 Merge branch 'develop' into feature/rey/negative-pressure-cells commit 8d50b4c Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jul 16 16:11:18 2025 +0200 ♻️ set constant params const commit 89fe094 Merge: ef29d77 7e85e74 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Jul 8 15:50:59 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/rey/negative-pressure-cells commit ef29d77 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Jul 4 15:55:31 2025 +0200 ranksStrsDisps -> ranksStrsOffsets commit 61c4199 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Jul 4 15:38:45 2025 +0200 📝 doc fix commit 5af2601 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jul 2 12:05:25 2025 +0200 📝 missing last docs commit de75861 Merge: 8eb526b 125ffb9 Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Wed Jul 2 11:52:59 2025 +0200 Merge branch 'develop' into feature/rey/negative-pressure-cells commit 8eb526b Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jul 2 11:51:48 2025 +0200 🎨 uncrustify commit 411636d Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jul 2 11:48:22 2025 +0200 📝 Adding las docs commit e5ae68e Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Jul 1 17:54:36 2025 +0200 ✅ adding mpi tables unit test commit 112be17 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Jul 1 17:54:09 2025 +0200 📝 updating documentation commit b086a4f Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Jul 1 15:46:33 2025 +0200 🐛 fixing scarce crash when mpi-tables are constructed from more than 2 ranks commit 0475436 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Jul 1 15:45:59 2025 +0200 ⚰️ unused variables commit 72e8ecd Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Jun 6 10:22:27 2025 +0200 💄 transposing table layout for clarity (user review) commit 390e451 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Jun 6 10:18:17 2025 +0200 ♻️ Adding missing signatures commit 9b6cd4d Merge: 5ab8421 c2768e6 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jun 4 11:46:45 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/rey/negative-pressure-cells commit 5ab8421 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Jun 4 11:46:15 2025 +0200 ✨ adding ranks separator titles commit 6a43cb9 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Jun 3 18:24:38 2025 +0200 ✨ finishing MPI tables with a different approach (log output on rank0 only) commit 6487d6c Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon Jun 2 14:13:33 2025 +0200 ✨ 🧪 first attempt at creating MPI tables commit 854dc3e Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed May 28 14:34:17 2025 +0200 ♻️ minor refactor of TableFormatter.cpp commit 66f2d72 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed May 28 14:33:57 2025 +0200 ✨ adding info to warn the user to increase a logLevel to get the report commit 4a9f780 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed May 28 14:16:22 2025 +0200 ✨extending reported data to pressure/density (IdReporter -> ElementReporter) commit 00d8c57 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed May 28 11:00:31 2025 +0200 ⚰️ dead code commit da89daf Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue May 27 17:09:02 2025 +0200 💄 new table format commit e7f73cf Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 26 17:49:19 2025 +0200 ✨ offering control on alignement when using columns-free table layouts commit 3fd0c12 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 26 17:48:52 2025 +0200 ♻️ 🐛 simplifying & fixing visible columns counting commit 8f68eb5 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 26 17:47:25 2025 +0200 ♻️ refactoring TableFormatter: give control to inheriting classes commit 5744a2a Merge: 58d1dce ef5e940 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 26 14:06:10 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/rey/negative-pressure-cells commit 58d1dce Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 26 11:52:38 2025 +0200 ♻️ refactoring TableFormatter: give control to inheriting classes commit 3eb2293 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 26 11:48:38 2025 +0200 ♻️ removing double assessor + exposing non-const version commit 5fc7ea6 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri May 23 12:28:09 2025 +0200 ✨ adding support for no column titled table layout commit 47f5c5c Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri May 23 11:09:44 2025 +0200 ✨ adding table indentation commit de506c6 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri May 23 10:09:42 2025 +0200 ✨ adding table formatting to allow for showing more data commit 0803a92 Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu May 22 16:53:04 2025 +0200 🐛 CUDA crash fix + bug fix (data not moved from device) commit d29db45 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue May 20 17:42:52 2025 +0200 🐛 adding one more barrier to not get the msg cut by other msgs. commit e0b104d Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue May 20 17:22:31 2025 +0200 💄 msg slight rewriting commit 3f97e2b Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue May 20 14:33:40 2025 +0200 🐛 fix for a CUDA target: explicit constructor call commit 6766e7e Merge: 056ac9c 5a65081 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue May 20 11:37:03 2025 +0200 Merge remote-tracking branch 'origin/develop' into feature/rey/negative-pressure-cells commit 056ac9c Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue May 20 11:29:21 2025 +0200 ✨ implementation of neg pressure ids output on other models commit 18703e3 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue May 20 11:28:20 2025 +0200 ♻️ refactors to prevent computing mpi reduction twice + constness + naming commit 14a546f Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 19 16:10:47 2025 +0200 💄 adding msg precisions commit 4ebe330 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 19 15:48:26 2025 +0200 💄 slight msg change / fix 2 commit 5cf6814 Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon May 19 15:40:18 2025 +0200 💄 slight msg change / fix commit 96cd0a8 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri May 16 18:10:08 2025 +0200 ✨ activation de l'output des valeurs problématique en f° d'un nouveau logLevel "SolutionDetails" commit cb0ae03 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri May 16 12:34:53 2025 +0200 ♻️ proper cpp/hpp file repartition commit 1434bd3 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri May 16 12:09:57 2025 +0200 ♻️ removing unnecessary template commit 8d158fc Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri May 16 11:56:59 2025 +0200 ✨ added the IdReporter classes to facilitate outputing ids & their count from kernels (optionally) commit 76f4644 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed May 7 18:24:23 2025 +0200 💩 first attempt at outputing wrong cells in multiphase cases... work on CPU but doesn't on GPU build + suboptimal
…tions-table-detail
…tions-table-detail
| int const rankId = MpiWrapper::commRank(); | ||
| int const nbRanks = MpiWrapper::commSize(); | ||
| if( nbRanks > 1 ) | ||
| { | ||
| ASSERT_EQ( nbRanks, 4 ); |
There was a problem hiding this comment.
Why moving that & removing the message?
I think you can leave this test as it was.
| int const rankId = MpiWrapper::commRank(); | ||
| int const nbRanks = MpiWrapper::commSize(); | ||
| ASSERT_EQ( nbRanks, 4 ) << "This unit test cases are designed for exactly 4 ranks to check row ordering consistency."; | ||
|
|
||
| for( TestCase const & testCase: testCases ) | ||
| if( nbRanks > 1 ) | ||
| { | ||
| ASSERT_EQ( nbRanks, 4 ); |
There was a problem hiding this comment.
You can use the same as in the other test.
| { {1, 0.502} }, | ||
| { {2, 0.624}, {3, 0.791} }, | ||
| {}, | ||
| { {4, 0.243}, {5, 0.804}, {6, 0.302} }, |
There was a problem hiding this comment.
I don't understand what is tested if the data is already sorted. Wouldn't it get the same table if we removed the sorting function?
| } | ||
|
|
||
| // Custom Comp function; | ||
| namespace tabledatasorting |
There was a problem hiding this comment.
- code style:
tableDataSorting - As it is declared at this level (
TableData.hppand notTableMpiComponents.hpp), I would have expected a sorting mecanism available inTableData. Could the sorting function be easily moved? (TableData::sort(functor) -> std::sort())
| wellSubRegion = wellRegion.getGroup( ElementRegionBase::viewKeyStruct::elementSubRegions() ) | ||
| .getGroup< WellElementSubRegion >( wellRegion.getSubRegionName() ); |
There was a problem hiding this comment.
Prefer getSubRegion() over reimplementing dataRepository access.
| MpiWrapper::gather( &rankStrSize, 1, ranksStrsSizes.data(), 1, 0 ); | ||
| stdVector< string > strsAccrossRanks; | ||
|
|
||
| MpiWrapper::gatherStringOnRank0( rankStr, std::function< void(string_view) >( [&]( string_view str ){ |
There was a problem hiding this comment.
Is it possible to
| MpiWrapper::gatherStringOnRank0( rankStr, std::function< void(string_view) >( [&]( string_view str ){ | |
| MpiWrapper::gatherStringOnRank0( rankStr, [&] ( string_view str ) { |
There was a problem hiding this comment.
compilation issue [-fpermissive]
| for( integer rankId = 1; rankId < ranksCount; ++rankId ) | ||
| if( m_sortingFunctor ) | ||
| { | ||
| gatherSortAndOutput( tableOutput, dataRows, status ); |
There was a problem hiding this comment.
I don't get why headerCellsLayout & errorCellsLayout get ignored in this branch, are they discarded?
Are the header & footer (with errors) correctly output?
There was a problem hiding this comment.
I suspect that you sort formatted data, with spacing being able to influence the sorting.
Wouldn't it be easier to, in the case of the sorting functor, 1. start first by collecting the other ranks TableData lines (before any CellLayoutRows matter), 2. do a classic TableTextFormatter::toStream()?
There was a problem hiding this comment.
This part is indeed misleading, gatherSortAndOutput call toString which do all the formatting with headerRows and errorRows
| CellLayoutRows headerCellsLayout; | ||
| CellLayoutRows dataRows; | ||
| CellLayoutRows errorRows; |
There was a problem hiding this comment.
You renamed a part of the variables, but not all, is there a reason?
There was a problem hiding this comment.
An oversight , I renamed them.
| formatter.toStream( oss, data ); | ||
| if( rankId == 0 ) | ||
| { | ||
| std::cout << "ma boula " ""<< oss.str()<<std::endl; |
| void parseCellLayoutRows( CellLayoutRows const & cellLayoutRows, | ||
| stdVector< string > & rowsAsString ) const; |
There was a problem hiding this comment.
| void parseCellLayoutRows( CellLayoutRows const & cellLayoutRows, | |
| stdVector< string > & rowsAsString ) const; | |
| void cellRowsToStrings( CellLayoutRows const & cellLayoutRows, | |
| stdVector< string > & rowsAsString ) const; |
(parse would be the opposite)
Add well-subregion & rank informations.
Use of MPI Table.
Before the modification :
After