feat: Simplify region statistics output in HDF5

host-configs/LLNL/lassen-gcc-8-cuda-11.cmake

@@ -1,6 +1,9 @@
 include(${CMAKE_CURRENT_LIST_DIR}/../../src/coreComponents/LvArray/host-configs/LLNL/lassen-gcc-8-cuda-11.cmake)
 
 # C++
+# This may be required to compile in DEBUG, depending on the total library/binary size
+# set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mcmodel=large" CACHE STRING "" FORCE )
+
 # The "-march=native -mtune=native" which LvArray adds breaks the PVT package.
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "" FORCE)
 set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3" CACHE STRING "" FORCE)
@@ -15,3 +18,5 @@ set(MPI_HOME /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3
 set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "")
 
 include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake)
+
+

inputFiles/compositionalMultiphaseFlow/benchmarks/thermalLeakyWell/thermalLeakyWell_base_direct.xml

@@ -363,4 +363,4 @@
       computeRegionStatistics="1"/>
   </Tasks>
 
-</Problem>
+</Problem>

inputFiles/singlePhaseFlow/staircase_3d.xml

@@ -63,9 +63,9 @@
       target="/Solvers/SinglePhaseFlow"/>
 
     <PeriodicEvent
-      name="statistics"
-      timeFrequency="5000.0"
-      target="/Tasks/SinglePhaseFlowStatistics"/>
+      name="statisticsController"
+      timeFrequency="5000"
+      target="/Tasks/statController"/>
 
     <PeriodicEvent
       name="restarts"
@@ -165,10 +165,12 @@
   </FieldSpecifications>
 
   <Tasks>
-    <SinglePhaseStatistics
-      name="SinglePhaseFlowStatistics"
-      flowSolverName="SinglePhaseFlow"
-      logLevel="1"/>
+    <StatOutputController name="statController" >
+      <SinglePhaseStatistics
+        name="SinglePhaseFlowStatistics"
+        flowSolverName="SinglePhaseFlow"
+        logLevel="1"/>
+    </StatOutputController>
   </Tasks>
 
   <Outputs>

inputFiles/thermoPoromechanicsFractures/ThermoPoroElastic_efem-edfm_verticalFrac_smoke.xml

@@ -142,4 +142,4 @@
       scale="0.0"
       setNames="{ xpos }"/>
   </FieldSpecifications>
-</Problem>
+</Problem>

src/cmake/thirdparty/SetupGeosxThirdParty.cmake

@@ -184,28 +184,7 @@ if(DEFINED CONDUIT_DIR)
 
     message( " ----> Conduit_VERSION = ${Conduit_VERSION}")
 
-
-    set(CONDUIT_TARGETS conduit conduit_relay conduit_blueprint)
-    foreach(targetName ${CONDUIT_TARGETS} )
-        get_target_property(includeDirs
-                            ${targetName}
-                            INTERFACE_INCLUDE_DIRECTORIES)
-
-        set_property(TARGET ${targetName}
-                     APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
-                     ${includeDirs})
-    endforeach()
-
-    # Conduit uses our HDF5 and we need to propagate the above fix.
-    # get_target_property(CONDUIT_RELAY_INTERFACE_INCLUDE_DIRECTORIES conduit_relay INTERFACE_INCLUDE_DIRECTORIES)
-    # list(REMOVE_ITEM CONDUIT_RELAY_INTERFACE_INCLUDE_DIRECTORIES /usr/include)
-    # set_target_properties(conduit_relay PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CONDUIT_RELAY_INTERFACE_INCLUDE_DIRECTORIES})
-
-    # get_target_property(CONDUIT_RELAY_INTERFACE_SYSTEM_INCLUDE_DIRECTORIES conduit_relay INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
-    # list(REMOVE_ITEM CONDUIT_RELAY_INTERFACE_SYSTEM_INCLUDE_DIRECTORIES /usr/include)
-    # set_target_properties(conduit_relay PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${CONDUIT_RELAY_INTERFACE_SYSTEM_INCLUDE_DIRECTORIES})
-
-    set(thirdPartyLibs ${thirdPartyLibs} conduit::conduit)
+    set(thirdPartyLibs ${thirdPartyLibs} conduit::conduit )
 else()
     mandatory_tpl_doesnt_exist("Conduit" CONDUIT_DIR)
 endif()
@@ -407,23 +386,12 @@ if(DEFINED ADIAK_DIR)
     # Header file provides incorrect version 0.3.0
     message( " ----> adiak_VERSION = 0.2.2")
 
-    set(adiak_target "")
-    if(TARGET adiak::adiak)
-      set(adiak_target ${adiak_target} adiak::adiak)
-    endif()
-    if(TARGET adiak)
-      set(adiak_target ${adiak_target} adiak)
-    endif()
-
-    set_property(TARGET ${adiak_target}
-                 APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
-                 ${adiak_INCLUDE_DIR} )
-    set_property(TARGET ${adiak_target}
-                 APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                 ${adiak_INCLUDE_DIR} )
+    if( NOT TARGET adiak )
+      add_library( adiak ALIAS adiak::adiak )
+    endif( )
 
     set(ENABLE_ADIAK ON CACHE BOOL "")
-    set(thirdPartyLibs ${thirdPartyLibs} ${adiak_target})
+    set(thirdPartyLibs ${thirdPartyLibs} adiak )
 else()
     if(ENABLE_ADIAK)
         message(WARNING "ENABLE_ADIAK is ON but ADIAK_DIR isn't defined.")

src/coreComponents/codingUtilities/traits.hpp

@@ -68,6 +68,39 @@ constexpr bool is_range_like = HasMemberFunction_begin< T > && HasMemberFunction
 template< typename CLASS >
 static constexpr bool HasMemberFunction_move = LvArray::bufferManipulation::HasMemberFunction_move< CLASS >;
 
+/**
+ * @brief Defines a static constexpr bool HasMemberFunction_getPreviousSpace< @p CLASS >
+ *        that is true iff the method @p CLASS ::getPreviousSpace() exists and the return value is convertable to a LvArray::MemorySpace.
+ * @tparam CLASS The type to test.
+ */
+HAS_MEMBER_FUNCTION( getPreviousSpace, LvArray::MemorySpace, );
+
+/**
+ * @brief Defines a static constexpr bool HasMemberFunction_registerTouch< @p CLASS >
+ *        that is true iff the method @p CLASS ::registerTouch( LvArray::MemorySpace ) exists.
+ * @tparam CLASS The type to test.
+ */
+HAS_MEMBER_FUNCTION_NO_RTYPE( registerTouch, LvArray::MemorySpace() );
+
+/**
+ * @brief Defines a static constexpr bool HasMemberFunction_checkTouch< @p CLASS >
+ *        that is true iff the method @p CLASS :checkTouch( ) exists and the return value is converatble to bool.
+ * @tparam CLASS The type to test.
+ */
+HAS_MEMBER_FUNCTION( checkTouch, bool, );
+
+
+/**
+ * @brief Defines a static constexpr bool HasMemorySpaceFunctions< @p CLASS >
+ *        that is true iff the class exposes the set a memory space movement functions defined above.
+ * @tparam CLASS The type to test.
+ */
+template< typename CLASS >
+static constexpr bool HasMemorySpaceFunctions = HasMemberFunction_move< CLASS > &&
+                                                HasMemberFunction_registerTouch< CLASS > &&
+                                                HasMemberFunction_checkTouch< CLASS > &&
+                                                HasMemberFunction_getPreviousSpace< CLASS >;
+
 /**
  * @brief Defines a static constexpr bool HasMemberFunction_setName< @p CLASS >
  *        that is true iff the method @p CLASS ::setName( string ) exists.
@@ -126,6 +159,92 @@ IS_VALID_EXPRESSION_2( CanStreamInto, SRC, DST, std::declval< SRC & >() >> std::
  */
 HAS_ALIAS( value_type );
 
+namespace internal
+{
+
+/**
+ * @brief Trait to check if `operator+=` is defined between two types.
+ *
+ * This struct is a type trait that determines if the `operator+=` is defined between two types, T and U.
+ * It inherits from `std::false_type` by default, indicating that the operator is not defined.
+ * A specialized version inherits from `std::true_type` if the operator is indeed defined.
+ *
+ * @tparam T The left-hand side type for the `operator+=`.
+ * @tparam U The right-hand side type for the `operator+=`, defaults to the same as T.
+ * @tparam Void Helper type for SFINAE.
+ */
+template< typename T, typename U, typename = void >
+struct has_plus_equal : std::false_type {};
+
+/**
+ * @brief Specialization of has_plus_equal when `operator+=` is defined.
+ *
+ * This specialization of has_plus_equal uses SFINAE to detect if `T& operator+=(U)` exists.
+ * If the operator is found, this struct inherits from `std::true_type`.
+ *
+ * @tparam T The left-hand side type for the `operator+=`.
+ * @tparam U The right-hand side type for the `operator+=`.
+ */
+template< typename T, typename U >
+struct has_plus_equal< T, U, std::void_t< decltype(std::declval< T & >() += std::declval< U >()) > > : std::true_type {};
+
+} // namespace internal
+
+/**
+ * @brief Helper variable template to simplify usage of has_plus_equal trait.
+ *
+ * This variable template provides a more convenient way to use the has_plus_equal trait.
+ * It evaluates to `true` if `T` supports `operator+=` with `U`, and `false` otherwise.
+ *
+ * @tparam T The left-hand side type for the `operator+=`.
+ * @tparam U The right-hand side type for the `operator+=`, defaults to the same as T.
+ */
+template< typename T, typename U=T >
+constexpr bool has_plus_equal_v = internal::has_plus_equal< T, U >::value;
+
+namespace internal
+{
+
+/**
+ * @brief Trait to check if `operator<` is defined between two types.
+ *
+ * This struct is a type trait that determines if the `operator<` is defined between two types, T and U.
+ * It inherits from `std::false_type` by default, indicating that the operator is not defined.
+ * A specialized version inherits from `std::true_type` if the operator is indeed defined.
+ *
+ * @tparam T The left-hand side type for the `operator<`.
+ * @tparam U The right-hand side type for the `operator<`, defaults to the same as T.
+ * @tparam Void Helper type for SFINAE.
+ */
+template< typename T, typename U, typename = void >
+struct has_less_than : std::false_type {};
+
+/**
+ * @brief Specialization of has_less_than when `operator<` is defined.
+ *
+ * This specialization of has_less_than uses SFINAE to detect if `T& operator<(U)` exists.
+ * If the operator is found, this struct inherits from `std::true_type`.
+ *
+ * @tparam T The left-hand side type for the `operator<`.
+ * @tparam U The right-hand side type for the `operator<`.
+ */
+template< typename T, typename U >
+struct has_less_than<T, U, std::void_t<decltype(std::declval< T & >() < std::declval< U >())>> : std::true_type {};
+
+} // namespace internal
+
+/**
+ * @brief Helper variable template to simplify usage of has_less_than trait.
+ *
+ * This variable template provides a more convenient way to use the has_less_than trait.
+ * It evaluates to `true` if `T` supports `operator<` with `U`, and `false` otherwise.
+ *
+ * @tparam T The left-hand side type for the `operator<`.
+ * @tparam U The right-hand side type for the `operator<`, defaults to the same as T.
+ */
+template< typename T, typename U=T >
+constexpr bool has_less_than_v = internal::has_less_than< T, U >::value;
+
 namespace internal
 {
 template< class T,

src/coreComponents/common/CMakeLists.txt

@@ -88,15 +88,7 @@ if ( ENABLE_MKL )
 endif()
 
 if( ENABLE_CALIPER )
-  list( APPEND dependencyList caliper )
-endif()
-
-if( ENABLE_CALIPER )
-  list( APPEND dependencyList caliper )
-
-  if (TARGET adiak::adiak)
-    list( APPEND dependencyList adiak::adiak )
-  endif()
+  set( dependencyList ${dependencyList} caliper )
 
   if (TARGET adiak)
     list( APPEND dependencyList adiak )

src/coreComponents/constitutive/fluid/multifluid/MultiFluidUtils.hpp

@@ -62,12 +62,17 @@ struct MultiFluidVarSlice
     derivs( inputDerivs )
   {}
 
+  GEOS_HOST_DEVICE MultiFluidVarSlice( const MultiFluidVarSlice & );
+
   internal::ArraySliceOrRef< T, DIM, USD > value;        /// variable value
   internal::ArraySliceOrRef< T, DIM + 1, USD_DC > derivs; /// derivative w.r.t. pressure, temperature, compositions
 
   using ValueType = internal::ArraySliceOrRef< T, DIM, USD >;
 };
 
+template< typename T, int DIM, int USD, int USD_DC >
+GEOS_HOST_DEVICE MultiFluidVarSlice< T, DIM, USD, USD_DC >::MultiFluidVarSlice( const MultiFluidVarSlice & ) = default;
+
 /**
  * @brief Struct holding views into fluid data, used to simplify parameter passing in kernel wrapper constructors.
  * @tparam NDIM number of dimensions
@@ -77,7 +82,7 @@ struct MultiFluidVarSlice
 template< typename T, int NDIM, int USD, int USD_DC >
 struct MultiFluidVarView
 {
-  MultiFluidVarView() = default;
+  GEOS_HOST_DEVICE MultiFluidVarView();
 
   GEOS_HOST_DEVICE
   MultiFluidVarView ( MultiFluidVarView const & src ):
@@ -95,6 +100,7 @@ struct MultiFluidVarView
   ArrayView< T, NDIM, USD > value;        ///< View into property values
   ArrayView< T, NDIM + 1, USD_DC > derivs; ///< View into property derivatives w.r.t. pressure, temperature, compositions
 
+
   using SliceType = MultiFluidVarSlice< T, NDIM - 2, USD - 2, USD_DC - 2 >;
 
   using ValueType = ArrayView< T, NDIM, USD >;
@@ -106,6 +112,9 @@ struct MultiFluidVarView
   }
 };
 
+template< typename T, int NDIM, int USD, int USD_DC >
+GEOS_HOST_DEVICE MultiFluidVarView< T, NDIM, USD, USD_DC >::MultiFluidVarView() = default;
+
 /**
  * @brief Struct holding views into fluid data, used to simplify parameter passing in kernel wrapper constructors.
  * @tparam NDIM number of dimensions