test: mixed-dimensional consistency

.integrated_tests.yaml

@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3967-16106-c0f34de
+  baseline: integratedTests/baseline_integratedTests-pr3957-16171-da51804
 
 allow_fail:
   all: ''

BASELINE_NOTES.md

@@ -1,11 +1,14 @@
-
 Notes
 ==========
 
 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 #3957 (2026-03-30) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3957-16171-da51804.tar.gz>
+=====================
+Add checkEulerCharacteristic option, rebaseline due to new input.
+
 PR #3967 (2026-03-27) <https://storage.googleapis.com/geosx/integratedTests/baseline_integratedTests-pr3967-16106-c0f34de.tar.gz>
 =====================
 Fix 2D/3D cell co-location in parallel mesh redistribution

src/cmake/GeosxOptions.cmake

@@ -21,6 +21,8 @@ option( RAJA_ENABLE_CUDA "" OFF )
 option( RAJA_ENABLE_HIP "" OFF )
 option( RAJA_ENABLE_TESTS "" OFF )
 
+option( GEOS_USE_GIT_VERSION_INFO "Enables querying git for version metadata" ON )
+
 option( GEOS_ENABLE_BOUNDS_CHECK "Enables array bounds checking" OFF )
 if( NOT CMAKE_CONFIGURATION_TYPES )
     ######################################################

src/cmake/GeosxVersion.cmake

@@ -1,10 +1,10 @@
-# This script generates version info for GEOSX from VERSION file and git.
+# This script generates version info for GEOSX from VERSION file and optionally git.
 # At config time, it sets various version variables and generates a build
 # target named 'generate_version', that the code must set a dependency on.
 # The target invokes this script again at build time, where it generates a
 # version header with the most up-to-date version info. Thus any change to
 # VERSION file or git state (in particular, branch name or HEAD commit sha)
-# will trigger a partial rebuild (anything that includes version header).
+# can trigger a partial rebuild (anything that includes version header).
 #
 # This self-referential approach inspired in part by:
 # https://github.com/andrew-hardin/cmake-git-version-tracking
@@ -24,26 +24,32 @@ endif()
 #   -- GEOS_VERSION_MAJOR
 #   -- GEOS_VERSION_MINOR
 #   -- GEOS_VERSION_PATCH
-macro(geosx_get_file_version)
-  file ( STRINGS "${SOURCE_DIR}/VERSION" GEOS_VERSION_FULL )
+macro( geosx_get_file_version )
+  file( STRINGS "${SOURCE_DIR}/VERSION" GEOS_VERSION_FULL )
   string( REGEX REPLACE "VERSION_ID = v" "" GEOS_VERSION_FULL "${GEOS_VERSION_FULL}" )
   string( REPLACE "." ";" GEOS_VERSION_LIST ${GEOS_VERSION_FULL} )
-  list( GET GEOS_VERSION_LIST  0 GEOS_VERSION_MAJOR )
-  list( GET GEOS_VERSION_LIST  1 GEOS_VERSION_MINOR )
-  list( GET GEOS_VERSION_LIST  2 GEOS_VERSION_PATCH )
+  list( GET GEOS_VERSION_LIST 0 GEOS_VERSION_MAJOR )
+  list( GET GEOS_VERSION_LIST 1 GEOS_VERSION_MINOR )
+  list( GET GEOS_VERSION_LIST 2 GEOS_VERSION_PATCH )
 endmacro()
 
 # Get GEOSX development version from git
 # Inputs:
 #   -- SOURCE_DIR
 #   -- GIT_FOUND
 #   -- GIT_EXECUTABLE (only when GIT_FOUND=TRUE )
-# Outputs (if GIT_FOUND=TRUE and inside git repo):
+#   -- GEOS_USE_GIT_VERSION_INFO
+# Outputs (if enabled, GIT_FOUND=TRUE, and inside git repo):
 #   -- GEOS_GIT_BRANCH
 #   -- GEOS_GIT_HASH
 #   -- GEOS_GIT_TAG
-macro(geosx_get_git_version)
-  if( GIT_FOUND )
+macro( geosx_get_git_version )
+  # Default empty values when git info is disabled or unavailable.
+  set( GEOS_GIT_BRANCH "" )
+  set( GEOS_GIT_HASH   "" )
+  set( GEOS_GIT_TAG    "" )
+
+  if( GIT_FOUND AND GEOS_USE_GIT_VERSION_INFO )
     # Use BLT Git macros for convenience
     include( ${SOURCE_DIR}/cmake/blt/cmake/BLTGitMacros.cmake )
     blt_is_git_repo( OUTPUT_STATE is_git_repo
@@ -96,6 +102,7 @@ if( NOT DEFINED CMAKE_SCRIPT_MODE_FILE )
                      -D SOURCE_DIR=${SOURCE_DIR}
                      -D GIT_FOUND=${GIT_FOUND}
                      -D GIT_EXECUTABLE=${GIT_EXECUTABLE}
+                     -D GEOS_USE_GIT_VERSION_INFO=${GEOS_USE_GIT_VERSION_INFO}
                      -P "${CMAKE_CURRENT_LIST_FILE}"
                      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ver_tmp_file} ${ver_out_file} )
-endif()
+endif()

src/coreComponents/codingUtilities/Utilities.hpp

@@ -488,9 +488,9 @@ VECTOR_TYPE axpy( VECTOR_TYPE const & vec1,
   VECTOR_TYPE result( N );
   RAJA::forall< parallelHostPolicy >( RAJA::TypedRangeSegment< localIndex >( 0, N ),
                                       [&] GEOS_HOST ( localIndex const i )
-    {
-      result[i] = vec1[i] + alpha * vec2[i];
-    } );
+  {
+    result[i] = vec1[i] + alpha * vec2[i];
+  } );
   return result;
 }
 
@@ -502,9 +502,9 @@ VECTOR_TYPE scale( VECTOR_TYPE const & vec,
   VECTOR_TYPE result( N );
   RAJA::forall< parallelHostPolicy >( RAJA::TypedRangeSegment< localIndex >( 0, N ),
                                       [&] GEOS_HOST ( localIndex const i )
-    {
-      result[i] = scalarMult * vec[i];
-    } );
+  {
+    result[i] = scalarMult * vec[i];
+  } );
   return result;
 }
 
@@ -517,9 +517,9 @@ real64 dot( VECTOR_TYPE const & vec1,
   const localIndex N = vec1.size();
   RAJA::forall< parallelHostPolicy >( RAJA::TypedRangeSegment< localIndex >( 0, N ),
                                       [&] GEOS_HOST ( localIndex const i )
-    {
-      result += vec1[i] * vec2[i];
-    } );
+  {
+    result += vec1[i] * vec2[i];
+  } );
   return result.get();
 }
 

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/common/GeosxMacros.hpp

@@ -60,6 +60,31 @@
 
 ///@}
 
+/**
+ * @name NVCC diagnostic suppression helpers.
+ *
+ * Work around nvcc erroneously requiring device-compatible destructors for
+ * reference parameters of host lambdas that contain device kernel launches.
+ * Place GEOS_NV_HOST_DEVICE_DIAG_SUPPRESS before the lambda and
+ * GEOS_NV_HOST_DEVICE_DIAG_DEFAULT after it to restore the default behavior.
+ * On non-NVCC compilers the macros expand to nothing.
+ */
+///@{
+
+#if defined(__NVCC__)
+/// Suppress nvcc diagnostics 20011/20014 (calling __host__ from __host__ __device__).
+#define GEOS_NV_HOST_DEVICE_DIAG_SUPPRESS _Pragma("nv_diag_suppress 20011") _Pragma("nv_diag_suppress 20014")
+/// Restore nvcc diagnostics 20011/20014 to default.
+#define GEOS_NV_HOST_DEVICE_DIAG_DEFAULT  _Pragma("nv_diag_default 20011")  _Pragma("nv_diag_default 20014")
+#else
+/// @cond DO_NOT_DOCUMENT
+#define GEOS_NV_HOST_DEVICE_DIAG_SUPPRESS
+#define GEOS_NV_HOST_DEVICE_DIAG_DEFAULT
+/// @endcond
+#endif
+
+///@}
+
 /**
  * @name Unused variable markers.
  *

src/coreComponents/dataRepository/Group.cpp

@@ -86,6 +86,8 @@ void Group::deregisterWrapper( string const & name )
 
 void Group::resize( indexType const newSize )
 {
+  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/unitTests/testErrorHandling.cpp

@@ -26,6 +26,7 @@
 
 #include <gtest/gtest.h>
 #include <filesystem>
+#include <signal.h>
 
 using namespace geos;
 using namespace dataRepository;

src/coreComponents/dataRepository/wrapperHelpers.hpp

@@ -238,10 +238,46 @@ numElementsFromByteSize( localIndex const byteSize )
 }
 
 
+/// @cond DO_NOT_DOCUMENT
+namespace detail
+{
+template< typename T >
+std::enable_if_t< traits::HasMemberFunction_reserveValues< T const > >
+reserveValuesIfAvailable( T & value, localIndex const newCapacity )
+{
+  localIndex const oldCapacity = value.size();
+  double const oldValueCapacity = value.valueCapacity();
+  localIndex const newValueCapacity = oldValueCapacity * newCapacity / oldCapacity;
+  value.reserveValues( newValueCapacity );
+}
+
+template< typename T >
+std::enable_if_t< !traits::HasMemberFunction_reserveValues< T const > >
+reserveValuesIfAvailable( T &, localIndex const )
+{}
+}
+/// @endcond
+
 template< typename T >
 std::enable_if_t< traits::HasMemberFunction_reserve< T > >
 reserve( T & value, localIndex const newCapacity )
-{ value.reserve( newCapacity ); }
+{
+  value.reserve( newCapacity );
+  detail::reserveValuesIfAvailable( value, newCapacity );
+}
+
+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/fileIO/silo/SiloFile.cpp

@@ -2191,9 +2191,9 @@ void SiloFile::writeDataField( string const & meshName,
       castedField[i].resize( nels );
       vars[i] = static_cast< void * >( (castedField[i]).data() );
       forAll< serialPolicy >( nels, [=, &castedField] GEOS_HOST ( localIndex const k )
-        {
-          castedField[i][k] = siloFileUtilities::CastField< OUTTYPE >( field[k], i );
-        } );
+      {
+        castedField[i][k] = siloFileUtilities::CastField< OUTTYPE >( field[k], i );
+      } );
     }
   }
 

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 )