Merge pull request #818 from jngrad/clang-tidy

streeve · web-flow · commit e6bad66aeef0 · 2025-05-05T11:26:39.000-04:00
Address Clang-Tidy diagnostics
diff --git a/core/src/Cabana_CommunicationPlan.hpp b/core/src/Cabana_CommunicationPlan.hpp
@@ -664,10 +664,10 @@ class CommunicationPlan
             throw std::logic_error( "Failed MPI Communication" );
 
         // Get the total number of imports/exports.
-        _total_num_export =
-            std::accumulate( _num_export.begin(), _num_export.end(), 0 );
-        _total_num_import =
-            std::accumulate( _num_import.begin(), _num_import.end(), 0 );
+        _total_num_export = std::accumulate(
+            _num_export.begin(), _num_export.end(), std::size_t{ 0u } );
+        _total_num_import = std::accumulate(
+            _num_import.begin(), _num_import.end(), std::size_t{ 0u } );
 
         // Barrier before continuing to ensure synchronization.
         MPI_Barrier( comm() );
@@ -1281,12 +1281,14 @@ class CommunicationData
         setData( particles );
 
         auto send_capacity = sendCapacity();
-        std::size_t new_send_size = total_send * _overallocation;
+        auto new_send_size = static_cast<std::size_t>(
+            static_cast<double>( total_send ) * _overallocation );
         if ( new_send_size > send_capacity )
             _comm_data.reallocateSend( new_send_size );
 
         auto recv_capacity = receiveCapacity();
-        std::size_t new_recv_size = total_recv * _overallocation;
+        auto new_recv_size = static_cast<std::size_t>(
+            static_cast<double>( total_recv ) * _overallocation );
         if ( new_recv_size > recv_capacity )
             _comm_data.reallocateReceive( new_recv_size );
 
diff --git a/core/src/Cabana_DeepCopy.hpp b/core/src/Cabana_DeepCopy.hpp
@@ -37,9 +37,9 @@ template <class Space, class SrcAoSoA>
 inline AoSoA<typename SrcAoSoA::member_types, Space, SrcAoSoA::vector_length>
 create_mirror(
     const Space&, const SrcAoSoA& src,
-    typename std::enable_if<
-        ( !std::is_same<typename SrcAoSoA::memory_space,
-                        typename Space::memory_space>::value )>::type* = 0 )
+    std::enable_if_t<( !std::is_same_v<typename SrcAoSoA::memory_space,
+                                       typename Space::memory_space> )>* =
+        nullptr )
 {
     static_assert( is_aosoa<SrcAoSoA>::value,
                    "create_mirror() requires an AoSoA" );
@@ -61,9 +61,9 @@ create_mirror(
 template <class Space, class SrcAoSoA>
 inline SrcAoSoA create_mirror_view(
     const Space&, const SrcAoSoA& src,
-    typename std::enable_if<
-        ( std::is_same<typename SrcAoSoA::memory_space,
-                       typename Space::memory_space>::value )>::type* = 0 )
+    std::enable_if_t<( std::is_same_v<typename SrcAoSoA::memory_space,
+                                      typename Space::memory_space> )>* =
+        nullptr )
 {
     static_assert( is_aosoa<SrcAoSoA>::value,
                    "create_mirror_view() requires an AoSoA" );
@@ -84,9 +84,9 @@ template <class Space, class SrcAoSoA>
 inline AoSoA<typename SrcAoSoA::member_types, Space, SrcAoSoA::vector_length>
 create_mirror_view(
     const Space& space, const SrcAoSoA& src,
-    typename std::enable_if<
-        ( !std::is_same<typename SrcAoSoA::memory_space,
-                        typename Space::memory_space>::value )>::type* = 0 )
+    std::enable_if_t<( !std::is_same_v<typename SrcAoSoA::memory_space,
+                                       typename Space::memory_space> )>* =
+        nullptr )
 {
     static_assert( is_aosoa<SrcAoSoA>::value,
                    "create_mirror_view() requires an AoSoA" );
@@ -107,10 +107,9 @@ create_mirror_view(
 template <class Space, class SrcAoSoA>
 inline SrcAoSoA create_mirror_view_and_copy(
     const Space&, const SrcAoSoA& src,
-    typename std::enable_if<
-        ( std::is_same<typename SrcAoSoA::memory_space,
-                       typename Space::memory_space>::value &&
-          is_aosoa<SrcAoSoA>::value )>::type* = 0 )
+    std::enable_if_t<( std::is_same_v<typename SrcAoSoA::memory_space,
+                                      typename Space::memory_space> &&
+                       is_aosoa<SrcAoSoA>::value )>* = nullptr )
 {
     return src;
 }
@@ -130,10 +129,9 @@ template <class Space, class SrcAoSoA>
 inline AoSoA<typename SrcAoSoA::member_types, Space, SrcAoSoA::vector_length>
 create_mirror_view_and_copy(
     const Space& space, const SrcAoSoA& src,
-    typename std::enable_if<
-        ( !std::is_same<typename SrcAoSoA::memory_space,
-                        typename Space::memory_space>::value &&
-          is_aosoa<SrcAoSoA>::value )>::type* = 0 )
+    std::enable_if_t<( !std::is_same_v<typename SrcAoSoA::memory_space,
+                                       typename Space::memory_space> &&
+                       is_aosoa<SrcAoSoA>::value )>* = nullptr )
 {
     auto dst = create_mirror( space, src );
 
@@ -156,8 +154,8 @@ create_mirror_view_and_copy(
 template <class DstAoSoA, class SrcAoSoA>
 inline void
 deep_copy( DstAoSoA& dst, const SrcAoSoA& src,
-           typename std::enable_if<( is_aosoa<DstAoSoA>::value &&
-                                     is_aosoa<SrcAoSoA>::value )>::type* = 0 )
+           std::enable_if_t<( is_aosoa<DstAoSoA>::value &&
+                              is_aosoa<SrcAoSoA>::value )>* = nullptr )
 {
     using dst_type = DstAoSoA;
     using src_type = SrcAoSoA;
@@ -168,8 +166,8 @@ deep_copy( DstAoSoA& dst, const SrcAoSoA& src,
 
     // Check that the data types are the same.
     static_assert(
-        std::is_same<typename dst_type::member_types,
-                     typename src_type::member_types>::value,
+        std::is_same_v<typename dst_type::member_types,
+                       typename src_type::member_types>,
         "Attempted to deep copy AoSoA objects of different member types" );
 
     // Check for the same number of values.
@@ -202,7 +200,7 @@ deep_copy( DstAoSoA& dst, const SrcAoSoA& src,
 
     // If the inner array size is the same and both AoSoAs have the same number
     // of values then we can do a byte-wise copy directly.
-    if ( std::is_same<dst_soa_type, src_soa_type>::value )
+    if ( std::is_same_v<dst_soa_type, src_soa_type> )
     {
         Kokkos::deep_copy( Kokkos::View<char*, dst_memory_space>(
                                reinterpret_cast<char*>( dst.data() ),
@@ -288,16 +286,16 @@ inline void deep_copy( AoSoA_t& aosoa,
 template <class DstSlice, class SrcSlice>
 inline void
 deep_copy( DstSlice& dst, const SrcSlice& src,
-           typename std::enable_if<( is_slice<DstSlice>::value &&
-                                     is_slice<SrcSlice>::value )>::type* = 0 )
+           std::enable_if_t<( is_slice<DstSlice>::value &&
+                              is_slice<SrcSlice>::value )>* = nullptr )
 {
     using dst_type = DstSlice;
     using src_type = SrcSlice;
 
     // Check that the data types are the same.
     static_assert(
-        std::is_same<typename dst_type::value_type,
-                     typename src_type::value_type>::value,
+        std::is_same_v<typename dst_type::value_type,
+                       typename src_type::value_type>,
         "Attempted to deep copy Slice objects of different value types" );
 
     // Check that the element dimensions are the same.
@@ -417,8 +415,8 @@ template <class DstMemorySpace, class SrcMemorySpace, int VectorLength,
 auto create_mirror_view_and_copy(
     DstMemorySpace,
     ParticleList<SrcMemorySpace, VectorLength, FieldTags...> plist_src,
-    typename std::enable_if<
-        std::is_same<SrcMemorySpace, DstMemorySpace>::value>::type* = 0 )
+    std::enable_if_t<std::is_same_v<SrcMemorySpace, DstMemorySpace>>* =
+        nullptr )
 {
     return plist_src;
 }
@@ -435,8 +433,8 @@ template <class DstMemorySpace, class SrcMemorySpace, int VectorLength,
 auto create_mirror_view_and_copy(
     DstMemorySpace,
     ParticleList<SrcMemorySpace, VectorLength, FieldTags...> plist_src,
-    typename std::enable_if<
-        !std::is_same<SrcMemorySpace, DstMemorySpace>::value>::type* = 0 )
+    std::enable_if_t<!std::is_same_v<SrcMemorySpace, DstMemorySpace>>* =
+        nullptr )
 {
     // Extract the original AoSoA.
     auto aosoa_src = plist_src.aosoa();
diff --git a/core/src/Cabana_HDF5ParticleOutput.hpp b/core/src/Cabana_HDF5ParticleOutput.hpp
@@ -287,18 +287,18 @@ void writeFields(
     hid_t type_id =
         HDF5Traits<typename SliceType::value_type>::type( &dtype, &precision );
 
-    filespace_id = H5Screate_simple( 1, dimsf, NULL );
+    filespace_id = H5Screate_simple( 1, dimsf, nullptr );
 
     dcpl_id = H5Pcreate( H5P_DATASET_CREATE );
     H5Pset_fill_time( dcpl_id, H5D_FILL_TIME_NEVER );
 
     dset_id = H5Dcreate( file_id, slice.label().c_str(), type_id, filespace_id,
                          H5P_DEFAULT, dcpl_id, H5P_DEFAULT );
 
-    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, NULL, count,
-                         NULL );
+    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, nullptr, count,
+                         nullptr );
 
-    memspace_id = H5Screate_simple( 1, count, NULL );
+    memspace_id = H5Screate_simple( 1, count, nullptr );
 
     plist_id = H5Pcreate( H5P_DATASET_XFER );
     // Default IO in HDF5 is independent
@@ -371,18 +371,18 @@ void writeFields(
     hid_t type_id =
         HDF5Traits<typename SliceType::value_type>::type( &dtype, &precision );
 
-    filespace_id = H5Screate_simple( 2, dimsf, NULL );
+    filespace_id = H5Screate_simple( 2, dimsf, nullptr );
 
     dcpl_id = H5Pcreate( H5P_DATASET_CREATE );
     H5Pset_fill_time( dcpl_id, H5D_FILL_TIME_NEVER );
 
     dset_id = H5Dcreate( file_id, slice.label().c_str(), type_id, filespace_id,
                          H5P_DEFAULT, dcpl_id, H5P_DEFAULT );
 
-    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, NULL, count,
-                         NULL );
+    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, nullptr, count,
+                         nullptr );
 
-    memspace_id = H5Screate_simple( 2, dimsm, NULL );
+    memspace_id = H5Screate_simple( 2, dimsm, nullptr );
     plist_id = H5Pcreate( H5P_DATASET_XFER );
     // Default IO in HDF5 is independent
     if ( h5_config.collective )
@@ -458,18 +458,18 @@ void writeFields(
     hid_t type_id =
         HDF5Traits<typename SliceType::value_type>::type( &dtype, &precision );
 
-    filespace_id = H5Screate_simple( 3, dimsf, NULL );
+    filespace_id = H5Screate_simple( 3, dimsf, nullptr );
 
     dcpl_id = H5Pcreate( H5P_DATASET_CREATE );
     H5Pset_fill_time( dcpl_id, H5D_FILL_TIME_NEVER );
 
     dset_id = H5Dcreate( file_id, slice.label().c_str(), type_id, filespace_id,
                          H5P_DEFAULT, dcpl_id, H5P_DEFAULT );
 
-    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, NULL, count,
-                         NULL );
+    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, nullptr, count,
+                         nullptr );
 
-    memspace_id = H5Screate_simple( 3, dimsm, NULL );
+    memspace_id = H5Screate_simple( 3, dimsm, nullptr );
     plist_id = H5Pcreate( H5P_DATASET_XFER );
     // Default IO in HDF5 is independent
     if ( h5_config.collective )
@@ -575,15 +575,15 @@ void writeTimeStep( HDF5Config h5_config, const std::string& prefix,
 #if H5_VERSION_GE( 1, 10, 1 )
     if ( h5_config.evict_on_close )
     {
-        H5Pset_evict_on_close( plist_id, (hbool_t)1 );
+        H5Pset_evict_on_close( plist_id, true );
     }
 #endif
 
 #if H5_VERSION_GE( 1, 10, 0 )
     if ( h5_config.collective )
     {
-        H5Pset_all_coll_metadata_ops( plist_id, 1 );
-        H5Pset_coll_metadata_write( plist_id, 1 );
+        H5Pset_all_coll_metadata_ops( plist_id, true );
+        H5Pset_coll_metadata_write( plist_id, true );
     }
 #endif
 
@@ -596,8 +596,8 @@ void writeTimeStep( HDF5Config h5_config, const std::string& prefix,
         H5FD_subfiling_config_t subfiling_config;
         H5FD_ioc_config_t ioc_config;
 
-        H5FD_subfiling_config_t* subfiling_ptr = NULL;
-        H5FD_ioc_config_t* ioc_ptr = NULL;
+        H5FD_subfiling_config_t* subfiling_ptr = nullptr;
+        H5FD_ioc_config_t* ioc_ptr = nullptr;
 
         // Get the default subfiling configuration parameters
         hid_t fapl_id = H5I_INVALID_HID;
@@ -610,38 +610,38 @@ void writeTimeStep( HDF5Config h5_config, const std::string& prefix,
         {
             subfiling_config.shared_cfg.stripe_size =
                 h5_config.subfiling_stripe_size;
-            if ( subfiling_ptr == NULL )
+            if ( subfiling_ptr == nullptr )
                 subfiling_ptr = &subfiling_config;
         }
         if ( h5_config.subfiling_stripe_count !=
              subfiling_config.shared_cfg.stripe_count )
         {
             subfiling_config.shared_cfg.stripe_count =
                 h5_config.subfiling_stripe_count;
-            if ( subfiling_ptr == NULL )
+            if ( subfiling_ptr == nullptr )
                 subfiling_ptr = &subfiling_config;
         }
         if ( h5_config.subfiling_ioc_selection !=
              (int)subfiling_config.shared_cfg.ioc_selection )
         {
             subfiling_config.shared_cfg.ioc_selection =
                 (H5FD_subfiling_ioc_select_t)h5_config.subfiling_ioc_selection;
-            if ( subfiling_ptr == NULL )
+            if ( subfiling_ptr == nullptr )
                 subfiling_ptr = &subfiling_config;
         }
         if ( h5_config.subfiling_thread_pool_size !=
              H5FD_IOC_DEFAULT_THREAD_POOL_SIZE )
         {
             H5Pget_fapl_ioc( fapl_id, &ioc_config );
             ioc_config.thread_pool_size = h5_config.subfiling_thread_pool_size;
-            if ( ioc_ptr == NULL )
+            if ( ioc_ptr == nullptr )
                 ioc_ptr = &ioc_config;
         }
         H5Pclose( fapl_id );
 
         H5Pset_mpi_params( plist_id, comm, MPI_INFO_NULL );
 
-        if ( ioc_ptr != NULL )
+        if ( ioc_ptr != nullptr )
             H5Pset_fapl_ioc( subfiling_config.ioc_fapl_id, ioc_ptr );
 
         H5Pset_fapl_subfiling( plist_id, subfiling_ptr );
@@ -705,12 +705,12 @@ void writeTimeStep( HDF5Config h5_config, const std::string& prefix,
     dimsf[0] = n_global;
     dimsf[1] = 3;
 
-    filespace_id = H5Screate_simple( 2, dimsf, NULL );
+    filespace_id = H5Screate_simple( 2, dimsf, nullptr );
 
     count[0] = n_local;
     count[1] = 3;
 
-    memspace_id = H5Screate_simple( 2, count, NULL );
+    memspace_id = H5Screate_simple( 2, count, nullptr );
 
     plist_id = H5Pcreate( H5P_DATASET_XFER );
 
@@ -729,8 +729,8 @@ void writeTimeStep( HDF5Config h5_config, const std::string& prefix,
     dset_id = H5Dcreate( file_id, coords_slice.label().c_str(), type_id,
                          filespace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT );
 
-    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, NULL, count,
-                         NULL );
+    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, nullptr, count,
+                         nullptr );
 
     H5Dwrite( dset_id, type_id, memspace_id, filespace_id, plist_id,
               host_coords.data() );
@@ -876,7 +876,7 @@ void readTimeStep( HDF5Config h5_config, const std::string& prefix,
 #if H5_VERSION_GE( 1, 10, 0 )
     if ( h5_config.collective )
     {
-        H5Pset_all_coll_metadata_ops( plist_id, 1 );
+        H5Pset_all_coll_metadata_ops( plist_id, true );
     }
 #endif
 
@@ -902,7 +902,7 @@ void readTimeStep( HDF5Config h5_config, const std::string& prefix,
     ndims = H5Sget_simple_extent_ndims( filespace_id );
 
     // Get the extents of the file dataspace.
-    H5Sget_simple_extent_dims( filespace_id, dimsf, NULL );
+    H5Sget_simple_extent_dims( filespace_id, dimsf, nullptr );
 
     std::vector<int> all_offsets( comm_size );
     all_offsets[comm_rank] = n_local;
@@ -923,16 +923,16 @@ void readTimeStep( HDF5Config h5_config, const std::string& prefix,
     count[1] = dimsf[1];
     count[2] = dimsf[2];
 
-    memspace_id = H5Screate_simple( ndims, count, NULL );
+    memspace_id = H5Screate_simple( ndims, count, nullptr );
 
     plist_id = H5Pcreate( H5P_DATASET_XFER );
 
     // Default IO in HDF5 is independent
     if ( h5_config.collective )
         H5Pset_dxpl_mpio( plist_id, H5FD_MPIO_COLLECTIVE );
 
-    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, NULL, count,
-                         NULL );
+    H5Sselect_hyperslab( filespace_id, H5S_SELECT_SET, offset, nullptr, count,
+                         nullptr );
 
     readField( dset_id, dtype_id, memspace_id, filespace_id, plist_id, n_local,
                field );
diff --git a/core/src/Cabana_LinkedCellList.hpp b/core/src/Cabana_LinkedCellList.hpp
@@ -46,7 +46,7 @@ struct LinkedCellStencil
     int cell_range;
 
     //! Default Constructor
-    LinkedCellStencil() {}
+    LinkedCellStencil() = default;
 
     //! Constructor
     LinkedCellStencil( const Scalar neighborhood_radius,
@@ -120,7 +120,7 @@ class LinkedCellList
     /*!
       \brief Default constructor.
     */
-    LinkedCellList() {}
+    LinkedCellList() = default;
 
     /*!
       \brief Simple constructor
diff --git a/core/src/Cabana_VerletList.hpp b/core/src/Cabana_VerletList.hpp
diff --git a/core/src/impl/Cabana_CartesianGrid.hpp b/core/src/impl/Cabana_CartesianGrid.hpp
