refactor: constitutive cleanup by paveltomin · Pull Request #3776 · GEOS-DEV/GEOS

paveltomin · 2025-08-14T19:24:31Z

unify allocateConstitutiveData logic
remove redundant code (mostly empty destructors, inspired by feat: Linear algebra updates #2427 (comment))
make registerField calls similar to how they look like in solvers (avoid "{}")
remove duplicative initializers from constructor list

will fix added TODOs in a follow-up PR

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…Dependent.hpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull Request Overview

This PR performs a comprehensive constitutive system cleanup, refactoring the allocateConstitutiveData pattern to a more consistent resizeFields approach and removing unnecessary virtual destructors and member variables. The changes standardize memory allocation patterns across all constitutive models and fix spelling errors.

Refactors allocateConstitutiveData method calls to use resizeFields pattern consistently
Removes virtual destructors and unused member variables across constitutive models
Fixes spelling errors in filenames and code (e.g., "Anisotroipic" to "Anisotropic")

Reviewed Changes

Copilot reviewed 149 out of 149 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/coreComponents/physicsSolvers/fluidFlow/SinglePhaseBase.cpp	Updates fluid state initialization to use `saveConvergedState()`
src/coreComponents/physicsSolvers/fluidFlow/FlowSolverBase.cpp	Removes unused hydraulic aperture header include
src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp	Updates fluid state initialization to use `saveConvergedState()`
src/coreComponents/constitutive/solid/SolidModelDiscretizationOpsFullyAnisotropic.hpp	Fixes spelling error in filename and struct name
src/coreComponents/constitutive/ConstitutiveBase.hpp	Adds base `resizeFields` virtual method
src/coreComponents/constitutive/ConstitutiveBase.cpp	Integrates `resizeFields` into `allocateConstitutiveData`
Multiple constitutive model files	Refactors `allocateConstitutiveData` to `resizeFields` and removes virtual destructors

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

src/coreComponents/constitutive/solid/ElasticIsotropicPressureDependent.hpp

src/coreComponents/constitutive/permeability/DamagePermeability.cpp

…eanup

paveltomin · 2025-09-12T20:36:42Z

src/coreComponents/constitutive/fluid/multifluid/compositional/CompositionalMultiphaseFluid.cpp

+  MultiFluidBase::allocateConstitutiveData( parent, numPts );

  // Zero k-Values to force re-initialisation
  m_kValues.zero();


@dkachuma could you please double-check i didn't messed up your recent fix here

We still need the initializeState method.

dkachuma

I think we still need to distinguish initializeState from saveConvergedState. Although initializeState simply calls saveConvergedState for now, we will have instances where there are truly actions that need be done only once.

src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.hpp

src/coreComponents/constitutive/contact/CoulombFriction.cpp

dkachuma · 2025-08-15T21:26:41Z

src/coreComponents/constitutive/fluid/multifluid/MultiFluidBase.cpp

  setLabels();
 }

-void MultiFluidBase::initializeState() const


I would still leave this method. I can see this being useful for some fluid models (in the future). It does give the feel that it will be called once therefore is good for properties that need initialising.

dkachuma · 2025-09-12T21:35:21Z

src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.cpp


-  registerField( fields::cappres::jFuncMultiplier{}, &m_jFuncMultiplier );
-
-  registerWrapper( viewKeyStruct::jFunctionWrappersString(), &m_jFuncKernelWrappers ).


Don't we need this for the deliverClone to work properly.

didn't break anything after I removed it, but I can revert since I am not exactly sure what is going on here

dkachuma · 2025-09-12T21:43:13Z

src/coreComponents/constitutive/fluid/multifluid/compositional/CompositionalMultiphaseFluid.cpp

+  MultiFluidBase::allocateConstitutiveData( parent, numPts );

  // Zero k-Values to force re-initialisation
  m_kValues.zero();


We still need the initializeState method.

…eanup

Added a method to initialize the model state.

Added entries for PR #3776 and PR #3349 with justification.

refactor: constitutive cleanup

766daa3

paveltomin self-assigned this Aug 14, 2025

paveltomin added ci: run CUDA builds Allows to triggers (costly) CUDA jobs ci: run integrated tests Allows to run the integrated tests in GEOS CI labels Aug 14, 2025

paveltomin requested review from CusiniM, Guotong-Ren, castelletto1, dkachuma, jhuang2601, matteofrigo5, rasimHZ, rrsettgast and tjb-ltk as code owners August 14, 2025 19:24

Pavel Tomin and others added 7 commits August 14, 2025 15:02

code style and build fix

a571ba0

fix unit tests

3033701

unused

6883847

revert for hydrofrac

3767103

trying to avoid diffs

5646aa2

Merge branch 'develop' into pt/constitutive-cleanup

f823319

Update testInvariantImmiscibleFluid.cpp

dd30886

paveltomin requested a review from Copilot August 15, 2025 20:34

This comment was marked as outdated.

Sign in to view

paveltomin and others added 6 commits August 15, 2025 15:42

Update src/coreComponents/constitutive/solid/InvariantDecompositions.hpp

201abf8

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update InvariantDecompositions.hpp

56db8a1

Update src/coreComponents/constitutive/solid/ElasticIsotropicPressure…

b9b9a00

…Dependent.hpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update src/coreComponents/constitutive/solid/ElasticIsotropicPressure…

6060796

…Dependent.hpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update src/coreComponents/constitutive/solid/ElasticIsotropicPressure…

e47c74a

…Dependent.hpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update ElasticIsotropicPressureDependent.hpp

b77d58b

paveltomin requested a review from Copilot August 15, 2025 20:47

Copilot AI reviewed Aug 15, 2025

View reviewed changes

Pavel Tomin added 2 commits September 12, 2025 15:34

Merge remote-tracking branch 'origin/develop' into pt/constitutive-cl…

cbd6f2c

…eanup

this should look better

705becc

paveltomin commented Sep 12, 2025

View reviewed changes

castelletto1 approved these changes Sep 12, 2025

View reviewed changes

dkachuma approved these changes Sep 12, 2025

View reviewed changes

restore initializeState

f6da3db

paveltomin added the ci: run integrated tests Allows to run the integrated tests in GEOS CI label Sep 12, 2025

Merge remote-tracking branch 'origin/develop' into pt/constitutive-cl…

0ac4044

…eanup

paveltomin requested a review from OmarDuran as a code owner September 13, 2025 15:41

paveltomin added 7 commits September 13, 2025 10:47

Replace fluid.saveConvergedState with fluid.initializeState

adbdd4c

Change fluid state saving to initialization

17417fe

Add initializeState method to SingleFluidBase

47d9edb

Add initializeState method to SingleFluidBase

e0222df

Added a method to initialize the model state.

Replace saveConvergedState with initializeState

39c1251

Replace saveConvergedState with initializeState

e0513aa

Merge branch 'develop' into pt/constitutive-cleanup

88bd98b

paveltomin added the ci: run CUDA builds Allows to triggers (costly) CUDA jobs label Sep 13, 2025

paveltomin and others added 7 commits September 13, 2025 19:24

Update baseline path in integrated tests configuration

381a723

Update baseline notes with recent PR entries

08e6914

Added entries for PR #3776 and PR #3349 with justification.

Update baseline path in integrated tests configuration

c268d0c

fix hyst cases

f2b24b9

fix pressure perm

5b9caf6

fix damage

694fc29

Update baseline path in integrated tests configuration

5d0d5f0

paveltomin merged commit 9a12dc4 into develop Sep 14, 2025
25 of 26 checks passed

paveltomin deleted the pt/constitutive-cleanup branch September 14, 2025 20:23

paveltomin restored the pt/constitutive-cleanup branch September 15, 2025 21:37

paveltomin deleted the pt/constitutive-cleanup branch September 15, 2025 21:39

paveltomin restored the pt/constitutive-cleanup branch September 15, 2025 21:41

paveltomin deleted the pt/constitutive-cleanup branch September 15, 2025 21:41


		registerField( fields::cappres::jFuncMultiplier{}, &m_jFuncMultiplier );

		registerWrapper( viewKeyStruct::jFunctionWrappersString(), &m_jFuncKernelWrappers ).

Conversation

paveltomin commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

paveltomin Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

dkachuma Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

dkachuma left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dkachuma Aug 15, 2025

Choose a reason for hiding this comment

Uh oh!

paveltomin Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

dkachuma Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

paveltomin Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

dkachuma Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

paveltomin commented Aug 14, 2025 •

edited

Loading