From 2dd7c95a111a930e8e23140ab3fec074e7de4c8c Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Fri, 29 May 2026 21:56:48 +0200 Subject: Dangling --- lib/core/c++/chunk.hpp | 1 + lib/core/c++/lbm.hpp | 2 ++ lib/core/c++/math/math.hpp | 4 ++++ lib/core/c++/math/n_closest.hpp | 24 ++++++++++++++++++++++-- lib/core/c++/math/round.hpp | 26 ++++++++++++++++++++++++++ lib/core/c++/particle/particle.hpp | 2 +- 6 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 lib/core/c++/math/math.hpp create mode 100644 lib/core/c++/math/round.hpp (limited to 'lib/core/c++') diff --git a/lib/core/c++/chunk.hpp b/lib/core/c++/chunk.hpp index a1f2451..0f92437 100644 --- a/lib/core/c++/chunk.hpp +++ b/lib/core/c++/chunk.hpp @@ -25,6 +25,7 @@ struct chunk_schema_type_helper, saw template struct Chunk { using InnerSchema = typename impl::chunk_schema_type_helper>::Schema; + using StoredValueSchema = Sch; }; // Not needed for now diff --git a/lib/core/c++/lbm.hpp b/lib/core/c++/lbm.hpp index fbad908..b34ec10 100644 --- a/lib/core/c++/lbm.hpp +++ b/lib/core/c++/lbm.hpp @@ -23,6 +23,8 @@ #include "write_vtk.hpp" #include "util.hpp" +#include "math/math.hpp" + #include #include diff --git a/lib/core/c++/math/math.hpp b/lib/core/c++/math/math.hpp new file mode 100644 index 0000000..3920bec --- /dev/null +++ b/lib/core/c++/math/math.hpp @@ -0,0 +1,4 @@ +#pragma once + +#include "n_linear.hpp" +#include "n_closest.hpp" diff --git a/lib/core/c++/math/n_closest.hpp b/lib/core/c++/math/n_closest.hpp index ddc89be..13414e2 100644 --- a/lib/core/c++/math/n_closest.hpp +++ b/lib/core/c++/math/n_closest.hpp @@ -6,8 +6,8 @@ namespace kel { namespace lbm { -template -auto n_closest_read(saw::data, const saw::data>& frac_ind){ +template +saw::data n_closest_read(const saw::data,Encode>& f, const saw::data>& frac_ind){ auto shift_frac_ind = frac_ind; for(uint64_t i{0u}; i < D; ++i){ @@ -19,6 +19,26 @@ auto n_closest_read(saw::data, const saw::data>& f } auto shift_ind = frac_ind.template cast_to(); + + return f.at(shift_ind); } + +template +void n_closest_add(saw::data,Encode>& f, const saw::data>& frac_ind, const saw::data& val){ + auto shift_frac_ind = frac_ind; + for(uint64_t i{0u}; i < D; ++i){ + + shift_frac_ind.at({{i}}) = shift_frac_ind.at({{i}}) + saw::data{0.5}; + if(shift_frac_ind.at({{i}}).get() < 0){ + shift_frac_ind.at({{i}}) = {}; + } + } + + auto shift_ind = frac_ind.template cast_to(); + auto& f_i = f.at(shift_ind); + + f_i = f_i + val; +} + } } diff --git a/lib/core/c++/math/round.hpp b/lib/core/c++/math/round.hpp new file mode 100644 index 0000000..d3a2586 --- /dev/null +++ b/lib/core/c++/math/round.hpp @@ -0,0 +1,26 @@ +#pragma once + +#include "../common.hpp" + +namespace kel { +namespace lbm { + +template +saw::data> round_to_unsigned(const saw::data>& inp){ + saw::data> rv; + + auto zero = static_cast::type>(0); + auto half = static_cast::type>(0.5); + + for(uint64_t i{0u}; i < D; ++i){ + auto val = inp.at({{i}}).get()+half; + val = std::max(zero,val); + + rv.at({i}).set(static_cast(val)); + } + + return rv; +} + +} +} diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp index 37bdc28..fec2eca 100644 --- a/lib/core/c++/particle/particle.hpp +++ b/lib/core/c++/particle/particle.hpp @@ -91,7 +91,7 @@ saw::data>> cre mask = {mask_dims}; auto& mask_step = part.template get<"mask_step">().at({{0u}}); - mask_step.at({}) = dia_d.at({}) / mask_resolution.template cast_to(); + mask_step.at({}) = dia_d / mask_resolution.template cast_to(); auto& com = part.template get<"center_of_mass">().at({{0u}}); // Paranoia -- cgit v1.2.3