Skip to content

Commit aff1eb0

Browse files
committed
Squashed commit of the following:
commit 5537695 Merge: ecd5f7f 4aa2c9f Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Thu Apr 17 13:45:39 2025 +0200 Merge branch 'develop' into feature/rey/umpire-csv-stats commit ecd5f7f Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu Apr 17 11:31:26 2025 +0200 🦺 rebaseline for "parallelThread" moving commit 4aa2c9f Author: Randolph Settgast <settgast1@llnl.gov> Date: Wed Apr 16 13:33:48 2025 -0700 fix: remove incorrect use of template keyword in function calls with no template argument list (#3625) * in cases where there is a templated base class and a templated function func<T>(T t), calls such as derived::template func( t ) is actually non-compliant. It is replaced with derived::template func<>( T ) commit 1b7ebdc Merge: 6e4ec16 696e599 Author: MelReyCG <122801580+MelReyCG@users.noreply.github.com> Date: Wed Apr 16 17:37:16 2025 +0200 Merge branch 'develop' into feature/rey/umpire-csv-stats commit 6e4ec16 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 16:48:37 2025 +0200 ♻️ simplifying isNewlyOpened in header commit 6cb75f1 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 16:46:17 2025 +0200 ♻️ simplifying isNewlyOpened in header commit bc39174 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 16:45:05 2025 +0200 ♻️ simplifying isNewlyOpened because behaviour was potencially not accurate in some situations + was complexifying the code commit 9b46fe9 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 16:43:44 2025 +0200 💡 added todo for error listing PR 3614 commit 9d2e191 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 16:18:18 2025 +0200 🐛 💄 update CSV & Log table layouts for parsing & readability + fix percentage computation commit acb6d27 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 15:00:23 2025 +0200 ⚰️ dead code commit 3189e9f Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 14:21:50 2025 +0200 💄 thinner table layout (table was large) commit 79ba4cf Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 14:13:28 2025 +0200 🐛 📝 docs bugfix, 2nd attempt commit 7b271c5 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 14:06:34 2025 +0200 🐛 📝 docs bugfix commit b9f38f9 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 10:44:20 2025 +0200 📝 docs fixes commit 7c92938 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 16 10:17:56 2025 +0200 📝 docs fix commit 696e599 Author: Pavel Tomin <paveltomin@users.noreply.github.com> Date: Tue Apr 15 10:44:03 2025 -0700 fix: time step logic for sequential (#3624) commit 4778151 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Apr 15 17:45:13 2025 +0200 🐛 add include commit b157672 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Apr 15 17:43:59 2025 +0200 🩹 better strategy for defining last report cycle & time commit 479230f Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Apr 15 17:12:19 2025 +0200 🎨 uncrustify commit e36337e Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Apr 15 17:06:19 2025 +0200 🐛 correct last timestep writing commit f547b76 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Apr 15 16:33:30 2025 +0200 🐛 wrong csv character (added a global definition of the standard CSV separator) commit c23c214 Author: Arnaud DUDES <155963334+arng40@users.noreply.github.com> Date: Tue Apr 15 16:12:53 2025 +0200 fix: Log levels generation on documentation generation (#3615) commit b2d65ce Author: Jian Huang <53012159+jhuang2601@users.noreply.github.com> Date: Tue Apr 15 09:12:18 2025 -0500 fix: update TFrac tutorial example (#3595) commit f6b3d86 Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Apr 15 15:11:50 2025 +0200 🐛 Solve singleton issues commit 145676e Author: MelReyCG <melvin.rey@capgemini.com> Date: Tue Apr 15 10:36:19 2025 +0200 ✅ Added unit-test for MemoryStats & MemoryStatsOutput commit d0e5b2a Author: Arnaud DUDES <155963334+arng40@users.noreply.github.com> Date: Tue Apr 15 00:49:34 2025 +0200 refactor: Refactoring raw logs to tables (#3559) * solubility table * fields table * load balancing * set mesh partitioner smaller and removed some info if rank size = 1 * improve CO2 solubility commit 2404873 Author: Arnaud DUDES <155963334+arng40@users.noreply.github.com> Date: Tue Apr 15 00:45:04 2025 +0200 refactor: FieldSpecification context when targeting wrong fieldName (#3508) * add specific fieldName when enter wrong name * remove char const and set pstringstream * attempt n°3 to output fieldName error commit 10f0a21 Author: Brian Han <han12@llnl.gov> Date: Mon Apr 14 12:45:56 2025 -0700 build: Update RAJA suite to v2025.03.0 (#3613) * update tag * Update geos spack-generated host-configs * Update LvArray submodule commit 679b39c Author: MelReyCG <melvin.rey@capgemini.com> Date: Mon Apr 14 09:46:30 2025 +0200 ⚰️ removed dead attribute "parallelThreads" from exemples commit 651a6c7 Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Apr 11 14:07:14 2025 +0200 📦 the schema commit 8adab2a Author: MelReyCG <melvin.rey@capgemini.com> Date: Fri Apr 11 14:07:07 2025 +0200 🐛 ♻️ used unique ptrs to build the formatters commit e9e6d7d Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu Apr 10 18:14:23 2025 +0200 ✨ adding multiple memory output possibility during simulation todo : call setCurrentCycle() for the ultimate call commit 9446be7 Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu Apr 10 16:58:46 2025 +0200 🎨 🐛 finished implementation of MemoryStatsOutput commit 09973c3 Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu Apr 10 11:04:24 2025 +0200 🐛 adapting header usage commit 5656c1a Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu Apr 10 09:50:55 2025 +0200 🐛 minor refactor commit ae83b90 Author: MelReyCG <melvin.rey@capgemini.com> Date: Thu Apr 10 09:28:25 2025 +0200 🐛 wrong include commit e8ca7b5 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 17:35:14 2025 +0200 ✨ Adding MemoryStatsOutput to CMakeLists commit 0e5758c Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 17:34:41 2025 +0200 🐛 various fixes commit acea035 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 17:29:19 2025 +0200 🐛 please don't look commit f5d5763 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 17:25:29 2025 +0200 🐛 constness commit 4b5efc2 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 17:22:03 2025 +0200 🐛 messed some parameters commit 7a00b83 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 17:10:51 2025 +0200 🐛 forgot some GEOS_FMT commit 2434f0f Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 16:55:55 2025 +0200 🐛 adding specification of isNewlyOpened commit 2a2e40f Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 16:32:55 2025 +0200 ♻️ moved implementation of "parallelThread" code from OutputBase to SiloOutput as it is not useful on any other sub-class commit 1c68d5c Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 16:12:02 2025 +0200 ♻️ moved "parallelThread" code from OutputBase to SiloOutput as it is not useful on any other sub-class commit cf3cf92 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 16:07:51 2025 +0200 ✨ Adding "MemoryStats" to add to "Outputs" to control the umpire stats output commit ace69ef Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 15:57:32 2025 +0200 ♻️ minor refactor commit 143eb00 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 15:37:53 2025 +0200 🗑️ TODO, remove inherited SILO code commit 634bc0b Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 15:36:59 2025 +0200 🐛 wrong accessors for MemoryLogging commit 9e8ebba Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 15:10:06 2025 +0200 📦 P4 down so let's try to write the desired schema by hand? commit 9ffa983 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 14:44:12 2025 +0200 ✨ adding error aware stream-to-file functions for ouputing CSV memory stats tables commit 7e7463a Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 14:42:39 2025 +0200 🎨 minor changes commit 8b85058 Author: MelReyCG <melvin.rey@capgemini.com> Date: Wed Apr 9 10:38:00 2025 +0200 ✨ Added a MemoryLoging singleton component to manage the output of memory stats (umpire) with more flexibility commit e09f499 Author: Matteo Cusini <49037133+CusiniM@users.noreply.github.com> Date: Mon Apr 7 11:03:53 2025 -0700 fix: Fix runtime cuda error. (#3617) * fix: Fix runtime cuda error. * fix another similar error. * Update src/coreComponents/fieldSpecification/TractionBoundaryCondition.cpp commit 2e206c1 Author: Ben Corbett <32752943+corbett5@users.noreply.github.com> Date: Sat Apr 5 11:28:59 2025 -0700 fix: Fixed leaks in ArrayOfArrays and MeshLevel. (#3602) * Fixed leaks in ArrayOfArrays and MeshLevel. * submodule update * Updated LvArray --------- Co-authored-by: Matteo Cusini <49037133+CusiniM@users.noreply.github.com>
1 parent 4f05197 commit aff1eb0

42 files changed

Lines changed: 964 additions & 188 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.integrated_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
baselines:
22
bucket: geosx
3-
baseline: integratedTests/baseline_integratedTests-pr3624-11053-ae011c7
3+
baseline: integratedTests/baseline_integratedTests-pr3622-11082-1b7ebdc
44

55
allow_fail:
66
all: ''

BASELINE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ This file is designed to track changes to the integrated test baselines.
66
Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
77
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).
88

9+
PR #3622 (2025-04-17)
10+
=====================
11+
Moved "parallelThread" from OutputBase to SiloOutput as it is not useful on any other sub-class
12+
913
PR #3624 (2025-04-15)
1014
=====================
1115
Bugfix for time step cut in sequential, minor time step logic change when a cut occurs.

inputFiles/hydraulicFracturing/kgdToughnessDominated_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,7 @@
232232
<VTK
233233
name="vtkOutput"
234234
plotFileRoot="zeroViscosity"
235-
plotLevel="3"
236-
parallelThreads="48"/>
235+
plotLevel="3"/>
237236

238237
<TimeHistory
239238
name="timeHistoryOutput"

inputFiles/hydraulicFracturing/kgdToughnessDominated_poroelastic_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@
213213
<VTK
214214
name="vtkOutput"
215215
plotFileRoot="zeroViscosity_poroelastic"
216-
plotLevel="3"
217-
parallelThreads="48"/>
216+
plotLevel="3"/>
218217

219218
<TimeHistory
220219
name="timeHistoryOutput"

inputFiles/hydraulicFracturing/kgdViscosityDominated_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,7 @@
232232
<VTK
233233
name="vtkOutput"
234234
plotFileRoot="zeroToughness"
235-
plotLevel="3"
236-
parallelThreads="48"/>
235+
plotLevel="3"/>
237236

238237
<TimeHistory
239238
name="timeHistoryOutput"

inputFiles/hydraulicFracturing/kgdViscosityDominated_poroelastic_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@
214214
<VTK
215215
name="vtkOutput"
216216
plotFileRoot="zeroToughness_poroelastic"
217-
plotLevel="3"
218-
parallelThreads="48"/>
217+
plotLevel="3"/>
219218

220219
<TimeHistory
221220
name="timeHistoryOutput"

inputFiles/hydraulicFracturing/pennyShapedAnisotropicToughness_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,7 @@
218218
<VTK
219219
name="vtkOutput"
220220
plotFileRoot="zeroViscosity"
221-
plotLevel="3"
222-
parallelThreads="48"/>
221+
plotLevel="3"/>
223222

224223
<Restart
225224
name="restartOutput"/>

inputFiles/hydraulicFracturing/pennyShapedToughnessDominated_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@
183183
<VTK
184184
name="vtkOutput"
185185
plotFileRoot="zeroViscosity"
186-
plotLevel="3"
187-
parallelThreads="48"/>
186+
plotLevel="3"/>
188187

189188
<TimeHistory
190189
name="timeHistoryOutput"

inputFiles/hydraulicFracturing/pennyShapedToughnessDominated_poroelastic_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@
183183
<VTK
184184
name="vtkOutput"
185185
plotFileRoot="zeroViscosity_poroelastic"
186-
plotLevel="3"
187-
parallelThreads="48"/>
186+
plotLevel="3"/>
188187

189188
<TimeHistory
190189
name="timeHistoryOutput"

inputFiles/hydraulicFracturing/pennyShapedViscosityDominated_base.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@
183183
<VTK
184184
name="vtkOutput"
185185
plotFileRoot="zeroToughness"
186-
plotLevel="3"
187-
parallelThreads="48"/>
186+
plotLevel="3"/>
188187

189188
<TimeHistory
190189
name="timeHistoryOutput"

0 commit comments

Comments
 (0)