Creation of a CoupleSolidModel to handle Poro-Solid-Damage models.

host-configs/darwin-clang.cmake

@@ -34,7 +34,7 @@ set(ENABLE_GEOSX_PTP ON CACHE BOOL "" FORCE)
 
 set(GEOSX_TPL_DIR "/usr/local/GEOSX/GEOSX_TPL" CACHE PATH "" FORCE )
 if(NOT ( EXISTS "${GEOSX_TPL_DIR}" AND IS_DIRECTORY "${GEOSX_TPL_DIR}" ) )
-    set(GEOSX_TPL_DIR "../../thirdPartyLibs/install-darwin-clang-release" CACHE PATH "" FORCE )
+    set(GEOSX_TPL_DIR "../../../thirdPartyLibs/install-darwin-clang-release" CACHE PATH "" FORCE )
 endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/tpls.cmake)

src/coreComponents/constitutive/CMakeLists.txt

@@ -34,6 +34,8 @@ set( constitutive_headers
      fluid/ProppantSlurryFluid.hpp
      fluid/ParticleFluidBase.hpp
      fluid/particleFluidSelector.hpp
+     solid/CompressibleSolid.hpp
+     solid/CoupledSolid.hpp
      solid/Damage.hpp
      solid/DamageVolDev.hpp
      solid/DamageSpectral.hpp
@@ -44,13 +46,22 @@ set( constitutive_headers
      solid/ElasticTransverseIsotropic.hpp
      solid/PoroElastic.hpp
      solid/PoreVolumeCompressibleSolid.hpp
+     solid/PorousSolid.hpp
      solid/PropertyConversions.hpp
      solid/SolidBase.hpp
      solid/SolidModelDiscretizationOps.hpp
      solid/SolidModelDiscretizationOpsFullyAnisotroipic.hpp
      solid/SolidModelDiscretizationOpsIsotropic.hpp
      solid/SolidModelDiscretizationOpsTransverseIsotropic.hpp
      solid/TriaxialDriver.hpp
+     solid/porosity/BiotPorosity.hpp
+     solid/porosity/PorosityBase.hpp
+     solid/porosity/PressurePorosity.hpp
+     permeability/CarmanKozenyPermeability.hpp
+     permeability/ConstantPermeability.hpp
+     permeability/ParallelPlatesPermeability.hpp
+     permeability/PermeabilityBase.hpp
+     permeability/StrainDependentPermeability.hpp
      relativePermeability/RelativePermeabilityBase.hpp
      relativePermeability/BrooksCoreyRelativePermeability.hpp
      relativePermeability/BrooksCoreyBakerRelativePermeability.hpp
@@ -88,7 +99,8 @@ set( constitutive_sources
      fluid/SlurryFluidBase.cpp
      fluid/ProppantSlurryFluid.cpp
      fluid/ParticleFluidBase.cpp
-     fluid/ParticleFluid.cpp               
+     fluid/ParticleFluid.cpp
+     solid/CompressibleSolid.cpp      
      solid/Damage.cpp
      solid/DamageVolDev.cpp
      solid/DamageSpectral.cpp
@@ -98,8 +110,17 @@ set( constitutive_sources
      solid/ElasticTransverseIsotropic.cpp
      solid/PoroElastic.cpp
      solid/PoreVolumeCompressibleSolid.cpp
+     solid/PorousSolid.cpp
      solid/SolidBase.cpp
      solid/TriaxialDriver.cpp
+     solid/porosity/BiotPorosity.cpp
+     solid/porosity/PorosityBase.cpp
+     solid/porosity/PressurePorosity.cpp
+     permeability/CarmanKozenyPermeability.cpp
+     permeability/ConstantPermeability.cpp
+     permeability/ParallelPlatesPermeability.cpp
+     permeability/PermeabilityBase.cpp
+     permeability/StrainDependentPermeability.cpp
      relativePermeability/RelativePermeabilityBase.cpp
      relativePermeability/BrooksCoreyRelativePermeability.cpp
      relativePermeability/BrooksCoreyBakerRelativePermeability.cpp

src/coreComponents/constitutive/ConstitutivePassThru.hpp

@@ -27,8 +27,10 @@
 #include "solid/DruckerPragerExtended.hpp"
 #include "solid/ElasticIsotropic.hpp"
 #include "solid/ElasticTransverseIsotropic.hpp"
+#include "solid/PorousSolid.hpp"
 #include "solid/PoroElastic.hpp"
 
+
 namespace geosx
 {
 namespace constitutive
@@ -101,6 +103,42 @@ struct ConstitutivePassThru< SolidBase >
 };
 
 
+/**
+ * Specialization for the PoroElastic models.
+ */
+template<>
+struct ConstitutivePassThru< PoroElasticBase >
+{
+  template< typename LAMBDA >
+  static void execute( ConstitutiveBase & constitutiveRelation, LAMBDA && lambda )
+  {
+    if( auto * const ptr1 = dynamic_cast< PoroElastic< DruckerPragerExtended > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr1 );
+    }
+    else if( auto * const ptr2 = dynamic_cast< PoroElastic< DruckerPrager > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr2 );
+    }
+    else if( auto * const ptr3 = dynamic_cast< PoroElastic< ElasticIsotropic > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr3 );
+    }
+    else if( auto * const ptr4 = dynamic_cast< PoroElastic< ElasticTransverseIsotropic > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr4 );
+    }
+    else
+    {
+      GEOSX_ERROR( "ConstitutivePassThru< PoroElasticBase >::execute failed. The constitutive relation is named "
+                   << constitutiveRelation.getName() << " with type "
+                   << LvArray::system::demangleType( constitutiveRelation ) );
+    }
+  }
+};
+
+
+
 /**
  * Specialization for the NullModel.
  */
@@ -126,70 +164,84 @@ struct ConstitutivePassThru< NullModel >
 
 
 /**
- * Specialization for the PoroElastic models.
+ * Specialization for the Damage models.
  */
 template<>
-struct ConstitutivePassThru< PoroElasticBase >
+struct ConstitutivePassThru< DamageBase >
 {
   template< typename LAMBDA >
-  static void execute( ConstitutiveBase & constitutiveRelation, LAMBDA && lambda )
+  static void execute( ConstitutiveBase & constitutiveRelation,
+                       LAMBDA && lambda )
   {
-    if( auto * const ptr1 = dynamic_cast< PoroElastic< DruckerPragerExtended > * >( &constitutiveRelation ) )
+    if( auto * const ptr1 = dynamic_cast< DamageSpectral< ElasticIsotropic > * >( &constitutiveRelation ) )
     {
       lambda( *ptr1 );
     }
-    else if( auto * const ptr2 = dynamic_cast< PoroElastic< DruckerPrager > * >( &constitutiveRelation ) )
+    else if( auto * const ptr2 = dynamic_cast< DamageVolDev< ElasticIsotropic > * >( &constitutiveRelation ) )
     {
       lambda( *ptr2 );
     }
-    else if( auto * const ptr3 = dynamic_cast< PoroElastic< ElasticIsotropic > * >( &constitutiveRelation ) )
+    else if( auto * const ptr3 = dynamic_cast< Damage< ElasticIsotropic > * >( &constitutiveRelation ) )
     {
       lambda( *ptr3 );
     }
-    else if( auto * const ptr4 = dynamic_cast< PoroElastic< ElasticTransverseIsotropic > * >( &constitutiveRelation ) )
-    {
-      lambda( *ptr4 );
-    }
     else
     {
-      GEOSX_ERROR( "ConstitutivePassThru< PoroElasticBase >::execute failed. The constitutive relation is named "
+      GEOSX_ERROR( "ConstitutivePassThru< DamageBase >::execute failed. The constitutive relation is named "
                    << constitutiveRelation.getName() << " with type "
                    << LvArray::system::demangleType( constitutiveRelation ) );
     }
   }
 };
 
+
 /**
- * Specialization for the Damage models.
+ * Specialization for the PorousSolid models.
  */
 template<>
-struct ConstitutivePassThru< DamageBase >
+struct ConstitutivePassThru< PorousSolidBase >
 {
   template< typename LAMBDA >
-  static void execute( ConstitutiveBase & constitutiveRelation,
-                       LAMBDA && lambda )
+  static void execute( ConstitutiveBase & constitutiveRelation, LAMBDA && lambda )
   {
-    if( auto * const ptr1 = dynamic_cast< DamageSpectral< ElasticIsotropic > * >( &constitutiveRelation ) )
+    if( auto * const ptr1 = dynamic_cast< PorousSolid< DruckerPragerExtended > * >( &constitutiveRelation ) )
     {
       lambda( *ptr1 );
     }
-    else if( auto * const ptr2 = dynamic_cast< DamageVolDev< ElasticIsotropic > * >( &constitutiveRelation ) )
+    else if( auto * const ptr2 = dynamic_cast< PorousSolid< DruckerPrager > * >( &constitutiveRelation ) )
     {
       lambda( *ptr2 );
     }
-    else if( auto * const ptr3 = dynamic_cast< Damage< ElasticIsotropic > * >( &constitutiveRelation ) )
+    else if( auto * const ptr3 = dynamic_cast< PorousSolid< ElasticIsotropic > * >( &constitutiveRelation ) )
     {
       lambda( *ptr3 );
     }
+    else if( auto * const ptr4 = dynamic_cast< PorousSolid< ElasticTransverseIsotropic > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr4 );
+    }
+    else if( auto * const ptr5 = dynamic_cast< PorousSolid< DamageSpectral< ElasticIsotropic > > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr5 );
+    }
+    else if( auto * const ptr6 = dynamic_cast< PorousSolid< DamageVolDev< ElasticIsotropic > > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr6 );
+    }
+    else if( auto * const ptr7 = dynamic_cast< PorousSolid< Damage< ElasticIsotropic > > * >( &constitutiveRelation ) )
+    {
+      lambda( *ptr7 );
+    }
     else
     {
-      GEOSX_ERROR( "ConstitutivePassThru< DamageBase >::execute failed. The constitutive relation is named "
+      GEOSX_ERROR( "ConstitutivePassThru< PorousSolidBase >::execute failed. The constitutive relation is named "
                    << constitutiveRelation.getName() << " with type "
                    << LvArray::system::demangleType( constitutiveRelation ) );
     }
   }
 };
 
+
 }
 }
 

src/coreComponents/constitutive/permeability/CarmanKozenyPermeability.cpp

@@ -0,0 +1,64 @@
+/*
+ * ------------------------------------------------------------------------------------------------------------
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
+ * Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
+ * Copyright (c) 2018-2020 Total, S.A
+ * Copyright (c) 2019-     GEOSX Contributors
+ * All rights reserved
+ *
+ * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.
+ * ------------------------------------------------------------------------------------------------------------
+ */
+
+/**
+ * @file CarmanKozenyPermeability.cpp
+ */
+
+#include "CarmanKozenyPermeability.hpp"
+
+namespace geosx
+{
+
+using namespace dataRepository;
+
+namespace constitutive
+{
+
+
+CarmanKozenyPermeability::CarmanKozenyPermeability( string const & name, Group * const parent ):
+  PermeabilityBase( name, parent )
+{
+  registerWrapper( viewKeyStruct::particleDiameterString(), &m_particleDiameter ).
+    setInputFlag( InputFlags::REQUIRED ).
+    setDescription( "Diameter of the spherical particles." );
+
+  registerWrapper( viewKeyStruct::sphericityString(), &m_sphericity ).
+    setInputFlag( InputFlags::REQUIRED ).
+    setDescription( "Sphericity of the particles." );
+
+  registerWrapper( viewKeyStruct::dPerm_dPorosityString(), &m_dPerm_dPorosity );
+}
+
+std::unique_ptr< ConstitutiveBase >
+CarmanKozenyPermeability::deliverClone( string const & name,
+                                        Group * const parent ) const
+{
+  return ConstitutiveBase::deliverClone( name, parent );
+}
+
+void CarmanKozenyPermeability::allocateConstitutiveData( dataRepository::Group & parent,
+                                                         localIndex const numConstitutivePointsPerParentIndex )
+{
+  m_dPerm_dPorosity.resize( 0, 3 );
+  PermeabilityBase::allocateConstitutiveData( parent, numConstitutivePointsPerParentIndex );
+}
+
+void CarmanKozenyPermeability::postProcessInput()
+{}
+
+REGISTER_CATALOG_ENTRY( ConstitutiveBase, CarmanKozenyPermeability, string const &, Group * const )
+
+}
+} /* namespace geosx */