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 --- .../moving_poiseulle_particles_2d_psm_gpu/sim.cpp | 62 +++++++++++++++------- 1 file changed, 44 insertions(+), 18 deletions(-) (limited to 'examples/moving_poiseulle_particles_2d_psm_gpu') diff --git a/examples/moving_poiseulle_particles_2d_psm_gpu/sim.cpp b/examples/moving_poiseulle_particles_2d_psm_gpu/sim.cpp index a27c402..0bfefba 100644 --- a/examples/moving_poiseulle_particles_2d_psm_gpu/sim.cpp +++ b/examples/moving_poiseulle_particles_2d_psm_gpu/sim.cpp @@ -17,6 +17,14 @@ constexpr uint64_t particle_amount = 1ul; namespace sch { +using LbmArgs = Args< + Struct< + Member, + Member + >, + Tuple<> +>; + using InfoChunk = Chunk; template @@ -45,7 +53,7 @@ using RhoChunk = Chunk, 0u, dim_x, dim_y>; template using MacroStruct = Struct< - Member, "momentum">, + Member, "velocity">, Member, "density">, Member, "porosity">, Member, "force"> @@ -109,7 +117,7 @@ kel::lbm::error_or init( auto& dfs_old_f = fields.template get<"dfs_old">(); auto& dfs_f = fields.template get<"dfs">(); 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">(); auto& force_f = macros.template get<"force">(); @@ -136,7 +144,7 @@ kel::lbm::error_or init( dfs_f.get_dims() ); - kel::lbm::data> rad; + kel::lbm::data>> rad; rad.at({}) = dim_y * 0.1f; kel::lbm::data> dense; dense.at({}) = 1.0f; @@ -150,7 +158,12 @@ kel::lbm::error_or init( kel::lbm::data> zero; zero.at({{0u}}) = 0.0f; zero.at({{1u}}) = 0.0f; - rb.template get<"acceleration">() = zero; + // Acceleration is unit typed, so its zero has to be too. + kel::lbm::data>> zero_acc; + for(uint64_t i{0u}; i < Desc::D; ++i){ + zero_acc.at({{i}}).set(0); + } + rb.template get<"acceleration">() = zero_acc; rb.template get<"rotation">() = {}; rb.template get<"rotation_old">() = {}; rb.template get<"angular_acceleration">() = {}; @@ -165,11 +178,11 @@ kel::lbm::error_or step( kel::lbm::data>,encode::Sycl>& macros, kel::lbm::data>,encode::Sycl>& particles, kel::lbm::data t_i, + kel::lbm::data sub_steps, device& dev ){ auto& q = dev.get_handle(); auto& info_f = fields.template get<"info">(); - auto& porous_f = macros.template get<"porosity">(); q.submit([&](acpp::sycl::handler& h){ component> psm_reset; @@ -204,9 +217,9 @@ kel::lbm::error_or step( } p_reset.apply(particles,index,t_i); - p_gather.apply(fields,macros,particles,index,t_i,{16u}); - p_contact.apply(particles,index,t_i,{16u}); - p_integrate.apply(particles,index,t_i,{16u}); + p_gather.apply(fields,macros,particles,index,t_i,sub_steps); + p_contact.apply(particles,index,t_i,sub_steps); + p_integrate.apply(particles,index,t_i,sub_steps); }); }).wait(); @@ -267,15 +280,28 @@ template kel::lbm::error_or lbm_main(int argc, char** argv){ using namespace kel::lbm; - using dfi = df_info; - - auto eo_lbm_dir = output_directory(); - if(eo_lbm_dir.is_error()){ - return std::move(eo_lbm_dir.get_error()); + kel::lbm::data args; + { + auto& args_n = args.template get<"args">(); + auto& name = args_n.template get<"name">(); + name.set("moving_poiseulle_particles_2d_psm_gpu"); + auto& sub_steps_arg = args_n.template get<"sub_steps">(); + sub_steps_arg.set(16u); + } + { + auto eov = kel::lbm::parse_args(args,argc,argv); + if(eov.is_error()){ + return eov; + } + } + kel::lbm::data sub_steps = args.template get<"args">().template get<"sub_steps">(); + auto eo_lbm_env = init_lbm_env(args); + if(eo_lbm_env.is_error()){ + return std::move(eo_lbm_env.get_error()); } - auto& lbm_dir = eo_lbm_dir.get_value(); + const auto& lbm_env = eo_lbm_env.get_value(); - auto out_dir = lbm_dir / "moving_poiseulle_particles_2d_psm_gpu"; + auto& out_dir = lbm_env.name_dir; { std::error_code ec; @@ -287,9 +313,9 @@ kel::lbm::error_or lbm_main(int argc, char** argv){ converter conv { // delta_x - {{1.0}}, + {1.0}, // delta_t - {{1.0}} + {1.0} }; print_lbm_meta(conv,{0.1},{1e-4},{0.4 * dim_y}); @@ -371,7 +397,7 @@ kel::lbm::error_or lbm_main(int argc, char** argv){ for(kel::lbm::data i{0u}; i < time_steps and krun; ++i){ // BC + Collision { - auto eov = step(lsd_view,lsdm_view,lsdp_view,i,dev); + auto eov = step(lsd_view,lsdm_view,lsdp_view,i,sub_steps,dev); if(eov.is_error()){ return eov; } -- cgit v1.3.1