Merge branch 'fix-regressions' into 'master'

Fix particle base bugs See merge request OPAL/Libraries/ippl!194
IPPL-framework · Jul 11, 2023 · d47514c · d47514c
2 parents 75fcd6c + 350455a
commit d47514c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Particle/ParticleBase.h b/src/Particle/ParticleBase.h
@@ -227,8 +227,8 @@ namespace ippl {
          */
         unsigned getAttributeNum() const {
             unsigned total = 0;
-            forAllAttributes([&]<typename Attributes>(const Attributes& att) {
-                total += att.size();
+            detail::runForAllSpaces([&]<typename MemorySpace>() {
+                total += attributes_m.template get<MemorySpace>().size();
             });
             return total;
         }

diff --git a/unit_tests/Particle/ParticleBase.cpp b/unit_tests/Particle/ParticleBase.cpp
@@ -26,7 +26,7 @@ class ParticleBaseTest : public ::testing::Test, public MultirankUtils<1, 2, 3,
     using playout_type = ippl::detail::ParticleLayout<double, Dim>;
 
     template <unsigned Dim>
-    using bunch_type = ippl::ParticleBase<playout_type<Dim>>;
+    using bunch_type = ippl::ParticleBase<playout_type<Dim>, Kokkos::DefaultExecutionSpace>;
 
     ParticleBaseTest() { setup(this); }