feat: Check pore volume for all element types (#3233)

paveltomin · web-flow · commit 52e0ade27ff8 · 2024-07-24T15:13:55.000-07:00
diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml
@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3213-6170-5c2c0bf
+  baseline: integratedTests/baseline_integratedTests-pr3233-6393-534ac25
 
 allow_fail:
   all: ''
diff --git a/BASELINE_NOTES.md b/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 #3194 (2024-07-22)
+======================
+Check pore volume for all element types, also check that default aperture > 0. Rebaseline for modified tests. No real results change.
+
 PR #3213 (2024-07-12)
 ======================
 Added baselines for new tests on Dirichlet boundary conditions for multiphase flow.
diff --git a/inputFiles/almContactMechanics/ALM_stickFault_base.xml b/inputFiles/almContactMechanics/ALM_stickFault_base.xml
@@ -77,7 +77,7 @@
     <SurfaceElementRegion
       name="Fracture"
       faceBlock="faceElementSubRegion"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial, rock }"/>
   </ElementRegions>
 
diff --git a/inputFiles/lagrangianContactMechanics/ContactMechanics_PEBICrack_base.xml b/inputFiles/lagrangianContactMechanics/ContactMechanics_PEBICrack_base.xml
@@ -13,7 +13,7 @@
 
     <ElementRegions>
         <CellElementRegion name="Region" cellBlocks="{ hexahedra, pentagonalPrisms, hexagonalPrisms }" materialList="{ rock }"/>
-        <SurfaceElementRegion name="Fracture" faceBlock="fracture" defaultAperture="0" materialList="{ fractureMaterial }"/>
+        <SurfaceElementRegion name="Fracture" faceBlock="fracture" defaultAperture="1e-6" materialList="{ fractureMaterial }"/>
     </ElementRegions>
 
     <Geometry>
diff --git a/inputFiles/lagrangianContactMechanics/ContactMechanics_PassingCrack_base.xml b/inputFiles/lagrangianContactMechanics/ContactMechanics_PassingCrack_base.xml
@@ -48,7 +48,7 @@
 
     <SurfaceElementRegion
       name="Fracture"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial, rock }"/>
   </ElementRegions>
 
diff --git a/inputFiles/lagrangianContactMechanics/ContactMechanics_SimpleCubes_base.xml b/inputFiles/lagrangianContactMechanics/ContactMechanics_SimpleCubes_base.xml
@@ -50,7 +50,7 @@
 
     <SurfaceElementRegion
       name="Fracture"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial }"/>
   </ElementRegions>
 
diff --git a/inputFiles/lagrangianContactMechanics/ContactMechanics_SingleFracCompression_base.xml b/inputFiles/lagrangianContactMechanics/ContactMechanics_SingleFracCompression_base.xml
@@ -57,7 +57,7 @@
     <SurfaceElementRegion
       name="Fracture"
       faceBlock="faceElementSubRegion"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial }"/>
   </ElementRegions>
 
diff --git a/inputFiles/lagrangianContactMechanics/ContactMechanics_TFrac_base.xml b/inputFiles/lagrangianContactMechanics/ContactMechanics_TFrac_base.xml
@@ -59,7 +59,7 @@
     <SurfaceElementRegion
       name="Fracture"
       faceBlock="faceElementSubRegion"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial }"/>
   </ElementRegions>
 
diff --git a/inputFiles/lagrangianContactMechanics/ContactMechanics_UnstructuredCrack_base.xml b/inputFiles/lagrangianContactMechanics/ContactMechanics_UnstructuredCrack_base.xml
@@ -48,7 +48,7 @@
 
     <SurfaceElementRegion
       name="Fracture"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial }"/>
   </ElementRegions>
 
diff --git a/inputFiles/lagrangianContactMechanics/ContactMechanics_slippingFault_base.xml b/inputFiles/lagrangianContactMechanics/ContactMechanics_slippingFault_base.xml
@@ -82,7 +82,7 @@
     <SurfaceElementRegion
       name="Fracture"
       faceBlock="faceElementSubRegion"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial, rock }"/>
   </ElementRegions>
 
diff --git a/inputFiles/lagrangianContactMechanics/Sneddon_contactMechanics_base.xml b/inputFiles/lagrangianContactMechanics/Sneddon_contactMechanics_base.xml
@@ -44,7 +44,7 @@
     <SurfaceElementRegion
       name="Fracture"
       faceBlock="faceElementSubRegion"
-      defaultAperture="0.0"
+      defaultAperture="1e-6"
       materialList="{ fractureMaterial }"/>
   </ElementRegions>
   <!-- SPHINX_SNEDDON_REGIONS_END -->
diff --git a/inputFiles/wellbore/CasedElasticWellbore_ImperfectInterfaces_base.xml b/inputFiles/wellbore/CasedElasticWellbore_ImperfectInterfaces_base.xml
@@ -48,7 +48,7 @@
     <SurfaceElementRegion
       name="Fracture"
       faceBlock="faceElementSubRegion"
-      defaultAperture="0"
+      defaultAperture="1e-6"
       materialList="{ fractureContact }"/>
   <!-- SPHINX_SurfaceElementRegionEnd -->   
  
diff --git a/src/coreComponents/mesh/SurfaceElementRegion.cpp b/src/coreComponents/mesh/SurfaceElementRegion.cpp
@@ -75,6 +75,10 @@ void SurfaceElementRegion::generateMesh( Group const & faceBlocks )
 
 void SurfaceElementRegion::initializePreSubGroups()
 {
+  GEOS_ERROR_IF_LE_MSG( m_defaultAperture, 0.0,
+                        getWrapperDataContext( viewKeyStruct::defaultApertureString() ) <<
+                        ": default aperture must be larger than 0.0" );
+
   this->forElementSubRegions< SurfaceElementSubRegion >( [&] ( SurfaceElementSubRegion & subRegion )
   {
     subRegion.getWrapper< array1d< real64 > >( fields::elementAperture::key() ).
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/FlowSolverBase.cpp b/src/coreComponents/physicsSolvers/fluidFlow/FlowSolverBase.cpp
@@ -387,8 +387,8 @@ void FlowSolverBase::validatePoreVolumes( DomainPartition const & domain ) const
                                                                 MeshLevel const & mesh,
                                                                 arrayView1d< string const > const & regionNames )
   {
-    mesh.getElemManager().forElementSubRegions< CellElementSubRegion >( regionNames, [&]( localIndex const,
-                                                                                          CellElementSubRegion const & subRegion )
+    mesh.getElemManager().forElementSubRegions< ElementSubRegionBase >( regionNames, [&]( localIndex const,
+                                                                                          ElementSubRegionBase const & subRegion )
     {
 
       string const & solidName = subRegion.template getReference< string >( viewKeyStruct::solidNamesString() );
