diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/c++/hlbm.hpp | 14 | ||||
| -rw-r--r-- | modules/core/c++/particle/aabb.hpp | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/modules/core/c++/hlbm.hpp b/modules/core/c++/hlbm.hpp index 1c625bb..cc35f9b 100644 --- a/modules/core/c++/hlbm.hpp +++ b/modules/core/c++/hlbm.hpp @@ -13,6 +13,7 @@ namespace lbm { namespace cmpt { struct HlbmInit {}; struct Hlbm {}; +struct HlbmOneParticle {}; struct HlbmParticle {}; struct HlbmOneParticleMomentumExchange {}; } @@ -101,7 +102,7 @@ public: }; template<typename T, typename Desc, typename Encode> -class component<T, Desc, cmpt::HlbmParticle, Encode> final { +class component<T, Desc, cmpt::HlbmOneParticle, Encode> final { private: /* template<typename CellFieldSchema, typename MacroFieldSchema, typename ParticleSchema, uint64_t i> @@ -124,6 +125,7 @@ public: auto& parts = part_spheroid_group.template get<"particles">(); auto parts_size = parts.meta().at({0u}); + auto& pi = parts.at(index); auto& pirb = pi.template get<"rigid_body">(); auto& pirb_pos = pirb.template get<"position">(); @@ -131,10 +133,8 @@ public: saw::data<sch::FixedArray<sch::UInt64,Desc::D>> start; saw::data<sch::FixedArray<sch::UInt64,Desc::D>> stop; - auto eo_aabb = particle_aabb<typename ParticleSchema::ValueType>::calculate(part_spheroid_group,index,mvel.meta()); + auto eo_aabb = particle_aabb<typename ParticleSchema::ValueType>::calculate(part_spheroid_group,{{0u}},mvel.meta()); if(eo_aabb.is_error()){ - std::cerr<<"Prepping error"<<std::endl; - std::cerr<<eo_aabb.get_error().get_category()<<std::endl; return; } auto& aabb = eo_aabb.get_value(); @@ -146,13 +146,13 @@ 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; + // std::cout<<"Pos: "<<index.at({0u}).get()<<" "<<index.at({1u}).get()<<std::endl; + + },start,stop); // Check } - - } }; diff --git a/modules/core/c++/particle/aabb.hpp b/modules/core/c++/particle/aabb.hpp index 983fd97..da39ec2 100644 --- a/modules/core/c++/particle/aabb.hpp +++ b/modules/core/c++/particle/aabb.hpp @@ -23,23 +23,24 @@ public: >; public: template<typename Sch, typename Encode> - static constexpr saw::error_or<saw::data<AABB>> calculate(const saw::data<Sch,Encode>& p_grp, const saw::data<sch::FixedArray<sch::UInt64,1u>>& i, const saw::data<sch::FixedArray<sch::UInt64,D>>& meta){ + static constexpr saw::error_or<saw::data<AABB>> calculate(const saw::data<Sch,Encode>& p_grp, const saw::data<sch::FixedArray<sch::UInt64,1u>>& index, const saw::data<sch::FixedArray<sch::UInt64,D>>& meta){ static_assert(PC > 0u, "Can't calculate from no particles"); - if(not (i.at({0u}).get() < PC) ){ + if(not (index.at({{0u}}).get() < PC) ){ + std::cerr.flush(); return saw::make_error<saw::err::critical>("Too large i in particle_aabb"); } saw::data<AABB> aabb; auto& parts = p_grp.template get<"particles">(); - auto& pi = parts.at(i); + auto& pi = parts.at(index); auto& pirb = pi.template get<"rigid_body">(); auto& pirb_pos = pirb.template get<"position">(); auto& a = aabb.template get<"a">(); auto& b = aabb.template get<"b">(); - const saw::data<sch::Scalar<T>>& rad_d = p_grp.template get<"collision">().at(i).template get<"radius">(); + const saw::data<sch::Scalar<T>>& rad_d = p_grp.template get<"collision">().at({{0u}}).template get<"radius">(); saw::data<sch::Vector<T,D>> lower; saw::data<sch::Vector<T,D>> upper; @@ -52,7 +53,6 @@ public: } return aabb; - } }; |