From 530bd236a0aee9c22b87de236164c59afe6adae7 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Sat, 25 Jul 2026 23:17:18 +0200 Subject: dangling --- examples/poiseulle_particles_2d_gpu/sim.cpp | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'examples/poiseulle_particles_2d_gpu/sim.cpp') diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp index 865babf..bb5787f 100644 --- a/examples/poiseulle_particles_2d_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_gpu/sim.cpp @@ -22,18 +22,11 @@ using LbmArgs = Args< } template -saw::error_or lbm_main(int argc, char** argv){ +saw::error_or lbm_main(const saw::data& args){ using namespace kel::lbm; using dfi = df_info; - auto eo_args = saw::parse_args(argc,argv); - if(eo_args.is_error()){ - return std::move(eo_args.get_error()); - } - auto& args = eo_args.get_value(); - (void)args; - auto eo_lbm_dir = output_directory(); if(eo_lbm_dir.is_error()){ return std::move(eo_lbm_dir.get_error()); @@ -198,14 +191,28 @@ saw::error_or lbm_main(int argc, char** argv){ using FloatT = kel::lbm::sch::Float32; -saw::error_or kmain(int argc, char** argv){ +saw::error_or k_main(int argc, char** argv){ using namespace kel::lbm; + + saw::data args; + { + auto eov = saw::parse_args(args,argc,argv); + return eov; + } + auto& an = args.template get<"args">(); + auto& coupling = an.template get<"coupling">(); + + if(coupling.view() == "hlbm"){ + return lbm_main(args); + //}else if(coupling.view() == "psm"){ + // return kmain(args); + } - // auto eo_args = saw::parse_args< + return saw::make_error("Invalid coupling"); } int main(int argc, char** argv){ - auto eov = lbm_main(argc, argv); + auto eov = k_main(argc, argv); if(eov.is_error()){ auto& err = eov.get_error(); std::cerr<<"[Error] "< Date: Mon, 27 Jul 2026 13:32:05 +0200 Subject: Cleaning up simulation setup --- examples/poiseulle_particles_2d_gpu/sim.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'examples/poiseulle_particles_2d_gpu/sim.cpp') diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp index bb5787f..a4f08f0 100644 --- a/examples/poiseulle_particles_2d_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_gpu/sim.cpp @@ -22,7 +22,7 @@ using LbmArgs = Args< } template -saw::error_or lbm_main(const saw::data& args){ +saw::error_or lbm_main(const saw::data& args){ using namespace kel::lbm; using dfi = df_info; @@ -111,7 +111,6 @@ saw::error_or lbm_main(const saw::data& args){ } } sycl_q.wait(); - auto lsd_view = make_view(lbm_sycl_data); auto lsdm_view = make_view(lbm_sycl_macro_data); auto lsdp_view = make_view(lbm_sycl_particle_data); @@ -188,13 +187,13 @@ saw::error_or lbm_main(const saw::data& args){ return saw::make_void(); } - using FloatT = kel::lbm::sch::Float32; +using DescT = kel::lbm::sch::D2Q9; saw::error_or k_main(int argc, char** argv){ using namespace kel::lbm; - saw::data args; + saw::data args; { auto eov = saw::parse_args(args,argc,argv); return eov; @@ -202,17 +201,18 @@ saw::error_or k_main(int argc, char** argv){ auto& an = args.template get<"args">(); auto& coupling = an.template get<"coupling">(); - if(coupling.view() == "hlbm"){ - return lbm_main(args); + if(coupling.stl_view() == "hlbm"){ + return lbm_main(args); //}else if(coupling.view() == "psm"){ - // return kmain(args); + // return kmain(args); } return saw::make_error("Invalid coupling"); } + int main(int argc, char** argv){ - auto eov = k_main(argc, argv); + auto eov = k_main(argc, argv); if(eov.is_error()){ auto& err = eov.get_error(); std::cerr<<"[Error] "< Date: Mon, 27 Jul 2026 21:53:27 +0200 Subject: Dangling --- examples/poiseulle_particles_2d_gpu/sim.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/poiseulle_particles_2d_gpu/sim.cpp') diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp index a4f08f0..fd6cdca 100644 --- a/examples/poiseulle_particles_2d_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_gpu/sim.cpp @@ -81,7 +81,7 @@ saw::error_or lbm_main(const saw::data& args){ sycl_q.wait(); { - auto eov = setup_initial_conditions(conv,*lbm_data_ptr,*lbm_macro_data_ptr,*lbm_particle_data_ptr); + auto eov = init(conv,*lbm_data_ptr,*lbm_macro_data_ptr,*lbm_particle_data_ptr); if(eov.is_error()){ return eov; } @@ -115,21 +115,21 @@ saw::error_or lbm_main(const saw::data& args){ auto lsdm_view = make_view(lbm_sycl_macro_data); auto lsdp_view = make_view(lbm_sycl_particle_data); - saw::data time_steps{16u*4096ul}; + saw::data time_steps{64u*1024ul}; auto& info_f = lsd_view.template get<"info">(); for(saw::data i{0u}; i < time_steps and krun; ++i){ // BC + Collision { - auto eov = step(conv,lsd_view,lsdm_view,lsdp_view,i,dev); + auto eov = step(conv,lsd_view,lsdm_view,lsdp_view,i,dev); if(eov.is_error()){ return eov; } } sycl_q.wait(); - if(i.get() % 32u == 0u){ + if(i.get() % 64u == 0u){ { auto eov = dev.copy_to_host(lbm_sycl_macro_data,*lbm_macro_data_ptr); if(eov.is_error()){ -- cgit v1.2.3