From 0c0087ef9482634273ec1a23d3a915754f94926d Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Wed, 11 Nov 2026 01:16:44 +0100 Subject: Snapshot. Migration to Lbm Unit --- examples/dkt/common.hpp | 2 +- examples/dkt/init.hpp | 10 +++++----- examples/dkt/sim.cpp | 4 ++-- examples/dkt/step.hpp | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/dkt') diff --git a/examples/dkt/common.hpp b/examples/dkt/common.hpp index 6c1dc44..abef548 100644 --- a/examples/dkt/common.hpp +++ b/examples/dkt/common.hpp @@ -56,7 +56,7 @@ using RhoChunk = Chunk, 0u, dim_x, dim_y>; template using MacroStruct = Struct< - Member, "momentum">, + Member, "velocity">, Member, "density">, Member, "porosity">, Member, "force"> diff --git a/examples/dkt/init.hpp b/examples/dkt/init.hpp index c52078c..4a55dbc 100644 --- a/examples/dkt/init.hpp +++ b/examples/dkt/init.hpp @@ -57,7 +57,7 @@ kel::lbm::error_or init( // auto& df_f = fields.template get<"dfs_old">(); auto& rho_f = macros.template get<"density">(); - auto& vel_f = macros.template get<"momentum">(); + auto& vel_f = macros.template get<"velocity">(); auto& por_f = macros.template get<"porosity">(); iterator::apply( @@ -94,8 +94,8 @@ kel::lbm::error_or init( ); { - kel::lbm::data> radius_p; - radius_p.at({}).set(conv.meter_si_to_lbm({{0.05}}).handle().get()); + kel::lbm::data>> radius_p; + radius_p.at({}).set(conv.meter_si_to_lbm({0.05}).handle().get()); std::cout<<"RADIUS: "<> dense_p; dense_p.at({}).set(1); @@ -107,8 +107,8 @@ kel::lbm::error_or init( auto& prb = p.template get<"rigid_body">(); auto& p_pos = prb.template get<"position">(); auto& p_posold = prb.template get<"position_old">(); - p_pos.at({{0u}}) = conv.meter_si_to_lbm({{0.16}}).handle(); - p_pos.at({{1u}}) = conv.meter_si_to_lbm({{0.2}}).handle(); + p_pos.at({{0u}}) = conv.meter_si_to_lbm({0.16}).handle(); + p_pos.at({{1u}}) = conv.meter_si_to_lbm({0.2}).handle(); p_posold = p_pos; } diff --git a/examples/dkt/sim.cpp b/examples/dkt/sim.cpp index 44fd145..c230aae 100644 --- a/examples/dkt/sim.cpp +++ b/examples/dkt/sim.cpp @@ -45,9 +45,9 @@ kel::lbm::error_or lbm_main(const kel::lbm::data& args){ converter conv { // delta_x - {{0.41 / dim_y}}, + {0.41 / dim_y}, // delta_t - {{1.067e-4}} + {1.067e-4} }; print_lbm_meta(conv,{1e-3},{1e-4},{0.5 * dim_y}); diff --git a/examples/dkt/step.hpp b/examples/dkt/step.hpp index 879def8..fa15609 100644 --- a/examples/dkt/step.hpp +++ b/examples/dkt/step.hpp @@ -76,7 +76,7 @@ kel::lbm::error_or step( kel::lbm::data> vel; { auto y_si = conv.meter_lbm_to_si(index.at({{1u}}).template cast_to()).handle(); - vel.at({{0u}}) = conv.velocity_si_to_lbm({{static_cast::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}}).handle(); + vel.at({{0u}}) = conv.velocity_si_to_lbm({static_cast::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}).handle(); vel.at({{1u}}) = 0.0f; } return vel; @@ -152,7 +152,7 @@ kel::lbm::error_or step( kel::lbm::data> vel; { auto y_si = conv.meter_lbm_to_si(index.at({{1u}}).template cast_to()).handle(); - vel.at({{0u}}) = conv.velocity_si_to_lbm({{static_cast::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}}).handle(); + vel.at({{0u}}) = conv.velocity_si_to_lbm({static_cast::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}).handle(); vel.at({{1u}}) = 0.0f; } return vel; @@ -228,7 +228,7 @@ kel::lbm::error_or step( kel::lbm::data> vel; { auto y_si = conv.meter_lbm_to_si(index.at({{1u}}).template cast_to()).handle(); - vel.at({{0u}}) = conv.velocity_si_to_lbm({{static_cast::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}}).handle(); + vel.at({{0u}}) = conv.velocity_si_to_lbm({static_cast::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}).handle(); vel.at({{1u}}) = 0.0f; } return vel; -- cgit v1.3.1