fixed ParticleSubGroup bug with SymVectors and added test to catch in…

… future
ExCALIBUR-NEPTUNE · Feb 5, 2025 · e089f3b · e089f3b
1 parent b81c57c
commit e089f3b
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 2 deletions.
diff --git a/include/neso_particles/containers/sym_vector.hpp b/include/neso_particles/containers/sym_vector.hpp
@@ -122,7 +122,7 @@ inline void create_kernel_arg(ParticleLoopIteration &iterationx,
                               T *const *const **rhs,
                               Access::SymVector::Read<T> &lhs) {
   lhs.cell = iterationx.cellx;
-  lhs.layer = iterationx.loop_layerx;
+  lhs.layer = iterationx.layerx;
   lhs.ptr = rhs;
 }
 /**
@@ -132,7 +132,7 @@ template <typename T>
 inline void create_kernel_arg(ParticleLoopIteration &iterationx, T ****rhs,
                               Access::SymVector::Write<T> &lhs) {
   lhs.cell = iterationx.cellx;
-  lhs.layer = iterationx.loop_layerx;
+  lhs.layer = iterationx.layerx;
   lhs.ptr = rhs;
 }
 

diff --git a/test/test_particle_loop_sym_vector.cpp b/test/test_particle_loop_sym_vector.cpp
@@ -300,3 +300,70 @@ TEST(ParticleLoop, sym_vector) {
   A->free();
   mesh->free();
 }
+
+TEST(ParticleLoop, sub_group_sym_vector) {
+  auto A = particle_loop_common();
+  auto domain = A->domain;
+  auto mesh = domain->mesh;
+  const int cell_count = mesh->get_cell_count();
+
+  auto aa = particle_sub_group(
+      A, [=](auto ID) { return ID.at(0) % 2 == 0; },
+      Access::read(Sym<INT>("ID")));
+
+  auto si = sym_vector(aa, {Sym<INT>("ID")});
+
+  particle_loop(
+      A, [=](auto LOOP_INDEX) { LOOP_INDEX.at(0) = -1; },
+      Access::write(Sym<INT>("LOOP_INDEX")))
+      ->execute();
+
+  particle_loop(
+      aa,
+      [=](auto dats_int, auto LOOP_INDEX) {
+        LOOP_INDEX.at(0) = dats_int.at(0, 0);
+      },
+      Access::read(si), Access::write(Sym<INT>("LOOP_INDEX")))
+      ->execute();
+
+  for (int cellx = 0; cellx < cell_count; cellx++) {
+    auto id = A->get_cell(Sym<INT>("ID"), cellx);
+    auto loop_index = A->get_cell(Sym<INT>("LOOP_INDEX"), cellx);
+    const int nrow = id->nrow;
+
+    // for each particle in the cell
+    for (int rowx = 0; rowx < nrow; rowx++) {
+      if (id->at(rowx, 0) % 2 == 0) {
+        ASSERT_EQ(loop_index->at(rowx, 0), id->at(rowx, 0));
+      } else {
+        ASSERT_EQ(loop_index->at(rowx, 0), -1);
+      }
+    }
+  }
+
+  particle_loop(
+      aa,
+      [=](auto dats_int, auto LOOP_INDEX) {
+        dats_int.at(0, 0) = LOOP_INDEX.at(0) + 2;
+      },
+      Access::write(si), Access::read(Sym<INT>("LOOP_INDEX")))
+      ->execute();
+
+  for (int cellx = 0; cellx < cell_count; cellx++) {
+    auto id = A->get_cell(Sym<INT>("ID"), cellx);
+    auto loop_index = A->get_cell(Sym<INT>("LOOP_INDEX"), cellx);
+    const int nrow = id->nrow;
+
+    // for each particle in the cell
+    for (int rowx = 0; rowx < nrow; rowx++) {
+      if (id->at(rowx, 0) % 2 == 0) {
+        ASSERT_EQ(loop_index->at(rowx, 0) + 2, id->at(rowx, 0));
+      } else {
+        ASSERT_EQ(loop_index->at(rowx, 0), -1);
+      }
+    }
+  }
+
+  A->free();
+  mesh->free();
+}