diff options
| -rw-r--r-- | examples/poiseulle_particles_2d_gpu/step.hpp | 8 | ||||
| -rw-r--r-- | lib/core/c++/hlbm.hpp | 1 | ||||
| -rw-r--r-- | lib/core/c++/particle/aabb.hpp | 4 | ||||
| -rw-r--r-- | lib/core/tests/particles.cpp | 6 |
4 files changed, 17 insertions, 2 deletions
diff --git a/examples/poiseulle_particles_2d_gpu/step.hpp b/examples/poiseulle_particles_2d_gpu/step.hpp index 52e8c59..aa0e382 100644 --- a/examples/poiseulle_particles_2d_gpu/step.hpp +++ b/examples/poiseulle_particles_2d_gpu/step.hpp @@ -18,10 +18,11 @@ saw::error_or<void> step( auto& info_f = fields.template get<"info">(); auto& porous_f = macros.template get<"porosity">(); + component<T,Desc,cmpt::HlbmParticle,encode::Sycl<saw::encode::Native>> particle; + // auto coll_ev = q.submit([&](acpp::sycl::handler& h){ component<T,Desc,cmpt::Hlbm,encode::Sycl<saw::encode::Native>> collision{0.8}; - component<T,Desc,cmpt::HlbmParticle,encode::Sycl<saw::encode::Native>> particle; component<T,Desc,cmpt::BounceBack,encode::Sycl<saw::encode::Native>> bb; component<T,Desc,cmpt::AntiBounceBack<0u>,encode::Sycl<saw::encode::Native>> abb; @@ -76,6 +77,11 @@ saw::error_or<void> step( }); }).wait(); + q.submit([&](acpp::sycl::handler& h){ + h.parallel_for(acpp::sycl::range<1u>{1u}, [=](acpp::sycl::id<1u> idx){ + particle.apply(fields,macros,particles,{{0u}},t_i); + }); + }).wait(); // Step /* diff --git a/lib/core/c++/hlbm.hpp b/lib/core/c++/hlbm.hpp index 85e5357..0ba9cc2 100644 --- a/lib/core/c++/hlbm.hpp +++ b/lib/core/c++/hlbm.hpp @@ -142,6 +142,7 @@ public: iterator<Desc::D>::apply([&](const auto& index){ // ask for the d_k value here. // For every value im iterating over I need sth + std::cout<<"Pos: "<<index.at({0u}).get()<<" "<<index.at({1u}).get()<<std::endl; },start,stop); // Check diff --git a/lib/core/c++/particle/aabb.hpp b/lib/core/c++/particle/aabb.hpp index 8579695..d74ea88 100644 --- a/lib/core/c++/particle/aabb.hpp +++ b/lib/core/c++/particle/aabb.hpp @@ -7,6 +7,7 @@ namespace kel { namespace lbm { template<typename PGroup> class particle_aabb final { + static_assert(saw::always_false<PGroup>::value, "Not supported"); }; template<typename T, uint64_t D> @@ -21,7 +22,8 @@ public: sch::Member<sch::FixedArray<sch::UInt64,D>,"b"> >; public: - static constexpr saw::data<AABB> calculate(const saw::data<Schema>& p_grp, const saw::data<sch::FixedArray<sch::UInt64,1u>>& i, const saw::data<sch::FixedArray<sch::UInt64,D>>& meta){ + template<typename Encode> + static constexpr saw::data<AABB> calculate(const saw::data<Schema,Encode>& p_grp, const saw::data<sch::FixedArray<sch::UInt64,1u>>& i, const saw::data<sch::FixedArray<sch::UInt64,D>>& meta){ saw::data<AABB> aabb; auto& parts = p_grp.template get<"particles">(); diff --git a/lib/core/tests/particles.cpp b/lib/core/tests/particles.cpp index 1c18fbb..de9477c 100644 --- a/lib/core/tests/particles.cpp +++ b/lib/core/tests/particles.cpp @@ -272,4 +272,10 @@ SAW_TEST("Verlet integration test 2D"){ } } */ + +SAW_TEST("Particle / AABB"){ + using namespace kel; + + +} } |