From 484fc61e2472c2a3752168221bd85510e9b7c53f Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Tue, 21 Jul 2026 23:42:52 +0200 Subject: Dangling --- .../moving_poiseulle_particles_2d_hlbm_gpu/sim.cpp | 9 ++++- modules/core/c++/hlbm.hpp | 36 ++++++++++++------ modules/core/c++/particle/particle.hpp | 43 ++-------------------- modules/core/tests/particles.cpp | 2 +- 4 files changed, 37 insertions(+), 53 deletions(-) diff --git a/examples/moving_poiseulle_particles_2d_hlbm_gpu/sim.cpp b/examples/moving_poiseulle_particles_2d_hlbm_gpu/sim.cpp index a41d2b7..b2061f9 100644 --- a/examples/moving_poiseulle_particles_2d_hlbm_gpu/sim.cpp +++ b/examples/moving_poiseulle_particles_2d_hlbm_gpu/sim.cpp @@ -155,7 +155,14 @@ saw::error_or setup_initial_conditions( auto& rbp = rb.template get<"position">(); rbp.at({{0u}}) = 0.25 * dim_x; rbp.at({{1u}}) = 0.5 * dim_y; - auto& rbp_old = rbp; + rb.template get<"position_old">() = rbp; + saw::data> zero; + zero.at({{0u}}) = 0.0f; + zero.at({{1u}}) = 0.0f; + rb.template get<"acceleration">() = zero; + rb.template get<"rotation">() = {}; + rb.template get<"rotation_old">() = {}; + rb.template get<"angular_acceleration">() = {}; } return saw::make_void(); diff --git a/modules/core/c++/hlbm.hpp b/modules/core/c++/hlbm.hpp index 6fce4ca..799d2b5 100644 --- a/modules/core/c++/hlbm.hpp +++ b/modules/core/c++/hlbm.hpp @@ -79,6 +79,7 @@ public: auto& N = particle_N_f.at(index); auto& D = particle_D_f.at(index); + // Convex combination of velocities vel = vel * porosity + [&]() -> saw::data> { return (D.at({}).get() > 0.0 ? N * flip_porosity / D : N); @@ -113,13 +114,20 @@ public: using dfi = df_info; bool is_even = ((time_step.get() % 2) == 0); + saw::data> one; + one.at({}) = 1.0; + auto& dfs_old_f = (is_even) ? field.template get<"dfs_old">() : field.template get<"dfs">(); auto& part_spheroid_group = part_group; - auto& mvel = macros.template get<"velocity">(); + auto& mvel_f = macros.template get<"velocity">(); auto& mpor_f = macros.template get<"porosity">(); + + auto& particle_N_f = field.template get<"particle_N">(); + auto& particle_D_f = field.template get<"particle_D">(); + { - auto& parts = part_spheroid_group.template get<"particles">(); + auto parts = part_spheroid_group.template get<"particles">(); auto parts_size = parts.meta().at({0u}); auto& p_coll = part_spheroid_group.template get<"collision">().at({}); @@ -132,7 +140,7 @@ public: saw::data> start; saw::data> stop; - auto eo_aabb = particle_aabb::calculate(part_spheroid_group,{{0u}},mvel.meta()); + auto eo_aabb = particle_aabb::calculate(part_spheroid_group,{{0u}},mvel_f.meta()); if(eo_aabb.is_error()){ return; } @@ -143,21 +151,22 @@ public: stop = aabb.template get<"b">(); saw::data> force_p; - - iterator::apply([&](const auto& index){ + + iterator::apply([&](const auto& index_f){ // ask for the d_k value here. // For every value im iterating over I need sth // std::cout<<"Pos: "<> momentum; + for(uint64_t i = 0u; i < Desc::Q; ++i){ saw::data> e_i; saw::data> n_ind_i; for(uint64_t k{0u}; k < Desc::D; ++k){ e_i.at({{k}}) = (dfi::directions[i])[k]; - n_ind_i.at({k}) = (dfi::directions[i])[k]; + n_ind_i.at({k}) = index_f.at({k}) + (dfi::directions[i])[k]; } uint64_t i_opp = dfi::opposite_index[i]; @@ -170,21 +179,26 @@ public: momentum = momentum + ei_dfs; } - auto& mpor = mpor_f.at(index); - auto rel_dist = saw::math::vectorize_data(index).template cast_to() - pirb_pos; + auto& mpor = mpor_f.at(index_f); + auto rel_dist = saw::math::vectorize_data(index_f).template cast_to() - pirb_pos; saw::data> eps; eps.at({}) = 1.5f; mpor = particle_porosity>::calculate(rel_dist,p_rad,eps); force_p = force_p + momentum * mpor; + auto& N = particle_N_f.at(index_f); + auto& D = particle_D_f.at(index_f); + auto flip_porosity = one - mpor; + D = D + flip_porosity; + N = N + mvel_f.at(index_f) * flip_porosity; },start,stop); - + auto& pirb_acc = pirb.template get<"acceleration">(); pirb_acc = force_p; saw::data> ts; ts.at({}) = 1u; - verlet_step_lambda>(part_spheroid_group,{{{0u}}},ts); + verlet_step_lambda(pi,ts); // Check } diff --git a/modules/core/c++/particle/particle.hpp b/modules/core/c++/particle/particle.hpp index 29b08e6..f759c8d 100644 --- a/modules/core/c++/particle/particle.hpp +++ b/modules/core/c++/particle/particle.hpp @@ -137,7 +137,7 @@ saw::data>> create_spheroid */ template -constexpr auto verlet_step_lambda_old = [](saw::data>& particle, saw::data> time_step_delta){ +constexpr auto verlet_step_lambda = [](saw::data>& particle, saw::data> time_step_delta){ auto& body = particle.template get<"rigid_body">(); auto& pos = body.template get<"position">(); @@ -158,51 +158,14 @@ constexpr auto verlet_step_lambda_old = [](saw::data>& partic two.at({}).set(2.0); pos_new = pos * two - pos_old + pos_acc * tsd_squared; - // Angular - saw::data::Schema> rot_new; - rot_new = rot * two - rot_old + rot_acc * tsd_squared; - - // Swap - Could be std::swap? + // Swap - Could be std::swap? No, this is device code pos_old = pos; pos = pos_new; - rot_old = rot; - rot = rot_new; -}; - -template -constexpr auto verlet_step_lambda = [](saw::data>& pgrp, saw::data> index, saw::data> time_step_delta){ - auto& parts = pgrp.template get<"particles">(); - auto& particle = parts.at(index); - - auto& body = particle.template get<"rigid_body">(); - - auto& pos = body.template get<"position">(); - auto& pos_old = body.template get<"position_old">(); - - auto& pos_acc = body.template get<"acceleration">(); - - auto& rot = body.template get<"rotation">(); - auto& rot_old = body.template get<"rotation_old">(); - - auto& rot_acc = body.template get<"angular_acceleration">(); - - auto tsd_squared = time_step_delta * time_step_delta; - - saw::data> pos_new; - // Actual step - saw::data> two; - two.at({}).set(2.0); - pos_new = pos * two - pos_old + pos_acc * tsd_squared; - // Angular saw::data::Schema> rot_new; rot_new = rot * two - rot_old + rot_acc * tsd_squared; - - // Swap - Could be std::swap? - pos_old = pos; - pos = pos_new; - + rot_old = rot; rot = rot_new; }; diff --git a/modules/core/tests/particles.cpp b/modules/core/tests/particles.cpp index 592c367..e060097 100644 --- a/modules/core/tests/particles.cpp +++ b/modules/core/tests/particles.cpp @@ -24,7 +24,7 @@ SAW_TEST("Verlet step 2D - Planar"){ saw::data> dt; dt.at({}).set(0.5); - lbm::verlet_step_lambda_old(particle,dt); + lbm::verlet_step_lambda(particle,dt); SAW_EXPECT(pos.at({{0}}).get() == 0.25, std::string{"Incorrect Pos X: "} + std::to_string(pos.at({{0}}).get())); SAW_EXPECT(pos.at({{1}}).get() == 0.0, std::string{"Incorrect Pos Y: "} + std::to_string(pos.at({{1}}).get())); -- cgit v1.2.3 From 25a1c2485c5187c61a8efc9f5b62d4d942124d47 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Tue, 21 Jul 2026 23:43:20 +0200 Subject: Dangling --- modules/core/c++/descriptor/common.hpp | 9 +++++++ modules/core/c++/descriptor/d1q3.hpp | 9 +++++++ modules/core/tests/schema.cpp | 19 ++++++++++++++ poc/triangle_stream/common.hpp | 46 +++++++++++++++++++++++++++++++++ poc/triangle_stream/init.hpp | 13 ++++++++++ poc/triangle_stream/sim.cpp | 47 +--------------------------------- poc/triangle_stream/step.hpp | 8 ++++++ 7 files changed, 105 insertions(+), 46 deletions(-) create mode 100644 modules/core/c++/descriptor/common.hpp create mode 100644 modules/core/c++/descriptor/d1q3.hpp create mode 100644 modules/core/tests/schema.cpp create mode 100644 poc/triangle_stream/common.hpp create mode 100644 poc/triangle_stream/init.hpp create mode 100644 poc/triangle_stream/step.hpp diff --git a/modules/core/c++/descriptor/common.hpp b/modules/core/c++/descriptor/common.hpp new file mode 100644 index 0000000..f821510 --- /dev/null +++ b/modules/core/c++/descriptor/common.hpp @@ -0,0 +1,9 @@ +#pragma once + +#include "../common.hpp" + +namespace kel { +namespace lbm { + +} +} diff --git a/modules/core/c++/descriptor/d1q3.hpp b/modules/core/c++/descriptor/d1q3.hpp new file mode 100644 index 0000000..7fc8591 --- /dev/null +++ b/modules/core/c++/descriptor/d1q3.hpp @@ -0,0 +1,9 @@ +#pragma once + +#include "common.hpp" + +namespace kel { +namespace lbm { + +} +} diff --git a/modules/core/tests/schema.cpp b/modules/core/tests/schema.cpp new file mode 100644 index 0000000..b705af0 --- /dev/null +++ b/modules/core/tests/schema.cpp @@ -0,0 +1,19 @@ +#include + +#include "../c++/abstract/schema.hpp" + +namespace { +namespace ts { +using namespace kel::lbm::sch; + +using TPtr = Ptr; +using TVal = UInt16; +} + +SAW_TEST("Abstract/Schema/Ptr"){ + using namespace kel::lbm; + + // static_assert(std::is_same_v::Schema, ts::TVal>, "schema decay failed"); +} + +} diff --git a/poc/triangle_stream/common.hpp b/poc/triangle_stream/common.hpp new file mode 100644 index 0000000..927f8f8 --- /dev/null +++ b/poc/triangle_stream/common.hpp @@ -0,0 +1,46 @@ +#pragma once + +#include + +namespace kel { +namespace lbm { + +constexpr uint64_t dim_y = 256ul; +constexpr uint64_t dim_x = dim_y * 20ul; + +namespace sch { +using namespace saw::schema; + +using InfoChunk = Chunk; + +template +using DfChunk = Chunk, 1u, dim_x, dim_y>; + +template +using ScalarChunk = Chunk, 0u, dim_x, dim_y>; + +template +using VectorChunk = Chunk, 0u, dim_x, dim_y>; + +template +using ChunkStruct = Struct< + Member, + Member, "dfs">, + Member, "dfs_old"> +>; + +template +using VelChunk = Chunk, 0u, dim_x, dim_y>; + +template +using RhoChunk = Chunk, 0u, dim_x, dim_y>; + +template +using MacroStruct = Struct< + Member, "velocity">, + Member, "density"> +>; +} + +} +} diff --git a/poc/triangle_stream/init.hpp b/poc/triangle_stream/init.hpp new file mode 100644 index 0000000..532f08c --- /dev/null +++ b/poc/triangle_stream/init.hpp @@ -0,0 +1,13 @@ +#pragma once + +#include "common.hpp" + +namespace kel { +namespace lbm { + +template +void init(){ +} + +} +} diff --git a/poc/triangle_stream/sim.cpp b/poc/triangle_stream/sim.cpp index 36986e4..b2121ee 100644 --- a/poc/triangle_stream/sim.cpp +++ b/poc/triangle_stream/sim.cpp @@ -1,53 +1,8 @@ -#include +#include "common.hpp" namespace kel { namespace lbm { -constexpr uint64_t dim_y = 256ul; -constexpr uint64_t dim_x = dim_y * 20ul; - -namespace sch { -using namespace saw::schema; - -using InfoChunk = Chunk; - -template -using DfChunk = Chunk, 1u, dim_x, dim_y>; - -template -using ScalarChunk = Chunk, 0u, dim_x, dim_y>; - -template -using VectorChunk = Chunk, 0u, dim_x, dim_y>; - -template -using ChunkStruct = Struct< - Member, - Member, "dfs">, - Member, "dfs_old"> ->; - -template -using VelChunk = Chunk, 0u, dim_x, dim_y>; - -template -using RhoChunk = Chunk, 0u, dim_x, dim_y>; - -template -using MacroStruct = Struct< - Member, "velocity">, - Member, "density"> ->; - -//template -//using ParticleArray = Array< -// Particle -//>; -} - -template -void init(){ -} template saw::error_or kmain(int argc, char** argv){ diff --git a/poc/triangle_stream/step.hpp b/poc/triangle_stream/step.hpp new file mode 100644 index 0000000..e10c4db --- /dev/null +++ b/poc/triangle_stream/step.hpp @@ -0,0 +1,8 @@ +#pragma once + +#include "schema.hpp" + +namespace kel { +namespace lbm { +} +} -- cgit v1.2.3