Fixes projection/evaluation iteration sets. (#226)

* Fixes projection/evaluation iteration sets - they were too large by a factor of local_size. * improved 3D advection integration test to be more robust when particles are on cell boundaries * revert unintentional NP submodule update
ExCALIBUR-NEPTUNE · Mar 19, 2024 · 5bc60b8 · 5bc60b8
1 parent 90ab893
commit 5bc60b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/include/nektar_interface/function_basis_evaluation.hpp b/include/nektar_interface/function_basis_evaluation.hpp
@@ -99,8 +99,7 @@ class FunctionEvaluateBasis : public BasisEvaluateBase<T> {
     const int k_ndim = evaluation_type.get_ndim();
 
     sycl::range<2> cell_iterset_range{static_cast<size_t>(cells_iterset_size),
-                                      static_cast<size_t>(outer_size) *
-                                          static_cast<size_t>(local_size)};
+                                      static_cast<size_t>(outer_size)};
     sycl::range<2> local_iterset{1, local_size};
 
     auto event_loop = this->sycl_target->queue.submit([&](sycl::handler &cgh) {

diff --git a/include/nektar_interface/function_basis_projection.hpp b/include/nektar_interface/function_basis_projection.hpp
@@ -99,8 +99,7 @@ template <typename T> class FunctionProjectBasis : public BasisEvaluateBase<T> {
     const int k_ndim = project_type.get_ndim();
 
     sycl::range<2> cell_iterset_range{static_cast<size_t>(cells_iterset_size),
-                                      static_cast<size_t>(outer_size) *
-                                          static_cast<size_t>(local_size)};
+                                      static_cast<size_t>(outer_size)};
     sycl::range<2> local_iterset{1, local_size};
 
     auto event_loop = this->sycl_target->queue.submit([&](sycl::handler &cgh) {

diff --git a/test/integration/nektar_interface/test_particle_advection.cpp b/test/integration/nektar_interface/test_particle_advection.cpp
@@ -367,7 +367,7 @@ TEST_P(ParticleAdvection3D, Advection3D) {
         auto is_contained =
             geom->ContainsPoint(global_coord, local_coord, tol, dist);
 
-        ASSERT_TRUE(is_contained);
+        ASSERT_TRUE(is_contained || (dist < (tol * 10.0)));
       }
     }
   };