GCC13: fixes for warnings and errors

Author: Julien Fausty

src/coreComponents/mesh/generators/VTKFaceBlockUtilities.cpp

@@ -583,7 +583,7 @@ ArrayOfArrays< localIndex > computeElem2dToNodes( vtkIdType num2dElements,
       std::set< localIndex > tmp;
       for( auto j = 0; j < faceToNodes[faceIndex].size(); ++j )
       {
-        localIndex const & nodeIndex = faceToNodes[faceIndex][j];
+        localIndex const nodeIndex = faceToNodes[faceIndex][j];
         tmp.insert( nodeIndex );
       }
       for( localIndex const & nodeIndex: tmp )

src/coreComponents/unitTests/constitutiveTests/testMultiFluid.cpp

@@ -177,7 +177,7 @@ void testNumericalDerivatives( MultiFluidBase & fluid,
   auto const & phaseDensCopy     = GET_FLUID_DATA( fluidCopy, fields::multifluid::phaseDensity );
   auto const & phaseViscCopy     = GET_FLUID_DATA( fluidCopy, fields::multifluid::phaseViscosity );
   auto const & phaseCompFracCopy = GET_FLUID_DATA( fluidCopy, fields::multifluid::phaseCompFraction );
-  auto const & totalDensCopy     = GET_FLUID_DATA( fluidCopy, fields::multifluid::totalDensity );
+  auto totalDensCopy = [&]() { return GET_FLUID_DATA( fluidCopy, fields::multifluid::totalDensity ); };
 
 #undef GET_FLUID_DATA
 
@@ -211,7 +211,7 @@ void testNumericalDerivatives( MultiFluidBase & fluid,
                        dP, relTol, absTol, "phaseDens", "Pres", phases );
       checkDerivative( phaseViscCopy.toSliceConst(), phaseVisc.value.toSliceConst(), dPhaseVisc[Deriv::dP].toSliceConst(),
                        dP, relTol, absTol, "phaseVisc", "Pres", phases );
-      checkDerivative( totalDensCopy, totalDens.value, dTotalDens[Deriv::dP],
+      checkDerivative( totalDensCopy(), totalDens.value, dTotalDens[Deriv::dP],
                        dP, relTol, absTol, "totalDens", "Pres" );
       checkDerivative( phaseCompFracCopy.toSliceConst(), phaseCompFrac.value.toSliceConst(), dPhaseCompFrac[Deriv::dP].toSliceConst(),
                        dP, relTol, absTol, "phaseCompFrac", "Pres", phases, components );
@@ -228,7 +228,7 @@ void testNumericalDerivatives( MultiFluidBase & fluid,
                        dT, relTol, absTol, "phaseDens", "Temp", phases );
       checkDerivative( phaseViscCopy.toSliceConst(), phaseVisc.value.toSliceConst(), dPhaseVisc[Deriv::dT].toSliceConst(),
                        dT, relTol, absTol, "phaseVisc", "Temp", phases );
-      checkDerivative( totalDensCopy, totalDens.value, dTotalDens[Deriv::dT],
+      checkDerivative( totalDensCopy(), totalDens.value, dTotalDens[Deriv::dT],
                        dT, relTol, absTol, "totalDens", "Temp" );
       checkDerivative( phaseCompFracCopy.toSliceConst(), phaseCompFrac.value.toSliceConst(), dPhaseCompFrac[Deriv::dT].toSliceConst(),
                        dT, relTol, absTol, "phaseCompFrac", "Temp", phases, components );
@@ -277,7 +277,7 @@ void testNumericalDerivatives( MultiFluidBase & fluid,
                        dC, relTol, absTol, "phaseDens", var, phases );
       checkDerivative( phaseViscCopy.toSliceConst(), phaseVisc.value.toSliceConst(), dPhaseVisc[Deriv::dC+jc].toSliceConst(),
                        dC, relTol, absTol, "phaseVisc", var, phases );
-      checkDerivative( totalDensCopy, totalDens.value, dTotalDens[Deriv::dC+jc],
+      checkDerivative( totalDensCopy(), totalDens.value, dTotalDens[Deriv::dC+jc],
                        dC, relTol, absTol, "totalDens", var );
       checkDerivative( phaseCompFracCopy.toSliceConst(), phaseCompFrac.value.toSliceConst(), dPhaseCompFrac[Deriv::dC+jc].toSliceConst(),
                        dC, relTol, absTol, "phaseCompFrac", var, phases, components );

src/docs/doxygen/GeosxConfig.hpp

@@ -5,8 +5,8 @@
  * Contains a CMake-generated list of macros that define a particular build configuration.
  */
 
-#ifndef GEOSX_COMMON_CONFIG_HPP
-#define GEOSX_COMMON_CONFIG_HPP
+#ifndef GEOS_COMMON_CONFIG_HPP
+#define GEOS_COMMON_CONFIG_HPP
 
 /// Enables floating point exceptions
 #define GEOSX_USE_FPE
@@ -17,6 +17,9 @@
 /// Enables use of Caliper (CMake option ENABLE_CALIPER)
 #define GEOSX_USE_CALIPER
 
+/// Enables use of Caliper (CMake option ENABLE_ADIAK)
+/* #undef GEOSX_USE_ADIAK */
+
 /// Enables use of CHAI (CMake option ENABLE_CHAI)
 #define GEOSX_USE_CHAI
 
@@ -27,13 +30,16 @@
 #define GEOSX_USE_MPI
 
 /// Enables use of OpenMP (CMake option ENABLE_OPENMP)
-#define GEOSX_USE_OPENMP
+/* #undef GEOSX_USE_OPENMP */
 
 /// Enables use of CUDA (CMake option ENABLE_CUDA)
-#define GEOSX_USE_CUDA
+/* #undef GEOS_USE_CUDA */
 
 /// Enables use of CUDA NVToolsExt (CMake option ENABLE_CUDA_NVTOOLSEXT)
-#define GEOSX_USE_CUDA_NVTOOLSEXT
+/* #undef GEOS_USE_CUDA_NVTOOLSEXT */
+
+/// Enables use of HIP (CMake option ENABLE_HIP)
+/* #undef GEOS_USE_HIP */
 
 /// Enables use of PVTPackage (CMake option ENABLE_PVTPackage)
 #define GEOSX_USE_PVTPackage
@@ -59,8 +65,26 @@
 /// Enables use of Hypre library (CMake option ENABLE_HYPRE)
 #define GEOSX_USE_HYPRE
 
-/// Macro defined when using cuda in HYPRE  (CMake option ENABLE_HYPRE_CUDA)
-#define GEOSX_USE_HYPRE_CUDA
+#if defined( GEOSX_USE_HYPRE )
+  /// Parsed hypre version information
+  #define HYPRE_VERSION_MAJOR 2
+  /// Parsed hypre version information
+  #define HYPRE_VERSION_MINOR 28
+  /// Parsed hypre version information
+  #define HYPRE_VERSION_PATCH 0
+#endif
+
+/// Denotes HYPRE using CPU
+#define GEOS_USE_HYPRE_CPU 0
+/// Denotes HYPRE using CUDA
+#define GEOS_USE_HYPRE_CUDA 1
+/// Denotes HYPRE using HIP
+#define GEOS_USE_HYPRE_HIP 2
+/// Macro determining what parellel interface hypre is using
+#define GEOS_USE_HYPRE_DEVICE GEOS_USE_HYPRE_CPU
+
+/// Enables use of SuperLU_dist library through HYPRE (CMake option ENABLE_SUPERLU_DIST)
+#define GEOSX_USE_SUPERLU_DIST
 
 /// Enables use of PETSc library (CMake option ENABLE_PETSC)
 #define GEOSX_USE_PETSC
@@ -98,17 +122,20 @@
 /// An integer flag representing the type that globalIndex will be aliased to.
 #define GEOSX_GLOBALINDEX_TYPE_FLAG 2
 
+/// The default block size for GEOSX on this platform
+#define GEOSX_BLOCK_SIZE 32
+
 /// Version information for HDF5
 #define HDF5_VERSION 1.12.1
 
 /// Version information for Conduit
 #define Conduit_VERSION 0.8.6
 
 /// Version information for RAJA
-#define RAJA_VERSION 2022.3.0
+#define RAJA_VERSION 2022.10.5
 
 /// Version information for umpire
-#define umpire_VERSION 2022.3.0
+#define umpire_VERSION 2022.10.0
 
 /// Version information for chai
 /* #undef chai_VERSION */
@@ -125,7 +152,7 @@
 /// Version information for ParMetis
 #define PARAMETIS_VERSION 4.0.3
 
-/// Version information for scotch 
+/// Version information for scotch
 #define scotch_VERSION 6.0.9
 
 /// Version information for superlu_dist
@@ -135,17 +162,24 @@
 #define suitesparse_VERSION 5.7.9
 
 /// Version information for VTK
-#define VTK_VERSION 9.2.20230310
+#define VTK_VERSION 9.2.20230719
 
 /// Version information for fmt
-#define fmt_VERSION 8.0.1
+#define fmt_VERSION 9.1.0
 
 /// Version information for python
-/* #undef Python3_VERSION */
+#define Python3_VERSION 3.11.3
 
 /// Version information for CUDAToolkit
 /* #undef CUDAToolkit_VERSION */
 
+#if defined(GEOS_USE_CUDA) || defined(GEOS_USE_HIP)
+// This needs to be placed into this header in order to appropriately replace
+//  the old usage of GEOS_USE_CUDA, since we detect whether it is defined
+//  rather than a value, not having it in the *same* header can cauase nebulous
+//  compilation problems including the USD of arrays changing depending the scope
+#define GEOS_USE_DEVICE
+#endif
 
-#endif  /* GEOSX_CONFIG_HPP */
+#endif  /* GEOS_CONFIG_HPP */