From 2b153a0e0263e5a76550b15382e2609f7b5a5d41 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 24 Aug 2026 17:15:52 +0200 Subject: Stuff --- modules/core/c++/abstract/schema.hpp | 6 -- modules/core/c++/abstract/stringify_schema.hpp | 20 ++--- modules/core/c++/fplbm.hpp | 105 +------------------------ modules/core/tests/schema.cpp | 2 + 4 files changed, 14 insertions(+), 119 deletions(-) (limited to 'modules') diff --git a/modules/core/c++/abstract/schema.hpp b/modules/core/c++/abstract/schema.hpp index 8bc23b4..89d9c2e 100644 --- a/modules/core/c++/abstract/schema.hpp +++ b/modules/core/c++/abstract/schema.hpp @@ -42,12 +42,6 @@ using Float16 = Primitive; using Float32 = Primitive; using Float64 = Primitive; -template -struct MixedPrecision { - using Meta = Void; - using Inner = Sch; -}; - template struct FixedArray { using Meta = Void; diff --git a/modules/core/c++/abstract/stringify_schema.hpp b/modules/core/c++/abstract/stringify_schema.hpp index 3d6b1d1..dd218d0 100644 --- a/modules/core/c++/abstract/stringify_schema.hpp +++ b/modules/core/c++/abstract/stringify_schema.hpp @@ -10,36 +10,36 @@ template struct schema_to_string_helper { static_assert(always_false, "schema_to_string_helper specialization not handled."); - static constexpr string_literal apply(){ - return {}; + static constexpr auto apply(){ + return string_literal{""}; } }; template<> struct schema_to_string_helper final { - static constexpr string_literal apply(){ - return "SignedInteger"; + static constexpr auto apply(){ + return string_literal{"SignedInteger"}; } }; template<> struct schema_to_string_helper final { - static constexpr string_literal apply(){ - return "UnsignedInteger"; + static constexpr auto apply(){ + return string_literal{"UnsignedInteger"}; } }; template<> struct schema_to_string_helper final { - static constexpr string_literal apply(){ - return "FloatingPoint"; + static constexpr auto apply(){ + return string_literal{"FloatingPoint"}; } }; template struct schema_to_string_helper> final { - static constexpr string_literal apply(){ - return "Primitive<"+schema_to_string_helper::apply()+","+N+">"; + static constexpr auto apply(){ + return string_literal{"Primitive<"}+schema_to_string_helper::apply()+string_literal{","}+N+string_literal{">"}; } }; } diff --git a/modules/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp index 382d067..c9ed6e9 100644 --- a/modules/core/c++/fplbm.hpp +++ b/modules/core/c++/fplbm.hpp @@ -204,119 +204,18 @@ public: // vel_s is technically time the density of the particle? - force = ( vel_s * rho - vel * rho ) /* two */ * flip_por; + force = ( vel_s * rho - vel * rho ) * two * flip_por; force_p = force_p - force; }, aabb.template get<"a">(), aabb.template get<"b">()); auto& pirb_acc = pirb.template get<"acceleration">(); - pirb_acc = force_p / pg.template get<"total_mass">().at({}); + pirb_acc = force_p / (two * pg.template get<"total_mass">().at({})); for(saw::data i{0u}; i < sub_steps; ++i){ verlet_step_lambda(pi,sss); } } }; - -template -class component final { -private: - saw::data relaxation_; - saw::data frequency_; -public: - component(typename saw::native_data_type::type relaxation__): - relaxation_{{relaxation__}}, - frequency_{saw::data{1} / relaxation_} - {} - - component(const saw::data& relaxation__): - relaxation_{relaxation__}, - frequency_{saw::data{1} / relaxation_} - {} - - using Component = cmpt::FpLbmOneParticleNoVelocity; - - template - void apply(const saw::data& field, const saw::data& macros, saw::data> index, saw::data time_step) const { - // void apply(saw::data& field, saw::data> index, saw::data time_step){ - bool is_even = ((time_step.get() % 2) == 0); - - auto& dfs_old_f = (is_even) ? field.template get<"dfs_old">() : field.template get<"dfs">(); - auto& dfs = dfs_old_f.at(index); - - auto& rho_f = macros.template get<"density">(); - auto& vel_f = macros.template get<"momentum">(); - auto& por_f = macros.template get<"porosity">(); - - // Temporary find a better way - auto& force_f = macros.template get<"force">(); - - - /** - * The other methods all work with a flipped porosity. - * For compat reasons this is also flipped - */ - auto porosity = por_f.at(index); - saw::data> one; - one.at({}) = 1.0; - auto flip_porosity = one - porosity; - - saw::data>& rho = rho_f.at(index); - - saw::data> half; - half.at({}).set(0.5); - saw::data>& vel = vel_f.at(index);// + total_force * ( half / rho ); - - compute_rho_u(dfs_old_f.at(index),rho,vel); - auto eq = equilibrium(rho,vel); - - using dfi = df_info; - - saw::data> min_two; - min_two.at({}).set(-2); - - auto& force = force_f.at(index); - force = vel * rho * min_two * flip_porosity; - - saw::data> dfi_inv_cs2; - dfi_inv_cs2.at({}).set(dfi::inv_cs2); - - for(uint64_t i = 0u; i < Descriptor::Q; ++i){ - // saw::data ci_min_u{0}; - saw::data> ci; - for(uint64_t d = 0u; d < Descriptor::D; ++d){ - ci.at({{d}}).set(static_cast::type>(dfi::directions[i][d])); - } - auto ci_dot_u = saw::math::dot(ci,vel); - - // saw::data> F_i; - // F_i = f * ((c_i - u) * ics2 + * c_i * ics2 * ics2) * w_i; - saw::data> w; - w.at({}).set(dfi::weights[i]); - - /* - saw::data> F_i_sum; - for(uint64_t d = 0u; d < Descriptor::D; ++d){ - saw::data> F_i_d; - F_i_d.at({}) = F_i.at({{d}}); - F_i_sum = F_i_sum + F_i_d; - } - */ - auto term1 = (ci-vel) * dfi_inv_cs2; - auto term2 = ci * (ci_dot_u * dfi_inv_cs2 * dfi_inv_cs2); - - auto force_projection = saw::math::dot(term1 + term2, force); - - auto F_i = w * force_projection; - - dfs.at({i}) = dfs.at({i}) - + frequency_ - * (eq.at(i) - dfs.at({i}) ) - + F_i.at({}) - * (saw::data{1} - saw::data{0.5f} * frequency_); - } - } - -}; } } diff --git a/modules/core/tests/schema.cpp b/modules/core/tests/schema.cpp index db82b97..6649bad 100644 --- a/modules/core/tests/schema.cpp +++ b/modules/core/tests/schema.cpp @@ -18,6 +18,7 @@ SAW_TEST("Abstract/Schema/Ptr"){ } */ +/* SAW_TEST("Abstract/SchemaStringify/PrimitiveKind"){ using namespace kel::lbm; @@ -25,4 +26,5 @@ SAW_TEST("Abstract/SchemaStringify/PrimitiveKind"){ static constexpr auto str = schema_to_string::value; } +*/ } -- cgit v1.2.3 From f5d88c1ae8948724f11d30c1c2af385cc093eed2 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 24 Aug 2026 19:02:51 +0200 Subject: Fixing FpLBM, because I messed up guo forcing --- modules/core/c++/fplbm.hpp | 2 +- modules/core/c++/macroscopic.hpp | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp index c9ed6e9..d8c075b 100644 --- a/modules/core/c++/fplbm.hpp +++ b/modules/core/c++/fplbm.hpp @@ -92,7 +92,7 @@ public: auto& force_f = macros.template get<"force">(); auto& force = force_f.at(index); - vel = vel + force * half; + vel = vel + force * half / rho; // compute_rho_u(dfs,rho,vel); auto eq = equilibrium(rho,vel); diff --git a/modules/core/c++/macroscopic.hpp b/modules/core/c++/macroscopic.hpp index 768fef0..9db1538 100644 --- a/modules/core/c++/macroscopic.hpp +++ b/modules/core/c++/macroscopic.hpp @@ -33,5 +33,30 @@ void compute_rho_u ( vel().at({{i}}) = vel().at({{i}}) / rho().at({}); } } + +/** + * Calculate the macroscopic variables rho and u in Lattice Units. + */ +template +void compute_rho_momentum ( + const saw::data>& dfs, + saw::ref>> rho, + saw::ref>> mom + ) +{ + using dfi = df_info; + + rho().at({}).set(0); + for(uint64_t i = 0; i < Desc::D; ++i){ + mom().at({{i}}).set(0); + } + + for(size_t j = 0; j < Desc::Q; ++j){ + rho().at({}) = rho().at({}) + dfs.at({j}); + for(size_t i = 0; i < Desc::D; ++i){ + mom().at({{i}}) = mom().at({{i}}) + saw::data{static_cast::type>(dfi::directions[j][i])} * dfs.at({j}); + } + } +} } } -- cgit v1.2.3