updates previous commit

replace get_elements_with_range

[Clang-tidy] fix get_elements_with_range' is deprecated in PatchDataLayer.hpp

- Replace get_elements_with_range by get_ids_vec_where.
- Fix ignoring return value of function declared with 'nodiscard' attribute [clang-diagnostic-unused-result]
  156 |     patch_list.build_local();

updates

updates

Author: Akos299

src/shamrock/include/shamrock/patch/PatchDataField.hpp

@@ -11,6 +11,7 @@
 
 /**
  * @file PatchDataField.hpp
+ * @author Léodasce Sewanou (leodasce.sewanou@ens-lyon.fr)
  * @author Timothée David--Cléris (tim.shamrock@proton.me)
  * @brief
  */
@@ -281,14 +282,14 @@ class PatchDataField {
      * @return std::vector<u32>
      */
     template<class Lambdacd, class... Args>
-    inline std::vector<u32> get_ids_vec_where(Lambdacd &&cd_true, Args... args) {
+    inline std::vector<u32> get_ids_vec_where(Lambdacd &&cd_true, Args &&...args) {
         StackEntry stack_loc{};
         std::vector<u32> idx_cd{};
         if (get_obj_cnt() > 0) {
             auto acc = buf.copy_to_stdvec();
 
             for (u32 i = 0; i < get_obj_cnt(); i++) {
-                if (cd_true(acc, i * nvar, args...)) {
+                if (std::forward<Lambdacd>(cd_true)(acc, i * nvar, std::forward<Args>(args)...)) {
                     idx_cd.push_back(i);
                 }
             }

src/shamrock/include/shamrock/patch/PatchDataLayer.hpp

@@ -11,6 +11,7 @@
 
 /**
  * @file PatchDataLayer.hpp
+ * @author Léodasce Sewanou (leodasce.sewanou@ens-lyon.fr)
  * @author Timothée David--Cléris (tim.shamrock@proton.me)
  * @author Yona Lapeyre (yona.lapeyre@ens-lyon.fr) --no git blame--
  * @brief
@@ -539,10 +540,13 @@ namespace shamrock::patch {
 
         PatchDataField<T> &main_field = pdat.get_field<T>(0);
 
+        // Note that using get_ids_vec_where here is safe since nvar for main_field is equal to 1
+        // hence the Lambda cd_true will be applied to each block on the patch. e.g : i * nvar = i
         auto get_vec_idx = [&](T vmin, T vmax) -> std::vector<u32> {
-            return main_field.get_elements_with_range(
-                [&](T val, T vmin, T vmax) {
+            return main_field.get_ids_vec_where(
+                [&](const auto &acc, u32 idx, T vmin, T vmax) {
                     if (shambase::VectorProperties<T>::dimension == 3) {
+                        T val = acc[idx];
                         return shammath::is_in_half_open(val, vmin, vmax);
                     } else {
                         throw shambase::make_except_with_loc<std::runtime_error>(
@@ -553,6 +557,20 @@ namespace shamrock::patch {
                 vmax);
         };
 
+        // auto get_vec_idx = [&](T vmin, T vmax) -> std::vector<u32> {
+        //     return main_field.get_elements_with_range(
+        //         [&](T val, T vmin, T vmax) {
+        //             if (shambase::VectorProperties<T>::dimension == 3) {
+        //                 return shammath::is_in_half_open(val, vmin, vmax);
+        //             } else {
+        //                 throw shambase::make_except_with_loc<std::runtime_error>(
+        //                     "dimension != 3 is not handled");
+        //             }
+        //         },
+        //         vmin,
+        //         vmax);
+        // };
+
         std::vector<u32> idx_lst = get_vec_idx(bmin, bmax);
 
         shamlog_debug_sycl_ln("PatchDataLayer", "inserting element cnt =", idx_lst.size());

src/shamrock/src/patch/PatchDataLayer.cpp

@@ -14,6 +14,7 @@
  * @brief
  */
 
+#include "shambase/aliases_int.hpp"
 #include "shambase/exception.hpp"
 #include "shambase/stacktrace.hpp"
 #include "shambase/string.hpp"
@@ -22,6 +23,7 @@
 #include "shamsys/legacy/log.hpp"
 #include "shamsys/legacy/sycl_handler.hpp"
 #include "shamtree/kernels/geometry_utils.hpp"
+#include <vector>
 
 namespace shamrock::patch {
 
@@ -313,9 +315,19 @@ namespace shamrock::patch {
 
         PatchDataField<T> &main_field = fields[0].get_if_ref_throw<T>();
 
+        // auto get_vec_idx = [&](T vmin, T vmax) -> std::vector<u32> {
+        //     return main_field.get_elements_with_range(
+        //         [&](T val, T vmin, T vmax) {
+        //             return Patch::is_in_patch_converted(val, vmin, vmax);
+        //         },
+        //         vmin,
+        //         vmax);
+        // };
+
         auto get_vec_idx = [&](T vmin, T vmax) -> std::vector<u32> {
-            return main_field.get_elements_with_range(
-                [&](T val, T vmin, T vmax) {
+            return main_field.get_ids_vec_where(
+                [&](const auto &acc, u32 idx, T vmin, T vmax) {
+                    T val = acc[idx];
                     return Patch::is_in_patch_converted(val, vmin, vmax);
                 },
                 vmin,

src/shamrock/src/scheduler/PatchScheduler.cpp

@@ -153,7 +153,8 @@ std::vector<u64> PatchScheduler::add_root_patches(
         //);
     }
 
-    patch_list.build_local();
+    // build_local() is declared as nodiscard
+    (void) patch_list.build_local();
     patch_list.reset_local_pack_index();
     patch_list.build_local_idx_map();
     patch_list.build_global_idx_map();