From 73b41bd4eed2be2e92b99d0cb2e3b116b529df74 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Wed, 25 Feb 2026 23:10:13 +0100 Subject: Adding meta calculation. --- examples/meta/meta.cpp | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/meta/meta.cpp b/examples/meta/meta.cpp index 5d3aaa4..c638021 100644 --- a/examples/meta/meta.cpp +++ b/examples/meta/meta.cpp @@ -1,7 +1,11 @@ #include +#include + #include +namespace kel { +namespace lbm { namespace sch { using namespace saw::schema; @@ -17,9 +21,24 @@ using MetaArgs = Args< MetaArgsStruct, Tuple >; + +using Prec = Float64; +} +} +} + +template +saw::error_or meta_lbm_info(const saw::data& args_str){ + using namespace kel::lbm; + converter conv{ + {args_str.template get<"dx">()}, + {args_str.template get<"dt">()} + }; + print_lbm_meta(conv, {args_str.template get<"kin_vis">()},{args_str.template get<"char_vel">()},{args_str.template get<"char_len">()}); + + return saw::make_void(); } -template< saw::error_or meta_main(int argc, char** argv){ using namespace kel::lbm; @@ -29,35 +48,36 @@ saw::error_or meta_main(int argc, char** argv){ cfg_file_name = argv[1]; } - saw::data args_dat; + saw::data args_dat; { - saw::data args_enc{argc,argv}; - saw::codec args_codec; + saw::data args_enc{argc,argv}; + saw::codec args_codec; auto eov = args_codec.decode(args_enc,args_dat); if(eov.is_error()){ return eov; + } } auto& args_str = args_dat.template get<"args">(); auto& args_pos = args_dat.template get<"positionals">(); - converter conv{ - {args_str.template get<"delta_x">()}, - {args_str.template get<"delta_t">()} - }; switch(args_pos.get<0u>().get()){ case 1u: { + assert(false); + return saw::make_error(); } break; case 2u: { switch(args_pos.get<1u>().get()){ case 5u: + meta_lbm_info>(args_str); break; case 9u: + meta_lbm_info>(args_str); break; default: return saw::make_error("Second positional needs to be a valid velocity set"); @@ -66,13 +86,18 @@ saw::error_or meta_main(int argc, char** argv){ break; case 3u: { - + switch(args_pos.get<1u>().get()){ + case 27u: + meta_lbm_info>(args_str); + break; + default: + return saw::make_error("Second positional needs to be a valid velocity set"); + } } break; default: return saw::make_error("First positional needs to be Dimension 1,2 or 3"); } - print_lbm_meta>(conv, {args_str.template get<"kinematic_viscosity">()},{args_str.template get<"char_vel">()},{args_str.template get<"char_len">()}); return saw::make_void(); } -- cgit v1.2.3 From d8321ed7a23f7554cd0144c4f5e8dc625bbee4fe Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 26 Feb 2026 14:35:57 +0100 Subject: Clean repo for run and make benchmarkable hlbm case --- examples/meta/meta.cpp | 20 ++++++++++++++++++-- examples/poiseulle_particles_2d_gpu/sim.cpp | 19 ++++++++++--------- 2 files changed, 28 insertions(+), 11 deletions(-) (limited to 'examples') diff --git a/examples/meta/meta.cpp b/examples/meta/meta.cpp index c638021..a3ed7e7 100644 --- a/examples/meta/meta.cpp +++ b/examples/meta/meta.cpp @@ -50,6 +50,9 @@ saw::error_or meta_main(int argc, char** argv){ saw::data args_dat; { + { + + } saw::data args_enc{argc,argv}; saw::codec args_codec; @@ -66,8 +69,13 @@ saw::error_or meta_main(int argc, char** argv){ switch(args_pos.get<0u>().get()){ case 1u: { - assert(false); - return saw::make_error(); + switch(args_pos.get<1u>().get()){ + case 3u: + meta_lbm_info>(args_str); + break; + default: + return saw::make_error("Second positional needs to be a valid velocity set"); + } } break; case 2u: @@ -87,6 +95,14 @@ saw::error_or meta_main(int argc, char** argv){ case 3u: { switch(args_pos.get<1u>().get()){ + case 7u: + return saw::make_error("D3Q7 Velocity Set is not implemented"); + // meta_lbm_info>(args_str); + break; + case 19u: + return saw::make_error("D3Q17 Velocity Set is not implemented"); + // meta_lbm_info>(args_str); + break; case 27u: meta_lbm_info>(args_str); break; diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp index 01fec89..fffcb31 100644 --- a/examples/poiseulle_particles_2d_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_gpu/sim.cpp @@ -10,9 +10,10 @@ namespace kel { namespace lbm { -constexpr uint64_t dim_x = 1024ul; constexpr uint64_t dim_y = 512ul; -constexpr uint64_t particle_size = 1ul; +constexpr uint64_t dim_x = dim_y * 20ul; + +constexpr uint64_t particle_amount = 1ul; namespace sch { using namespace saw::schema; @@ -60,7 +61,7 @@ template saw::error_or setup_initial_conditions( saw::data>& fields, saw::data>& macros, - saw::data, particle_size>>& particles + saw::data, particle_amount>>& particles ){ auto& info_f = fields.template get<"info">(); auto& porous_f = macros.template get<"porosity">(); @@ -158,14 +159,14 @@ saw::error_or setup_initial_conditions( df_f.get_dims() ); - for(saw::data i{0u}; i < saw::data{particle_size}; ++i){ + for(saw::data i{0u}; i < saw::data{particle_amount}; ++i){ auto& part = particles.at(i); saw::data> pos; - pos.at({{0u}}) = dim_x * 0.5; + pos.at({{0u}}) = dim_x * 0.25; pos.at({{1u}}) = dim_y * 0.5; saw::data> rad, dense, dt; - rad.at({}) = dim_y * 0.2; + rad.at({}) = dim_y * 0.1; dense.at({}) = 1.0; dt.at({}) = 1.0; part = create_spheroid_particle( @@ -182,7 +183,7 @@ template saw::error_or step( saw::data>,encode::Sycl>& fields, saw::data>,encode::Sycl>& macros, - saw::data, particle_size>>& particles, + saw::data, particle_amount>>& particles, saw::data t_i, device& dev ){ @@ -321,7 +322,7 @@ saw::error_or lbm_main(int argc, char** argv){ // saw::data> meta{{dim_x,dim_y}}; auto lbm_data_ptr = saw::heap>>(); auto lbm_macro_data_ptr = saw::heap>>(); - auto lbm_particle_data_ptr = saw::heap, particle_size>>>(); + auto lbm_particle_data_ptr = saw::heap, particle_amount>>>(); std::cout<<"Estimated Bytes: "<,sch::MacroStruct>().get()< lbm_main(int argc, char** argv){ saw::data, encode::Sycl> lbm_sycl_data{sycl_q}; saw::data, encode::Sycl> lbm_sycl_macro_data{sycl_q}; - saw::data, particle_size>, encode::Sycl> lbm_sycl_particle_data{sycl_q}; + saw::data, particle_amount>, encode::Sycl> lbm_sycl_particle_data{sycl_q}; sycl_q.wait(); auto lsd_view = make_chunk_struct_view(lbm_sycl_data); -- cgit v1.2.3 From 8f7b9a04e5d72a451c7e9bdc6cd084f5614dc56a Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 26 Feb 2026 14:40:59 +0100 Subject: Matched initial conditions to intention and added better CharVel values --- examples/poiseulle_particles_2d_gpu/sim.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp index fffcb31..1832965 100644 --- a/examples/poiseulle_particles_2d_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_gpu/sim.cpp @@ -143,7 +143,7 @@ saw::error_or setup_initial_conditions( iterator::apply( [&](auto& index){ saw::data> middle, ind_vec; - middle.at({{0u}}) = dim_x * 0.5; + middle.at({{0u}}) = dim_x * 0.25; middle.at({{1u}}) = dim_y * 0.5; ind_vec.at({{0u}}) = index.at({{0u}}).template cast_to(); @@ -151,7 +151,7 @@ saw::error_or setup_initial_conditions( auto dist = middle - ind_vec; auto dist_2 = saw::math::dot(dist,dist); - if(dist_2.at({}).get() < 128*128){ + if(dist_2.at({}).get() < dim_y*dim_y*0.01){ porous_f.at(index).at({}) = 0.0; } }, @@ -317,7 +317,7 @@ saw::error_or lbm_main(int argc, char** argv){ {{1.0}} }; - print_lbm_meta(conv,{0.01},{0.1},{1024.0}); + print_lbm_meta(conv,{0.01},{0.01},{0.4 * dim_y}); // saw::data> meta{{dim_x,dim_y}}; auto lbm_data_ptr = saw::heap>>(); -- cgit v1.2.3