refactor: constitutive cleanup

.integrated_tests.yaml

@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3349-13555-41d98d4
+  baseline: integratedTests/baseline_integratedTests-pr3776-13573-694fc29
 
 allow_fail:
   all: ''

BASELINE_NOTES.md

@@ -6,6 +6,10 @@ This file is designed to track changes to the integrated test baselines.
 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.
 These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).
 
+PR #3776 (2025-09-13) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3776-13560-88bd98b.tar.gz>
+=====================
+Constitutive cleanup: rebaseline due to technical diffs, no real results changes.
+
 PR #3349 (2025-09-13) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3349-13555-41d98d4.tar.gz>
 =====================
 Configuration loop acceleration for SolidMechanicsLagrangeContact.

src/coreComponents/constitutive/CMakeLists.txt

@@ -197,7 +197,7 @@ set( constitutive_headers
      solid/SolidUtilities.hpp
      solid/SolidInternalEnergy.hpp
      solid/SolidModelDiscretizationOps.hpp
-     solid/SolidModelDiscretizationOpsFullyAnisotroipic.hpp
+     solid/SolidModelDiscretizationOpsFullyAnisotropic.hpp
      solid/SolidModelDiscretizationOpsIsotropic.hpp
      solid/SolidModelDiscretizationOpsTransverseIsotropic.hpp
      solid/SolidModelDiscretizationOpsOrthotropic.hpp

src/coreComponents/constitutive/ConstitutiveBase.cpp

@@ -42,10 +42,9 @@ ConstitutiveBase::CatalogInterface::CatalogType & ConstitutiveBase::getCatalog()
   return catalog;
 }
 
-void ConstitutiveBase::allocateConstitutiveData( dataRepository::Group & parent,
-                                                 localIndex const numConstitutivePointsPerParentIndex )
+void ConstitutiveBase::allocateConstitutiveData( Group & parent, localIndex const numPts )
 {
-  m_numQuadraturePoints = numConstitutivePointsPerParentIndex;
+  m_numQuadraturePoints = numPts;
 
   for( auto & group : this->getSubGroups() )
   {

src/coreComponents/constitutive/ConstitutiveBase.hpp

@@ -99,14 +99,14 @@ class ConstitutiveBase : public dataRepository::Group
   /**
    * @brief Allocate constitutive data and make views to data on parent objects
    * @param[in] parent reference to the group that holds the constitutive relation
-   * @param[in] numConstitutivePointsPerParentIndex number of quadrature points
+   * @param[in] numPts number of quadrature points
    *
    * This function does 2 things:
-   *   1) Allocate data according to the size of parent and numConstitutivePointsPerParentIndex
+   *   1) Allocate data according to the size of parent and numPts
    *   2) Create wrappers to the constitutive data in the parent for easier access
    */
   virtual void allocateConstitutiveData( dataRepository::Group & parent,
-                                         localIndex const numConstitutivePointsPerParentIndex );
+                                         localIndex const numPts );
 
   struct viewKeyStruct
   {};
@@ -129,14 +129,13 @@ class ConstitutiveBase : public dataRepository::Group
    * TODO: Remove duplicated code with ObjectManagerBase
    */
   template< typename FIELD_TRAIT >
-  dataRepository::Wrapper< typename FIELD_TRAIT::type > & registerField( FIELD_TRAIT const & fieldTrait,
-                                                                         typename FIELD_TRAIT::type * newObject )
+  dataRepository::Wrapper< typename FIELD_TRAIT::type > & registerField( typename FIELD_TRAIT::type * newObject )
   {
     if( FIELD_TRAIT::plotLevel != dataRepository::PlotLevel::NOPLOT )
-      m_userFields.emplace_back( fieldTrait.key() );
+      m_userFields.emplace_back( FIELD_TRAIT::key() );
 
-    return registerWrapper( fieldTrait.key(), newObject ).
-             setApplyDefaultValue( fieldTrait.defaultValue() ).
+    return registerWrapper( FIELD_TRAIT::key(), newObject ).
+             setApplyDefaultValue( FIELD_TRAIT::defaultValue() ).
              setPlotLevel( FIELD_TRAIT::plotLevel ).
              setRestartFlags( FIELD_TRAIT::restartFlag ).
              setDescription( FIELD_TRAIT::description );

src/coreComponents/constitutive/NullModel.cpp

@@ -25,9 +25,6 @@ NullModel::NullModel( string const & name,
   ConstitutiveBase( name, parent )
 {}
 
-NullModel::~NullModel()
-{}
-
 REGISTER_CATALOG_ENTRY( ConstitutiveBase, NullModel, string const &, dataRepository::Group * const )
 
 } // constitutive

src/coreComponents/constitutive/NullModel.hpp

@@ -34,16 +34,10 @@ class NullModel : public constitutive::ConstitutiveBase
   NullModel( string const & name,
              Group * const parent );
 
-  /// Destrutor
-  virtual ~NullModel();
-
-  /// string name to use for this class in the catalog
-  static constexpr auto m_catalogNameString = "NullModel";
-
   /**
    * @return A string that is used to register/lookup this class in the registry
    */
-  static string catalogName() { return m_catalogNameString; }
+  static string catalogName() { return "NullModel"; }
 
   virtual string getCatalogName() const override { return catalogName(); }
 

src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.cpp

@@ -44,9 +44,8 @@ CapillaryPressureBase::CapillaryPressureBase( string const & name,
   registerWrapper( viewKeyStruct::phaseOrderString(), &m_phaseOrder ).
     setSizedFromParent( 0 );
 
-  registerField( fields::cappres::phaseCapPressure{}, &m_phaseCapPressure );
-  registerField( fields::cappres::dPhaseCapPressure_dPhaseVolFraction{}, &m_dPhaseCapPressure_dPhaseVolFrac );
-
+  registerField< fields::cappres::phaseCapPressure >( &m_phaseCapPressure );
+  registerField< fields::cappres::dPhaseCapPressure_dPhaseVolFraction >( &m_dPhaseCapPressure_dPhaseVolFrac );
 }
 
 void CapillaryPressureBase::postInputInitialization()
@@ -81,20 +80,18 @@ void CapillaryPressureBase::postInputInitialization()
     m_phaseOrder[m_phaseTypes[ip]] = ip;
   }
 
-  // call to correctly set member array tertiary sizes on the 'main' material object
-  resizeFields( 0, 0 );
-
   // set labels on array wrappers for plottable fields
   setLabels();
 }
 
-void CapillaryPressureBase::resizeFields( localIndex const size,
-                                          localIndex const numPts )
+void CapillaryPressureBase::allocateConstitutiveData( Group & parent, localIndex const numPts )
 {
   integer const NP = numFluidPhases();
 
-  m_phaseCapPressure.resize( size, numPts, NP );
-  m_dPhaseCapPressure_dPhaseVolFrac.resize( size, numPts, NP, NP );
+  m_phaseCapPressure.resize( 0, numPts, NP );
+  m_dPhaseCapPressure_dPhaseVolFrac.resize( 0, numPts, NP, NP );
+
+  ConstitutiveBase::allocateConstitutiveData( parent, numPts );
 }
 
 void CapillaryPressureBase::setLabels()
@@ -103,13 +100,6 @@ void CapillaryPressureBase::setLabels()
     setDimLabels( 2, m_phaseNames );
 }
 
-void CapillaryPressureBase::allocateConstitutiveData( dataRepository::Group & parent,
-                                                      localIndex const numConstitutivePointsPerParentIndex )
-{
-  resizeFields( parent.size(), numConstitutivePointsPerParentIndex );
-  ConstitutiveBase::allocateConstitutiveData( parent, numConstitutivePointsPerParentIndex );
-}
-
 } // namespace constitutive
 
 } // namespace geos

src/coreComponents/constitutive/capillaryPressure/CapillaryPressureBase.hpp

@@ -105,7 +105,7 @@ class CapillaryPressureBase : public ConstitutiveBase
                          dataRepository::Group * const parent );
 
   virtual void allocateConstitutiveData( dataRepository::Group & parent,
-                                         localIndex const numConstitutivePointsPerParentIndex ) override;
+                                         localIndex const numPts ) override;
 
   /**
    * @brief Initialize the capillary pressure state (needed when capillary pressure depends on porosity and permeability)
@@ -163,13 +163,6 @@ class CapillaryPressureBase : public ConstitutiveBase
 
 private:
 
-  /**
-   * @brief Function called internally to resize member arrays
-   * @param size primary dimension (e.g. number of cells)
-   * @param numPts secondary dimension (e.g. number of gauss points per cell)
-   */
-  void resizeFields( localIndex const size, localIndex const numPts );
-
   /**
    * @brief Called internally to set array dim labels.
    */

src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.cpp

@@ -115,11 +115,7 @@ JFunctionCapillaryPressure::JFunctionCapillaryPressure( std::string const & name
                     toString( PermeabilityDirection::Y ) + " - only use the permeability in the y direction,\n" +
                     toString( PermeabilityDirection::Z ) + " - only use the permeability in the z direction." );
 
-  registerField( fields::cappres::jFuncMultiplier{}, &m_jFuncMultiplier );
-
-  registerWrapper( viewKeyStruct::jFunctionWrappersString(), &m_jFuncKernelWrappers ).
-    setSizedFromParent( 0 ).
-    setRestartFlags( RestartFlags::NO_WRITE );
+  registerField< fields::cappres::jFuncMultiplier >( &m_jFuncMultiplier );
 }
 
 void JFunctionCapillaryPressure::postInputInitialization()
@@ -340,11 +336,11 @@ JFunctionCapillaryPressure::createKernelWrapper()
                         m_dPhaseCapPressure_dPhaseVolFrac );
 }
 
-void JFunctionCapillaryPressure::allocateConstitutiveData( dataRepository::Group & parent,
-                                                           localIndex const numConstitutivePointsPerParentIndex )
+void JFunctionCapillaryPressure::allocateConstitutiveData( Group & parent, localIndex const numPts )
 {
-  m_jFuncMultiplier.resize( parent.size(), numFluidPhases()-1 );
-  CapillaryPressureBase::allocateConstitutiveData( parent, numConstitutivePointsPerParentIndex );
+  m_jFuncMultiplier.resize( 0, numFluidPhases()-1 );
+
+  CapillaryPressureBase::allocateConstitutiveData( parent, numPts );
 }
 
 

src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.hpp

@@ -47,7 +47,7 @@ class JFunctionCapillaryPressure : public CapillaryPressureBase
   JFunctionCapillaryPressure( std::string const & name, dataRepository::Group * const parent );
 
   virtual void allocateConstitutiveData( dataRepository::Group & parent,
-                                         localIndex const numConstitutivePointsPerParentIndex ) override;
+                                         localIndex const numPts ) override;
 
   virtual void initializeRockState( arrayView2d< real64 const > const & initialPorosity,
                                     arrayView3d< real64 const > const & initialPermeability ) const override;
@@ -112,7 +112,6 @@ class JFunctionCapillaryPressure : public CapillaryPressureBase
     static constexpr char const * porosityExponentString() { return "porosityExponent"; }
     static constexpr char const * permeabilityExponentString() { return "permeabilityExponent"; }
     static constexpr char const * permeabilityDirectionString() { return "permeabilityDirection"; }
-    static constexpr char const * jFunctionWrappersString() { return "jFunctionWrappers"; }
   };
 
   /**
@@ -126,7 +125,6 @@ class JFunctionCapillaryPressure : public CapillaryPressureBase
     Z,  ///< use permz only
   };
 
-
 private:
 
   virtual void postInputInitialization() override;

src/coreComponents/constitutive/contact/BartonBandis.cpp

@@ -38,9 +38,6 @@ BartonBandis::BartonBandis( string const & name, Group * const parent ):
     setDescription( " Reference normal stress." );
 }
 
-BartonBandis::~BartonBandis()
-{}
-
 void BartonBandis::postInputInitialization()
 {
   GEOS_THROW_IF( m_referenceNormalStress <= 0.0,

src/coreComponents/constitutive/contact/BartonBandis.hpp

@@ -99,11 +99,6 @@ class BartonBandis : public HydraulicApertureBase
   BartonBandis( string const & name,
                 Group * const parent );
 
-  /**
-   * @brief default destructor
-   */
-  virtual ~BartonBandis() override;
-
   static string catalogName() { return "BartonBandis"; }
 
   virtual string getCatalogName() const override { return catalogName(); }
@@ -118,17 +113,18 @@ class BartonBandis : public HydraulicApertureBase
    */
   KernelWrapper createKernelWrapper() const;
 
+  struct viewKeyStruct : public HydraulicApertureBase::viewKeyStruct
+  {
+    /// string/key for reference normal stress
+    static constexpr char const * referenceNormalStressString() { return "referenceNormalStress"; }
+  };
+
 protected:
 
   virtual void postInputInitialization() override;
 
 private:
 
-  struct viewKeyStruct : public HydraulicApertureBase::viewKeyStruct
-  {
-    /// string/key for reference normal stress
-    static constexpr char const * referenceNormalStressString() { return "referenceNormalStress"; }
-  };
   /// Reference normal stress
   real64 m_referenceNormalStress;
 };

src/coreComponents/constitutive/contact/CoulombFriction.cpp

@@ -28,10 +28,7 @@ namespace constitutive
 {
 
 CoulombFriction::CoulombFriction( string const & name, Group * const parent ):
-  FrictionBase( name, parent ),
-  m_cohesion(),
-  m_frictionCoefficient(),
-  m_elasticSlip()
+  FrictionBase( name, parent )
 {
   registerWrapper( viewKeyStruct::shearStiffnessString(), &m_shearStiffness ).
     setInputFlag( InputFlags::OPTIONAL ).
@@ -52,9 +49,6 @@ CoulombFriction::CoulombFriction( string const & name, Group * const parent ):
     setDescription( "Elastic Slip" );
 }
 
-CoulombFriction::~CoulombFriction()
-{}
-
 void CoulombFriction::postInputInitialization()
 {
   GEOS_THROW_IF( m_frictionCoefficient < 0.0,
@@ -63,15 +57,13 @@ void CoulombFriction::postInputInitialization()
 
 }
 
-void CoulombFriction::allocateConstitutiveData( Group & parent,
-                                                localIndex const numConstitutivePointsPerParentIndex )
+void CoulombFriction::allocateConstitutiveData( Group & parent, localIndex const numPts )
 {
   m_elasticSlip.resize( 0, 2 );
 
-  FrictionBase::allocateConstitutiveData( parent, numConstitutivePointsPerParentIndex );
+  FrictionBase::allocateConstitutiveData( parent, numPts );
 }
 
-
 CoulombFrictionUpdates CoulombFriction::createKernelUpdates() const
 {
   return CoulombFrictionUpdates( m_displacementJumpThreshold,

src/coreComponents/constitutive/contact/CoulombFriction.hpp

@@ -164,19 +164,14 @@ class CoulombFriction : public FrictionBase
    */
   CoulombFriction( string const & name, Group * const parent );
 
-  /**
-   * Default Destructor
-   */
-  virtual ~CoulombFriction() override;
-
   static string catalogName() { return "Coulomb"; }
 
   virtual string getCatalogName() const override { return catalogName(); }
 
   ///@}
 
   virtual void allocateConstitutiveData( dataRepository::Group & parent,
-                                         localIndex const numConstitutivePointsPerParentIndex ) override final;
+                                         localIndex const numPts ) override final;
 
   /// Type of kernel wrapper for in-kernel update
   using KernelWrapper = CoulombFrictionUpdates;
@@ -187,6 +182,24 @@ class CoulombFriction : public FrictionBase
    */
   KernelWrapper createKernelUpdates() const;
 
+  /**
+   * @struct Set of "char const *" and keys for data specified in this class.
+   */
+  struct viewKeyStruct : public FrictionBase::viewKeyStruct
+  {
+    /// string/key for shear stiffness
+    static constexpr char const * shearStiffnessString() { return "shearStiffness"; }
+
+    /// string/key for cohesion
+    static constexpr char const * cohesionString() { return "cohesion"; }
+
+    /// string/key for friction coefficient
+    static constexpr char const * frictionCoefficientString() { return "frictionCoefficient"; }
+
+    /// string/key for the elastic slip
+    static constexpr char const * elasticSlipString() { return "elasticSlip"; }
+  };
+
 protected:
 
   virtual void postInputInitialization() override;
@@ -205,24 +218,6 @@ class CoulombFriction : public FrictionBase
   /// Elastic slip
   array2d< real64 > m_elasticSlip;
 
-/**
- * @struct Set of "char const *" and keys for data specified in this class.
- */
-  struct viewKeyStruct : public FrictionBase::viewKeyStruct
-  {
-    /// string/key for shear stiffness
-    static constexpr char const * shearStiffnessString() { return "shearStiffness"; }
-
-    /// string/key for cohesion
-    static constexpr char const * cohesionString() { return "cohesion"; }
-
-    /// string/key for friction coefficient
-    static constexpr char const * frictionCoefficientString() { return "frictionCoefficient"; }
-
-    /// string/key for the elastic slip
-    static constexpr char const * elasticSlipString() { return "elasticSlip"; }
-  };
-
 };