Feature/oduran/test fem stress consistency

src/coreComponents/codingUtilities/traits.hpp

@@ -111,6 +111,13 @@ HAS_MEMBER_FUNCTION_NO_RTYPE( resizeDefault, 0, 0 );
  */
 HAS_MEMBER_FUNCTION_NO_RTYPE( reserve, localIndex( 55 ) );
 
+/**
+ * @brief Defines a static constexpr bool HasMemberFunction_reserveValues< @p CLASS >
+ *        that is true iff the method @p CLASS ::reserveValues( localIndex ) exists.
+ * @tparam CLASS The type to test.
+ */
+HAS_MEMBER_FUNCTION_NO_RTYPE( reserveValues, localIndex( 55 ) );
+
 /**
  * @brief Defines a static constexpr bool HasMemberFunction_toView< @p CLASS >
  *        that is true iff the method @p CLASS ::toView() exists.

src/coreComponents/dataRepository/Group.cpp

@@ -86,7 +86,9 @@ void Group::deregisterWrapper( string const & name )
 
 void Group::resize( indexType const newSize )
 {
-  forWrappers( [newSize] ( WrapperBase & wrapper )
+  GEOS_MARK_FUNCTION
+
+    forWrappers( [newSize] ( WrapperBase & wrapper )
   {
     if( wrapper.sizedFromParent() == 1 )
     {
@@ -123,7 +125,7 @@ void Group::reserve( indexType const newSize )
   {
     if( subGroup.sizedFromParent() == 1 )
     {
-      subGroup.resize( newSize );
+      subGroup.reserve( newSize );
     }
   } );
 

src/coreComponents/dataRepository/wrapperHelpers.hpp

@@ -241,7 +241,29 @@ numElementsFromByteSize( localIndex const byteSize )
 template< typename T >
 std::enable_if_t< traits::HasMemberFunction_reserve< T > >
 reserve( T & value, localIndex const newCapacity )
-{ value.reserve( newCapacity ); }
+{
+  value.reserve( newCapacity );
+  if constexpr ( traits::HasMemberFunction_reserveValues< T const > )
+  {
+    localIndex const oldCapacity = value.size();
+    double const oldValueCapacity = value.valueCapacity();
+    localIndex const newValueCapacity = oldValueCapacity * newCapacity / oldCapacity;
+    value.reserveValues( newValueCapacity );
+  }
+}
+
+template< typename T,
+          int NDIM,
+          typename PERMUTATION >
+void reserve( Array< T, NDIM, PERMUTATION > & value, localIndex newCapacity )
+{
+  localIndex const * const dims = value.dims();
+  for( int i=1; i<NDIM; ++i )
+  {
+    newCapacity *= dims[ i ];
+  }
+  value.reserve( newCapacity );
+}
 
 template< typename T >
 std::enable_if_t< !traits::HasMemberFunction_reserve< T > >

src/coreComponents/finiteVolume/TwoPointFluxApproximation.cpp

@@ -419,8 +419,10 @@ void TwoPointFluxApproximation::addFractureMatrixConnectionsDFM( MeshLevel & mes
   arrayView2d< real64 const > faceCenter = faceManager.faceCenter();
   arrayView2d< real64 const > faceNormal = faceManager.faceNormal();
 
-  arrayView1d< real64 const > const & transMultiplier =
-    faceManager.getReference< array1d< real64 > >( m_coeffName + viewKeyStruct::transMultiplierString() );
+  string const transMultName = m_coeffName + viewKeyStruct::transMultiplierString();
+  arrayView1d< real64 const > const transMultiplier = faceManager.hasWrapper( transMultName )
+                                                    ? faceManager.getReference< array1d< real64 > >( transMultName )
+                                                    : arrayView1d< real64 const >{};
 
   SurfaceElementRegion & fractureRegion = elemManager.getRegion< SurfaceElementRegion >( faceElementRegionName );
   localIndex const fractureRegionIndex = fractureRegion.getIndexInParent();
@@ -528,7 +530,8 @@ void TwoPointFluxApproximation::addFractureMatrixConnectionsDFM( MeshLevel & mes
                                  stencilWeights,
                                  connectorIndex );
 
-          faceToCellStencil.addVectors( transMultiplier[faceIndex], faceNormalVector, cellToFaceVec );
+          real64 const transMult = !transMultiplier.empty() ? transMultiplier[faceIndex] : 1.0;
+          faceToCellStencil.addVectors( transMult, faceNormalVector, cellToFaceVec );
         }
       }
     }

src/coreComponents/integrationTests/CMakeLists.txt

@@ -31,4 +31,5 @@ if( GEOS_ENABLE_FLUIDFLOW )
   add_subdirectory( fluidFlowTests )
 endif()
 add_subdirectory( wellsTests )
-add_subdirectory( wavePropagationTests ) 
+add_subdirectory( wavePropagationTests )
+add_subdirectory( mechanicTest )

src/coreComponents/integrationTests/fluidFlowTests/CMakeLists.txt

@@ -64,9 +64,91 @@ foreach(test ${gtest_geosx_tests})
                 ${CMAKE_CURRENT_SOURCE_DIR}/hex_pyr_tet_nested_mixed.vtu
                 $<TARGET_FILE_DIR:${test_name}>
     )
-                     
+
 endforeach()
 
+# Special handling for testMixedDimSinglePhaseFlow which requires 4 MPI tasks
+if( ENABLE_MPI )
+    set( test "testMixedDimSinglePhaseFlow.cpp" )
+    # The MixedDimPartitionedFlowCases suite requires 4 ranks (e.g., 1x1x4 partitioning)
+    set( nranks 4 )
+
+    get_filename_component( test_name ${test} NAME_WE )
+
+    blt_add_executable( NAME ${test_name}
+                        SOURCES ${test}
+                        OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY}
+                        DEPENDS_ON ${decoratedDependencies} ${tplDependencyList} )
+
+    geos_add_test( NAME ${test_name}
+                   COMMAND ${test_name} -x ${nranks}
+                   NUM_MPI_TASKS ${nranks} )
+
+    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "TEST_BINARY_DIR=$<TARGET_FILE_DIR:${test_name}>")
+    target_compile_definitions(${test_name} PRIVATE TEST_BINARY_DIR=\"$<TARGET_FILE_DIR:${test_name}>\")
+
+    # Copy necessary mesh files for testMixedDimSinglePhaseFlow
+    foreach( mesh IN ITEMS "fractured_mesh_hex_DFN_1.vtu"
+                           "fractured_mesh_hex_DFN_12.vtu"
+                           "fractured_mesh_hex_DFN_123.vtu" )
+      add_custom_command(
+          TARGET ${test_name} POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                  ${CMAKE_CURRENT_SOURCE_DIR}/../meshTests/dfn_market/${mesh}
+                  $<TARGET_FILE_DIR:${test_name}>
+      )
+    endforeach()
+endif()
+
+# Special handling for testMixedDimHydrostaticEquilibrium which requires 4 MPI tasks
+if( ENABLE_MPI )
+    set( test "testMixedDimHydrostaticEquilibrium.cpp" )
+    # The MixedDimHydrostaticEquilibriumCases suite requires 4 ranks (e.g., 1x1x4 partitioning)
+    set( nranks 4 )
+
+    get_filename_component( test_name ${test} NAME_WE )
+
+    blt_add_executable( NAME ${test_name}
+                        SOURCES ${test}
+                        OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY}
+                        DEPENDS_ON ${decoratedDependencies} ${tplDependencyList} )
+
+    geos_add_test( NAME ${test_name}
+                   COMMAND ${test_name} -x ${nranks}
+                   NUM_MPI_TASKS ${nranks} )
+
+    set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "TEST_BINARY_DIR=$<TARGET_FILE_DIR:${test_name}>")
+    target_compile_definitions(${test_name} PRIVATE TEST_BINARY_DIR=\"$<TARGET_FILE_DIR:${test_name}>\")
+
+    # Copy necessary mesh files for testMixedDimHydrostaticEquilibrium
+    foreach( mesh IN ITEMS
+                     "fractured_mesh_hex_DFN_1.vtu"
+                     "fractured_mesh_hex_DFN_123.vtu"
+                     "fractured_mesh_tet_DFN_1.vtu"
+                     "fractured_mesh_tet_DFN_123.vtu"
+                     "fractured_wavy_mesh_hex_DFN_1.vtu"
+                     "fractured_wavy_mesh_hex_DFN_123.vtu"
+                     "fractured_wavy_mesh_tet_DFN_1.vtu"
+                     "fractured_wavy_mesh_tet_DFN_123.vtu"
+                     "fractured_full_span_mesh_hex_DFN_1.vtu"
+                     "fractured_full_span_mesh_hex_DFN_123.vtu"
+                     "fractured_full_span_mesh_tet_DFN_1.vtu"
+                     "fractured_full_span_mesh_tet_DFN_123.vtu"
+                     "t_shaped_wavy_mesh_hex_DFN_t1t2.vtu"
+                     "t_shaped_wavy_mesh_tet_DFN_t1t2.vtu"
+                     "y_shaped_wavy_mesh_hex_DFN_y1y2y3.vtu"
+                     "y_shaped_wavy_mesh_tet_DFN_y1y2y3.vtu"
+                     "DFN_5_fractures_hex_binarized.vtu"
+                     "DFN_5_fractures_tet_binarized.vtu" )
+      add_custom_command(
+          TARGET ${test_name} POST_BUILD
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                  ${CMAKE_CURRENT_SOURCE_DIR}/../meshTests/dfn_market/${mesh}
+                  $<TARGET_FILE_DIR:${test_name}>
+      )
+    endforeach()
+endif()
+
 # For some reason, BLT is not setting CUDA language for these source files
 if ( ENABLE_CUDA )
   set_source_files_properties( ${gtest_geosx_tests} PROPERTIES LANGUAGE CUDA )