diff options
Diffstat (limited to 'lib/core/c++')
| -rw-r--r-- | lib/core/c++/particle/geometry/circle.hpp | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/lib/core/c++/particle/geometry/circle.hpp b/lib/core/c++/particle/geometry/circle.hpp index 331f06d..cf9b87e 100644 --- a/lib/core/c++/particle/geometry/circle.hpp +++ b/lib/core/c++/particle/geometry/circle.hpp @@ -5,7 +5,7 @@ namespace kel { namespace lbm { -template<typename T> +template<typename T, uint64_t D> class particle_circle_geometry { private: public: @@ -13,8 +13,8 @@ public: {} template<typename MT = T> - saw::data<sch::ParticleMask<MT,2>> generate_mask(uint64_t resolution, uint64_t boundary_nodes = 0) const { - saw::data<sch::ParticleMask<MT,2>> mask; + saw::data<sch::ParticleMask<MT,D>> generate_mask(uint64_t resolution, uint64_t boundary_nodes = 0) const { + saw::data<sch::ParticleMask<MT,D>> mask; auto& grid = mask.template get<"grid">(); auto& com = mask.template get<"center_of_mass">(); @@ -28,6 +28,24 @@ public: saw::data<T> delta_x{static_cast<typename saw::native_data_type<T>::type>(2.0 / static_cast<double>(diameter_i))}; saw::data<T> center = (saw::data<T>{1.0} + saw::data<T>{2.0} * saw::data<T>{static_cast<saw::native_data_type<T>::type>(boundary_nodes)/diameter_i}); + saw::data<sch::FixedArray<sch::UInt64,D>> boundary_arr; + for(uint64_t i = 0u; i < D; ++i){ + boundary_arr.set(boundary_nodes); + } + + iterator<D>::apply([&](const auto& index){ + grid.at(index).set(0); + }, {}, grid.dims()); + + iterator<D>::apply([&](const auto& index){ + saw::data<sch::Vector<T,D>> f_ind; + for(uint64_t i = 0u; i < D; ++i){ + f_ind.at({{i}}) = (index.at({{i}}) + 0.5) * delta_x - center; + } + + auto norm_f_ind = saw::math::norm(f_ind); + }, {}, grid.dims(),boundary_arr); + for(uint64_t i = 0; i < size; ++i){ for(uint64_t j = 0; j < size; ++j){ grid.at({{i,j}}).set(0); @@ -43,18 +61,19 @@ public: } } + // I don't fully remember what this did saw::data<T> total_mass{}; - iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){ + iterator::apply<D>::apply([&](const saw::data<sch::FixedArray<sch::UInt64,D>>& index){ auto ind_vec = saw::math::vectorize_data(index).template cast_to<T>(); - for(uint64_t i{0u}; i < 2u; ++i){ + for(uint64_t i{0u}; i < D; ++i){ ind_vec.at({{i}}) = ind_vec.at({{i}}) * grid.at(index); } com = com + ind_vec; total_mass = total_mass + grid.at(index); - },{{0u,0u}}, grid.dims()); + },{}, grid.dims()); - for(uint64_t i{0u}; i < 2u; ++i){ + for(uint64_t i{0u}; i < D; ++i){ com.at({{i}}) = com.at({{i}}) / total_mass; } |