From 971250070e7b27590d215de54116f3990ab8ff5a Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 2 Mar 2026 21:10:46 +0100 Subject: Adding bluring for masks --- lib/core/c++/math/n_linear.hpp | 29 +++++++++++++++++++++++++++++ lib/core/c++/particle/blur.hpp | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 lib/core/c++/math/n_linear.hpp create mode 100644 lib/core/c++/particle/blur.hpp (limited to 'lib/core') diff --git a/lib/core/c++/math/n_linear.hpp b/lib/core/c++/math/n_linear.hpp new file mode 100644 index 0000000..62906cd --- /dev/null +++ b/lib/core/c++/math/n_linear.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include "../common.hpp" + +namespace kel { +namespace lbm { + +template +void n_linear_interpolate(const saw::data& field, const saw::data>& pos){ + + auto pos_bound = pos; + auto meta = field.dims(); + saw::data ind; + for(saw::data i{0u}; i < saw::data{D}; ++i){ + pos_bound.at(i).set( + std::max( + std::min( + meta.at(i).template cast_to().get(), + pos.at(i).get() + 1.5 + ), + 1, + ) + -1 + ); + ind.at(i) = pos_bound.at(i).template cast_to(); + } +} +} +} diff --git a/lib/core/c++/particle/blur.hpp b/lib/core/c++/particle/blur.hpp new file mode 100644 index 0000000..a304e8d --- /dev/null +++ b/lib/core/c++/particle/blur.hpp @@ -0,0 +1,37 @@ +#pragma once + +namespace kel { +namespace lbm { +template +void blur_mask(saw::data>& p_mask){ + + saw::data mid{2.0/3.0}; + saw::data edge{1.0/6.0}; + + // saw::data,2u> blur_weights{{2.0/3.0},{1.0/6.0}}; + + auto meta = p_mask.dims(); + saw::data> blurred_mask{meta}; + + for(saw::data i{0u}; i < saw::data{D}; ++i){ + iterator::apply([&](const auto& index){ + blurred_mask.at(index) = p_mask.at(index) * mid; + + if(index.at({i}).get() > 0u){ + auto l_ind = index; + l_ind.at({i}) = ind.at({i}) - 1u; + blurred_mask.at(index) = blurred_mask.at(index) + p_mask.at(l_ind) * edge; + } + if((index.at({i}).get() + 1u) < meta.at({i})){ + auto r_ind = index; + r_ind.at({i}) = ind.at({i}) + 1u; + blurred_mask.at(index) = blurred_mask.at(index) + p_mask.at(r_ind) * edge; + } + },{},meta); + + p_mask = blurred_mask; + } + +} +} +} -- cgit v1.2.3 From 8be0ee7f948c52c1e71e2437bf6e15800daca47d Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 2 Mar 2026 21:11:15 +0100 Subject: Dangling --- lib/core/c++/particle/geometry/circle.hpp | 33 ++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'lib/core') 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 +template class particle_circle_geometry { private: public: @@ -13,8 +13,8 @@ public: {} template - saw::data> generate_mask(uint64_t resolution, uint64_t boundary_nodes = 0) const { - saw::data> mask; + saw::data> generate_mask(uint64_t resolution, uint64_t boundary_nodes = 0) const { + saw::data> mask; auto& grid = mask.template get<"grid">(); auto& com = mask.template get<"center_of_mass">(); @@ -28,6 +28,24 @@ public: saw::data delta_x{static_cast::type>(2.0 / static_cast(diameter_i))}; saw::data center = (saw::data{1.0} + saw::data{2.0} * saw::data{static_cast::type>(boundary_nodes)/diameter_i}); + saw::data> boundary_arr; + for(uint64_t i = 0u; i < D; ++i){ + boundary_arr.set(boundary_nodes); + } + + iterator::apply([&](const auto& index){ + grid.at(index).set(0); + }, {}, grid.dims()); + + iterator::apply([&](const auto& index){ + saw::data> 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 total_mass{}; - iterate_over([&](const saw::data>& index){ + iterator::apply::apply([&](const saw::data>& index){ auto ind_vec = saw::math::vectorize_data(index).template cast_to(); - 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; } -- cgit v1.2.3