From a2d9db3144a57f915b5c40660cd9c07826e49787 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 8 Jun 2026 23:20:10 +0200 Subject: added comment --- lib/core/c++/particle/blur.hpp | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/core/c++/particle/blur.hpp b/lib/core/c++/particle/blur.hpp index 7b93ae9..b7a1988 100644 --- a/lib/core/c++/particle/blur.hpp +++ b/lib/core/c++/particle/blur.hpp @@ -13,6 +13,7 @@ void blur_mask(saw::data>& p_mask){ auto meta = p_mask.dims(); saw::data> blurred_mask{meta}; + /* 1D blur into N-D Blur*/ for(saw::data i{0u}; i < saw::data{D}; ++i){ iterator::apply([&](const auto& index){ blurred_mask.at(index) = p_mask.at(index) * mid; -- cgit v1.2.3 From 4c9e43a42c15ce93ffded21dfcaa171f63d20d69 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 11 Jun 2026 14:07:27 +0200 Subject: Fixing deduction issues from constexpr values --- lib/core/c++/hlbm.hpp | 11 +++--- lib/core/c++/particle/aabb.hpp | 30 +++++++++-------- lib/core/c++/particle/common.hpp | 3 ++ lib/core/c++/particle/particle.hpp | 68 ++++++-------------------------------- lib/core/c++/particle/schema.hpp | 67 +++++++++++++++++++++++++++++++++++++ lib/core/c++/schema.hpp | 10 +++--- 6 files changed, 109 insertions(+), 80 deletions(-) create mode 100644 lib/core/c++/particle/common.hpp create mode 100644 lib/core/c++/particle/schema.hpp (limited to 'lib') diff --git a/lib/core/c++/hlbm.hpp b/lib/core/c++/hlbm.hpp index 6ae7d80..85e5357 100644 --- a/lib/core/c++/hlbm.hpp +++ b/lib/core/c++/hlbm.hpp @@ -4,6 +4,8 @@ #include "component.hpp" #include "equilibrium.hpp" +#include "particle/particle.hpp" + namespace kel { namespace lbm { namespace cmpt { @@ -114,14 +116,15 @@ public: */ template - void apply(const saw::data& field, const saw::data& macros, const saw::data& part_groups, saw::data> index, saw::data time_step) const { + void apply(const saw::data& field, const saw::data& macros, const saw::data& part_group, saw::data> index, saw::data time_step) const { /// Figure out how to access the particle list // auto& p = particles.at(i); /// Iterate over the grid bounds // auto& grid = p.template get<"grid">(); - auto& part_spheroid_group = part_groups.template get<0>(); + auto& part_spheroid_group = part_group; + auto& mvel = macros.template get<"velocity">(); { auto& parts = part_spheroid_group.template get<"particles">(); auto parts_size = parts.size(); @@ -133,10 +136,8 @@ public: saw::data> start; saw::data> stop; + auto aabb = particle_aabb::calculate(part_spheroid_group,index,mvel.meta()); /// Ok, I iterate over the space which covers our particle? So lower bounds to upper bounds - for(uint64_t i{0u}; i < Desc::D; ++i){ - - } iterator::apply([&](const auto& index){ // ask for the d_k value here. diff --git a/lib/core/c++/particle/aabb.hpp b/lib/core/c++/particle/aabb.hpp index aec95ca..8579695 100644 --- a/lib/core/c++/particle/aabb.hpp +++ b/lib/core/c++/particle/aabb.hpp @@ -1,36 +1,39 @@ #pragma once -#include "particle.hpp" +#include "common.hpp" +#include "schema.hpp" namespace kel { namespace lbm { -template +template class particle_aabb final { }; -template::type radius> -class particle_aabb > > final { +template +class particle_aabb< + sch::ParticleGroup> +> final { public: - using Schema = sch::ParticleGroup>; + using Schema = sch::ParticleGroup>; - using AABB = Struct< - Member"a">, - Member"b"> + using AABB = sch::Struct< + sch::Member,"a">, + sch::Member,"b"> >; public: - static constexpr saw::data get(const saw::data& p_grp, const saw::data>& i, const saw::data>& meta){ + static constexpr saw::data calculate(const saw::data& p_grp, const saw::data>& i, const saw::data>& meta){ + + saw::data aabb; auto& parts = p_grp.template get<"particles">(); auto& pi = parts.at(i); auto& pirb = pi.template get<"rigid_body">(); auto& pirb_pos = pirb.template get<"position">(); - saw::data aabb; auto& a = aabb.template get<"a">(); auto& b = aabb.template get<"b">(); - saw::data> rad_d; - rad_d.at({}).set(radius); + const saw::data>& rad_d = p_grp.template get<"collision">().template get<"radius">().at({0u}); saw::data> lower; saw::data> upper; @@ -39,10 +42,11 @@ public: lower.at({{i}}) = pirb_pos.at({{i}}) >= rad_d.at({}) ? (pirb_pos.at({{i}}) - rad_d.at({})) : saw::data{0}; a.at({i}) = lower.at({{i}}).template cast_to(); upper.at({{i}}) = pirb_pos.at({{i}}) + rad_d.at({}); - b.at({i}) = (upper.at({{i}})+saw::data{1}).template cast_to() + b.at({i}) = (upper.at({{i}})+saw::data{1}).template cast_to(); } return aabb; + } }; } diff --git a/lib/core/c++/particle/common.hpp b/lib/core/c++/particle/common.hpp new file mode 100644 index 0000000..9e673c2 --- /dev/null +++ b/lib/core/c++/particle/common.hpp @@ -0,0 +1,3 @@ +#pragma once + +#include "../common.hpp" diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp index 1a99dcd..13ed37b 100644 --- a/lib/core/c++/particle/particle.hpp +++ b/lib/core/c++/particle/particle.hpp @@ -6,68 +6,22 @@ #include "../iterator.hpp" +#include "schema.hpp" +#include "aabb.hpp" + namespace kel { namespace lbm { -namespace coll { -struct Spheroid{}; -} -namespace sch { -using namespace saw::schema; - -namespace impl { -template -struct rotation_type_helper; - -template -struct rotation_type_helper { - using Schema = Scalar; -}; - -template -struct rotation_type_helper { - using Schema = Vector; -}; -} - -template -using ParticleRigidBody = Struct< - Member, "position">, - Member, "position_old">, - Member::Schema, "rotation">, - Member::Schema, "rotation_old">, - - Member, "acceleration">, - Member::Schema, "angular_acceleration"> ->; - -template::type radius = 1.0f> -using ParticleCollisionSpheroid = Struct< ->; template -using Particle = Struct< - Member, "rigid_body"> - // Problem is that dynamic data would two layered - // Member, "mask">, ->; - -template> -using ParticleGroup = Struct< - Member, "mask">, - Member,1u>, "mask_step">, - Member,1u>, "density">, - Member,1u>, "center_of_mass">, - Member,1u>, "total_mass">, - Member,1u>, "particles"> ->; -} - -template::type radius> -saw::data>> create_spheroid_particle_group( +saw::data>> create_spheroid_particle_group( + saw::data> radius_p, saw::data> density_p, const saw::data& mask_resolution ){ - saw::data>> part; + saw::data>> part; + + auto& rad_s = part.template get<"collision">().at({0u}).template get<"radius">(); + rad_s = radius_p; auto& mask = part.template get<"mask">(); auto& density = part.template get<"density">().at({{0u}}); @@ -83,7 +37,7 @@ saw::data>> cre for(uint64_t i = 0u; i < D; ++i){ mask_dims.at({i}) = mask_resolution; } - saw::data rad_d{radius}; + saw::data rad_d = radius_p.at({}); saw::data dia_d = rad_d * 2; mask = {mask_dims}; @@ -104,7 +58,7 @@ saw::data>> cre saw::data> center; for(uint64_t i = 0u; i < D; ++i){ - center.at({{i}}).set(radius); + center.at({{i}}) = rad_d; } iterator::apply([&](const auto& index){ diff --git a/lib/core/c++/particle/schema.hpp b/lib/core/c++/particle/schema.hpp new file mode 100644 index 0000000..18a697a --- /dev/null +++ b/lib/core/c++/particle/schema.hpp @@ -0,0 +1,67 @@ +#pragma once + +#include "common.hpp" + +namespace kel { +namespace lbm { + +namespace coll { +template +struct Spheroid { + using ValueSchema = T; + using Schema = sch::Struct< + sch::Member,"radius"> + >; +}; +} + +namespace sch { +using namespace saw::schema; + +namespace impl { +template +struct rotation_type_helper; + +template +struct rotation_type_helper { + using Schema = Scalar; +}; + +template +struct rotation_type_helper { + using Schema = Vector; +}; +} + +template +using ParticleRigidBody = Struct< + Member, "position">, + Member, "position_old">, + Member::Schema, "rotation">, + Member::Schema, "rotation_old">, + + Member, "acceleration">, + Member::Schema, "angular_acceleration"> +>; + + +template +using Particle = Struct< + Member, "rigid_body"> + // Problem is that dynamic data would two layered + // Member, "mask">, +>; + +template> +using ParticleGroup = Struct< + Member, "mask">, + Member, "collision">, + Member,1u>, "mask_step">, + Member,1u>, "density">, + Member,1u>, "center_of_mass">, + Member,1u>, "total_mass">, + Member,1u>, "particles"> +>; +} +} +} diff --git a/lib/core/c++/schema.hpp b/lib/core/c++/schema.hpp index 0c92ae6..7712f99 100644 --- a/lib/core/c++/schema.hpp +++ b/lib/core/c++/schema.hpp @@ -3,9 +3,9 @@ #include namespace kel { - namespace lbm { - namespace sch { - using namespace saw::schema; - } - } +namespace lbm { +namespace sch { +using namespace saw::schema; +} +} } -- cgit v1.2.3 From ff702d3c9427794c5557360c53b93f9861f97554 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 22 Jun 2026 17:36:51 +0200 Subject: Dangling --- lib/core/c++/hlbm.hpp | 1 + lib/core/c++/particle/aabb.hpp | 4 +++- lib/core/tests/particles.cpp | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'lib') 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::apply([&](const auto& index){ // ask for the d_k value here. // For every value im iterating over I need sth + std::cout<<"Pos: "< class particle_aabb final { + static_assert(saw::always_false::value, "Not supported"); }; template @@ -21,7 +22,8 @@ public: sch::Member,"b"> >; public: - static constexpr saw::data calculate(const saw::data& p_grp, const saw::data>& i, const saw::data>& meta){ + template + static constexpr saw::data calculate(const saw::data& p_grp, const saw::data>& i, const saw::data>& meta){ saw::data 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; + + +} } -- cgit v1.2.3 From 90f242af3036e0863a067c3f55457566d1f1e4ce Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Tue, 23 Jun 2026 14:13:48 +0200 Subject: Fixing hlbm and particle aabb --- lib/core/c++/hlbm.hpp | 2 ++ lib/core/c++/particle/aabb.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/core/c++/hlbm.hpp b/lib/core/c++/hlbm.hpp index 0ba9cc2..c15bfc4 100644 --- a/lib/core/c++/hlbm.hpp +++ b/lib/core/c++/hlbm.hpp @@ -6,6 +6,8 @@ #include "particle/particle.hpp" +#include + namespace kel { namespace lbm { namespace cmpt { diff --git a/lib/core/c++/particle/aabb.hpp b/lib/core/c++/particle/aabb.hpp index d74ea88..1773dea 100644 --- a/lib/core/c++/particle/aabb.hpp +++ b/lib/core/c++/particle/aabb.hpp @@ -7,7 +7,7 @@ namespace kel { namespace lbm { template class particle_aabb final { - static_assert(saw::always_false::value, "Not supported"); + static_assert(saw::always_false, "Not supported"); }; template -- cgit v1.2.3 From 70fda0ecf925fb5010b2e23cbdbc4e2076715958 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Wed, 24 Jun 2026 22:11:24 +0200 Subject: Adding python script for the graph generation --- lib/core/c++/hlbm.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/core/c++/hlbm.hpp b/lib/core/c++/hlbm.hpp index c15bfc4..726f2d8 100644 --- a/lib/core/c++/hlbm.hpp +++ b/lib/core/c++/hlbm.hpp @@ -129,7 +129,7 @@ public: auto& mvel = macros.template get<"velocity">(); { auto& parts = part_spheroid_group.template get<"particles">(); - auto parts_size = parts.size(); + auto parts_size = parts.meta().at({0u}); auto& pi = parts.at(index); auto& pirb = pi.template get<"rigid_body">(); -- cgit v1.2.3 From b4ef729dcb170091695397a33fc6de99b0f42ca7 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Sat, 27 Jun 2026 23:54:56 +0200 Subject: Helper component which resets the field porosity --- lib/core/c++/particle/particle_opa.hpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 lib/core/c++/particle/particle_opa.hpp (limited to 'lib') diff --git a/lib/core/c++/particle/particle_opa.hpp b/lib/core/c++/particle/particle_opa.hpp new file mode 100644 index 0000000..470c4e9 --- /dev/null +++ b/lib/core/c++/particle/particle_opa.hpp @@ -0,0 +1,30 @@ +#pragma once + +#include "component.hpp" + +namespace kel { +namespace lbm { +namespace cmpt { +struct OneParticleAt {}; +} + +template + +class component final { +private: +public: + component() = default; + + template + void apply(const saw::data& macros, const saw::data> index, saw::data time_step) const { + using dfi = df_info; + + auto& porous_f = macros.template get<"porosity">(); + + auto& porous = porous_f.at(index); + + + } +}; +} +} -- cgit v1.2.3 From 7a7d681ce70133ef0bc47a701f5b8448b15b3a29 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Sun, 28 Jun 2026 19:17:52 +0200 Subject: Dangling --- lib/core/c++/particle/particle.hpp | 1 + lib/core/c++/particle/particle_opa.hpp | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp index 13ed37b..8e75e5a 100644 --- a/lib/core/c++/particle/particle.hpp +++ b/lib/core/c++/particle/particle.hpp @@ -8,6 +8,7 @@ #include "schema.hpp" #include "aabb.hpp" +#include "particle_opa.hpp" namespace kel { namespace lbm { diff --git a/lib/core/c++/particle/particle_opa.hpp b/lib/core/c++/particle/particle_opa.hpp index 470c4e9..4588a55 100644 --- a/lib/core/c++/particle/particle_opa.hpp +++ b/lib/core/c++/particle/particle_opa.hpp @@ -1,6 +1,7 @@ #pragma once -#include "component.hpp" +#include "common.hpp" +#include "../component.hpp" namespace kel { namespace lbm { @@ -12,8 +13,19 @@ template class component final { private: + saw::data> pos_; + saw::data> rad_; + saw::data> eps_; public: - component() = default; + component( + const saw::data> pos__, + const saw::data> rad__, + const saw::data> eps__ + ): + pos_{pos__}, + rad_{rad__}, + eps_{eps__} + {} template void apply(const saw::data& macros, const saw::data> index, saw::data time_step) const { @@ -24,6 +36,10 @@ public: auto& porous = porous_f.at(index); + auto pos_ind = saw::math::vectorize_data(index); + + auto diff = pos_ind - pos_; + auto diff_dot = saw::math::dot(diff,diff); } }; } -- cgit v1.2.3 From 283ff837896c805bddf4962caaa54c26aa8bab1f Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Sun, 28 Jun 2026 19:35:07 +0200 Subject: Doing porosity work --- lib/core/c++/particle/porosity.hpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/core/c++/particle/porosity.hpp b/lib/core/c++/particle/porosity.hpp index 39d9652..f555cae 100644 --- a/lib/core/c++/particle/porosity.hpp +++ b/lib/core/c++/particle/porosity.hpp @@ -28,10 +28,17 @@ public: }; + template::type radius, typename saw::native_data_type::type eps> class particle_porosity> final { public: - saw::data> calculate(const saw::data > >& part_group, uint64_t i, const saw::data>& lbm_pos){ + saw::data> calculate(const saw::data>& lbm_pos, saw::data> rad) const { + saw::data> pos; + + + } + + saw::data> calculate(const saw::data > >& part_group, uint64_t i, const saw::data>& lbm_pos) const { saw::data> por; por.at({}); -- cgit v1.2.3