refactor: constitutive cleanup

src/coreComponents/constitutive/CMakeLists.txt

@@ -195,7 +195,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

@@ -47,6 +47,8 @@ void ConstitutiveBase::allocateConstitutiveData( dataRepository::Group & parent,
 {
   m_numQuadraturePoints = numConstitutivePointsPerParentIndex;
 
+  resizeFields( parent.size(), numConstitutivePointsPerParentIndex );
+
   for( auto & group : this->getSubGroups() )
   {
     for( auto & wrapper : group.second->wrappers() )

src/coreComponents/constitutive/ConstitutiveBase.hpp

@@ -176,6 +176,19 @@ class ConstitutiveBase : public dataRepository::Group
     return m_userFields;
   }
 
+protected:
+
+  /**
+   * @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)
+   */
+  virtual void resizeFields( localIndex const GEOS_UNUSED_PARAM( size ),
+                             localIndex const GEOS_UNUSED_PARAM( numPts ) )
+  {
+    // Nothing to do
+  }
+
 private:
 
   /**

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

@@ -82,7 +82,7 @@ void CapillaryPressureBase::postInputInitialization()
   }
 
   // call to correctly set member array tertiary sizes on the 'main' material object
-  resizeFields( 0, 0 );
+  resizeFields( 0, 0 );  // TODO figure out why this is really needed
 
   // set labels on array wrappers for plottable fields
   setLabels();
@@ -103,13 +103,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

@@ -104,9 +104,6 @@ class CapillaryPressureBase : public ConstitutiveBase
   CapillaryPressureBase( string const & name,
                          dataRepository::Group * const parent );
 
-  virtual void allocateConstitutiveData( dataRepository::Group & parent,
-                                         localIndex const numConstitutivePointsPerParentIndex ) override;
-
   /**
    * @brief Initialize the capillary pressure state (needed when capillary pressure depends on porosity and permeability)
    * @param[in] initialPorosity the initial porosity field after reservoir initialization
@@ -163,13 +160,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.
    */
@@ -179,6 +169,13 @@ class CapillaryPressureBase : public ConstitutiveBase
 
   virtual void postInputInitialization() override;
 
+  /**
+   * @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)
+   */
+  virtual void resizeFields( localIndex const size, localIndex const numPts ) override;
+
   // phase names read from input
   string_array m_phaseNames;
 

src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.cpp

@@ -340,11 +340,11 @@ JFunctionCapillaryPressure::createKernelWrapper()
                         m_dPhaseCapPressure_dPhaseVolFrac );
 }
 
-void JFunctionCapillaryPressure::allocateConstitutiveData( dataRepository::Group & parent,
-                                                           localIndex const numConstitutivePointsPerParentIndex )
+void JFunctionCapillaryPressure::resizeFields( localIndex const size, localIndex const numPts )
 {
-  m_jFuncMultiplier.resize( parent.size(), numFluidPhases()-1 );
-  CapillaryPressureBase::allocateConstitutiveData( parent, numConstitutivePointsPerParentIndex );
+  CapillaryPressureBase::resizeFields( size, numPts );
+
+  m_jFuncMultiplier.resize( size, numFluidPhases()-1 );
 }
 
 

src/coreComponents/constitutive/capillaryPressure/JFunctionCapillaryPressure.hpp

@@ -46,9 +46,6 @@ class JFunctionCapillaryPressure : public CapillaryPressureBase
 
   JFunctionCapillaryPressure( std::string const & name, dataRepository::Group * const parent );
 
-  virtual void allocateConstitutiveData( dataRepository::Group & parent,
-                                         localIndex const numConstitutivePointsPerParentIndex ) override;
-
   virtual void initializeRockState( arrayView2d< real64 const > const & initialPorosity,
                                     arrayView3d< real64 const > const & initialPermeability ) const override;
 
@@ -126,6 +123,14 @@ class JFunctionCapillaryPressure : public CapillaryPressureBase
     Z,  ///< use permz only
   };
 
+protected:
+
+  /**
+   * @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)
+   */
+  virtual void resizeFields( localIndex const size, localIndex const numPts ) override;
 
 private:
 

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

@@ -52,9 +52,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 +60,13 @@ void CoulombFriction::postInputInitialization()
 
 }
 
-void CoulombFriction::allocateConstitutiveData( Group & parent,
-                                                localIndex const numConstitutivePointsPerParentIndex )
+void CoulombFriction::resizeFields( localIndex const size, localIndex const numPts )
 {
-  m_elasticSlip.resize( 0, 2 );
+  FrictionBase::resizeFields( size, numPts );
 
-  FrictionBase::allocateConstitutiveData( parent, numConstitutivePointsPerParentIndex );
+  m_elasticSlip.resize( 0, 2 ); // 0 to resize and assign default value later
 }
 
-
 CoulombFrictionUpdates CoulombFriction::createKernelUpdates() const
 {
   return CoulombFrictionUpdates( m_displacementJumpThreshold,

src/coreComponents/constitutive/contact/CoulombFriction.hpp

@@ -164,20 +164,12 @@ 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;
-
   /// Type of kernel wrapper for in-kernel update
   using KernelWrapper = CoulombFrictionUpdates;
 
@@ -187,10 +179,35 @@ 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;
 
+  /**
+   * @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)
+   */
+  virtual void resizeFields( localIndex const size, localIndex const numPts ) override;
+
 private:
 
   /// The shear stiffness
@@ -205,24 +222,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"; }
-  };
-
 };
 
 

src/coreComponents/constitutive/contact/FrictionBase.cpp

@@ -39,9 +39,6 @@ FrictionBase::FrictionBase( string const & name,
     setDescription( "A threshold valued to determine whether a fracture is open or not." );
 }
 
-FrictionBase::~FrictionBase()
-{}
-
 FrictionBaseUpdates FrictionBase::createKernelWrapper() const
 {
   return FrictionBaseUpdates( m_displacementJumpThreshold );

src/coreComponents/constitutive/contact/FrictionBase.hpp

@@ -223,11 +223,6 @@ class FrictionBase : public ConstitutiveBase
   FrictionBase( string const & name,
                 Group * const parent );
 
-  /**
-   * @brief default destructor
-   */
-  virtual ~FrictionBase() override;
-
   /// Type of kernel wrapper for in-kernel update
   using KernelWrapper = FrictionBaseUpdates;
 

src/coreComponents/constitutive/contact/FrictionlessContact.cpp

@@ -32,9 +32,6 @@ FrictionlessContact::FrictionlessContact( string const & name,
   FrictionBase( name, parent )
 {}
 
-FrictionlessContact::~FrictionlessContact()
-{}
-
 FrictionlessContactUpdates FrictionlessContact::createKernelUpdates() const
 {
   return FrictionlessContactUpdates( m_displacementJumpThreshold );

src/coreComponents/constitutive/contact/FrictionlessContact.hpp

@@ -85,11 +85,6 @@ class FrictionlessContact : public FrictionBase
   FrictionlessContact( string const & name,
                        Group * const parent );
 
-  /**
-   * @brief default destructor
-   */
-  virtual ~FrictionlessContact() override;
-
   /**
    * @return A string that is used to register/lookup this class in the registry
    */
@@ -106,14 +101,6 @@ class FrictionlessContact : public FrictionBase
    */
   KernelWrapper createKernelUpdates() const;
 
-  /**
-   * @struct Structure to hold scoped key names
-   */
-  struct viewKeyStruct : public ConstitutiveBase::viewKeyStruct
-  {};
-
-protected:
-
 };
 
 

src/coreComponents/constitutive/contact/HydraulicApertureBase.cpp

@@ -39,11 +39,6 @@ HydraulicApertureBase::HydraulicApertureBase( string const & name,
     setDescription( "Reference hydraulic aperture. It is the aperture at zero normal stress." );
 }
 
-HydraulicApertureBase::~HydraulicApertureBase()
-{}
-
-
-
 } /* namespace constitutive */
 
 } /* namespace geos */