Implemented dispatch for mimetic inner product selection

src/coreComponents/fileIO/schema/docs/FaceManager_other.rst

@@ -19,7 +19,7 @@ localToGlobalMap        globalIndex_array
 nodeList                geosx_InterObjectRelation< LvArray_ArrayOfArrays< long, long, LvArray_ChaiBuffer > >                                                                                                                             (no description available)                                                                                                                            
 K_IC                    real64_array2d                                                                       :ref:`DATASTRUCTURE_SurfaceGenerator`                                                                                       Critical Stress Intensity Factor :math:`K_{IC}` in the plane of the face.                                                                             
 SIFonFace               real64_array                                                                         :ref:`DATASTRUCTURE_SurfaceGenerator`                                                                                       Calculated Stress Intensity Factor on the face.                                                                                                       
-TransMultiplier         real64_array                                                                         :ref:`DATASTRUCTURE_TwoPointFluxApproximation`                                                                              An array that holds the transmissibility multipliers                                                                                                  
+TransMultiplier         real64_array                                                                         :ref:`DATASTRUCTURE_HybridMimeticDiscretization`, :ref:`DATASTRUCTURE_TwoPointFluxApproximation`                            An array that holds the transmissibility multipliers                                                                                                  
 childIndex              localIndex_array                                                                     :ref:`DATASTRUCTURE_SurfaceGenerator`                                                                                       Index of child within the mesh object it is registered on.                                                                                            
 degreeFromCrackTip      integer_array                                                                        :ref:`DATASTRUCTURE_SurfaceGenerator`                                                                                       Distance to the crack tip in terms of topological distance. (i.e. how many nodes are along the path to the closest node that is on the crack surface. 
 deltaFacePressure       real64_array                                                                         :ref:`DATASTRUCTURE_SinglePhaseHybridFVM`                                                                                   An array that holds the accumulated pressure updates at the faces.                                                                                    

src/coreComponents/fileIO/schema/docs/FiniteVolume.rst

@@ -1,9 +1,10 @@
 
 
-========================= ==== ======= ==================================== 
-Name                      Type Default Description                          
-========================= ==== ======= ==================================== 
-TwoPointFluxApproximation node         :ref:`XML_TwoPointFluxApproximation` 
-========================= ==== ======= ==================================== 
+=========================== ==== ======= ====================================== 
+Name                        Type Default Description                            
+=========================== ==== ======= ====================================== 
+HybridMimeticDiscretization node         :ref:`XML_HybridMimeticDiscretization` 
+TwoPointFluxApproximation   node         :ref:`XML_TwoPointFluxApproximation`   
+=========================== ==== ======= ====================================== 
 
 

src/coreComponents/fileIO/schema/docs/FiniteVolume_other.rst

@@ -1,9 +1,10 @@
 
 
-========================= ==== ============================================== 
-Name                      Type Description                                    
-========================= ==== ============================================== 
-TwoPointFluxApproximation node :ref:`DATASTRUCTURE_TwoPointFluxApproximation` 
-========================= ==== ============================================== 
+=========================== ==== ================================================ 
+Name                        Type Description                                      
+=========================== ==== ================================================ 
+HybridMimeticDiscretization node :ref:`DATASTRUCTURE_HybridMimeticDiscretization` 
+TwoPointFluxApproximation   node :ref:`DATASTRUCTURE_TwoPointFluxApproximation`   
+=========================== ==== ================================================ 
 
 

src/coreComponents/fileIO/schema/docs/HybridMimeticDiscretization.rst

@@ -0,0 +1,11 @@
+
+
+================ ====== ======== =================================================== 
+Name             Type   Default  Description                                         
+================ ====== ======== =================================================== 
+coefficientName  string required Name of coefficient field                           
+innerProductType string required Type of inner product used in the hybrid FVM solver 
+name             string required A name is required for any non-unique nodes         
+================ ====== ======== =================================================== 
+
+

src/coreComponents/fileIO/schema/docs/HybridMimeticDiscretization_other.rst

@@ -0,0 +1,9 @@
+
+
+=============== ============ ================================ ==================================================== 
+Name            Type         Registered On                    Description                                          
+=============== ============ ================================ ==================================================== 
+TransMultiplier real64_array :ref:`DATASTRUCTURE_FaceManager` An array that holds the transmissibility multipliers 
+=============== ============ ================================ ==================================================== 
+
+

src/coreComponents/fileIO/schema/schema.xsd

@@ -710,9 +710,18 @@ the relative residual norm satisfies:
 	</xsd:simpleType>
 	<xsd:complexType name="FiniteVolumeType">
 		<xsd:choice minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="HybridMimeticDiscretization" type="HybridMimeticDiscretizationType" />
 			<xsd:element name="TwoPointFluxApproximation" type="TwoPointFluxApproximationType" />
 		</xsd:choice>
 	</xsd:complexType>
+	<xsd:complexType name="HybridMimeticDiscretizationType">
+		<!--coefficientName => Name of coefficient field-->
+		<xsd:attribute name="coefficientName" type="string" use="required" />
+		<!--innerProductType => Type of inner product used in the hybrid FVM solver-->
+		<xsd:attribute name="innerProductType" type="string" use="required" />
+		<!--name => A name is required for any non-unique nodes-->
+		<xsd:attribute name="name" type="string" use="required" />
+	</xsd:complexType>
 	<xsd:complexType name="TwoPointFluxApproximationType">
 		<!--areaRelTol => Relative tolerance for area calculations.-->
 		<xsd:attribute name="areaRelTol" type="real64" default="1e-08" />

src/coreComponents/fileIO/schema/schema.xsd.other

@@ -353,9 +353,11 @@
 	</xsd:complexType>
 	<xsd:complexType name="FiniteVolumeType">
 		<xsd:choice minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="HybridMimeticDiscretization" type="HybridMimeticDiscretizationType" />
 			<xsd:element name="TwoPointFluxApproximation" type="TwoPointFluxApproximationType" />
 		</xsd:choice>
 	</xsd:complexType>
+	<xsd:complexType name="HybridMimeticDiscretizationType" />
 	<xsd:complexType name="TwoPointFluxApproximationType">
 		<!--cellStencil => (no description available)-->
 		<xsd:attribute name="cellStencil" type="geosx_CellElementStencilTPFA" />
@@ -1189,7 +1191,7 @@
 		<xsd:attribute name="K_IC" type="real64_array2d" />
 		<!--SIFonFace => Calculated Stress Intensity Factor on the face. => SurfaceGenerator-->
 		<xsd:attribute name="SIFonFace" type="real64_array" />
-		<!--TransMultiplier => An array that holds the transmissibility multipliers => TwoPointFluxApproximation-->
+		<!--TransMultiplier => An array that holds the transmissibility multipliers => HybridMimeticDiscretization, TwoPointFluxApproximation-->
 		<xsd:attribute name="TransMultiplier" type="real64_array" />
 		<!--childIndex => Index of child within the mesh object it is registered on. => SurfaceGenerator-->
 		<xsd:attribute name="childIndex" type="localIndex_array" />

src/coreComponents/finiteVolume/CMakeLists.txt

@@ -10,7 +10,15 @@ set( finiteVolume_headers
      FluxApproximationBase.hpp
      TwoPointFluxApproximation.hpp
      FluxStencil.hpp
-     HybridFVMInnerProduct.hpp
+     HybridMimeticDiscretization.hpp
+     MimeticInnerProductDispatch.hpp     
+     mimeticInnerProducts/MimeticInnerProductBase.hpp
+     mimeticInnerProducts/QuasiTPFAInnerProduct.hpp
+     mimeticInnerProducts/QuasiRTInnerProduct.hpp
+     mimeticInnerProducts/TPFAInnerProduct.hpp
+     mimeticInnerProducts/SimpleInnerProduct.hpp
+     mimeticInnerProducts/BdVLMInnerProduct.hpp
+     mimeticInnerProducts/MimeticInnerProductHelpers.hpp
    )
 #
 # Specify all sources
@@ -22,7 +30,8 @@ set( finiteVolume_sources
      FaceElementStencil.cpp
      FiniteVolumeManager.cpp
      FluxApproximationBase.cpp
-     TwoPointFluxApproximation.cpp 
+     TwoPointFluxApproximation.cpp
+     HybridMimeticDiscretization.cpp
    )
 
 if ( BUILD_OBJ_LIBS )

src/coreComponents/finiteVolume/FiniteVolumeManager.cpp

@@ -20,6 +20,7 @@
 #include "FiniteVolumeManager.hpp"
 
 #include "finiteVolume/FluxApproximationBase.hpp"
+#include "finiteVolume/HybridMimeticDiscretization.hpp"
 #include "mesh/MeshForLoopInterface.hpp"
 #include "rajaInterface/GEOS_RAJA_Interface.hpp"
 
@@ -40,8 +41,16 @@ FiniteVolumeManager::~FiniteVolumeManager()
 
 Group * FiniteVolumeManager::CreateChild( string const & childKey, string const & childName )
 {
-  std::unique_ptr< FluxApproximationBase > approx = FluxApproximationBase::CatalogInterface::Factory( childKey, childName, this );
-  return this->RegisterGroup< FluxApproximationBase >( childName, std::move( approx ));
+  if( childKey == HybridMimeticDiscretization::CatalogName() )
+  {
+    std::unique_ptr< HybridMimeticDiscretization > hm = std::make_unique< HybridMimeticDiscretization >( childName, this );
+    return this->RegisterGroup< HybridMimeticDiscretization >( childName, std::move( hm ) );
+  }
+  else
+  {
+    std::unique_ptr< FluxApproximationBase > approx = FluxApproximationBase::CatalogInterface::Factory( childKey, childName, this );
+    return this->RegisterGroup< FluxApproximationBase >( childName, std::move( approx ));
+  }
 }
 
 
@@ -52,6 +61,13 @@ void FiniteVolumeManager::ExpandObjectCatalogs()
   {
     CreateChild( catalogIter.first, catalogIter.first );
   }
+  // Then do the same thing for the HybridMimeticDiscretization
+  for( auto & catalogIter: HybridMimeticDiscretization::GetCatalog())
+  {
+    string const childName = catalogIter.first;
+    std::unique_ptr< HybridMimeticDiscretization > hm = std::make_unique< HybridMimeticDiscretization >( childName, this );
+    this->RegisterGroup< HybridMimeticDiscretization >( childName, std::move( hm ) );
+  }
 }
 
 
@@ -65,5 +81,15 @@ FluxApproximationBase & FiniteVolumeManager::getFluxApproximation( std::string c
   return getGroupReference< FluxApproximationBase >( name );
 }
 
+HybridMimeticDiscretization const & FiniteVolumeManager::getHybridMimeticDiscretization( std::string const & name ) const
+{
+  return getGroupReference< HybridMimeticDiscretization >( name );
+}
+
+HybridMimeticDiscretization & FiniteVolumeManager::getHybridMimeticDiscretization( std::string const & name )
+{
+  return getGroupReference< HybridMimeticDiscretization >( name );
+}
+
 
 } // namespace geosx

src/coreComponents/finiteVolume/FiniteVolumeManager.hpp

@@ -27,6 +27,7 @@ namespace geosx
 
 class DomainPartition;
 class FluxApproximationBase;
+class HybridMimeticDiscretization;
 
 /**
  * @class FiniteVolumeManager
@@ -70,6 +71,18 @@ class FiniteVolumeManager : public dataRepository::Group
    */
   FluxApproximationBase & getFluxApproximation( string const & name );
 
+  /**
+   * @brief Return the HybridMimeticDiscretization associated with the provided name.
+   * @param[in] name the provided name
+   * @return the HybridMimeticDiscretization associated with the provided name
+   */
+  HybridMimeticDiscretization const & getHybridMimeticDiscretization( string const & name ) const;
+
+  /**
+   * @copydoc getHybridMimeticDiscretization( string const & ) const
+   */
+  HybridMimeticDiscretization & getHybridMimeticDiscretization( string const & name );
+
 private:
 
 };