From c59aeef2e0c86ec3f0f34ce77c205f3ef0b034cc Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Sun, 8 Nov 2026 22:04:06 +0100 Subject: Abstract move. Forstio independence --- examples/poiseulle_3d_gpu/sim.cpp | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'examples/poiseulle_3d_gpu/sim.cpp') diff --git a/examples/poiseulle_3d_gpu/sim.cpp b/examples/poiseulle_3d_gpu/sim.cpp index 167234d..3fe7358 100644 --- a/examples/poiseulle_3d_gpu/sim.cpp +++ b/examples/poiseulle_3d_gpu/sim.cpp @@ -16,7 +16,6 @@ constexpr uint64_t dim_z = 256ul; constexpr uint64_t particle_size = 128ul; namespace sch { -using namespace saw::schema; using InfoChunk = Chunk; @@ -53,11 +52,11 @@ using MacroStruct = Struct< } template -saw::error_or setup_initial_conditions( +kel::lbm::error_or setup_initial_conditions( converter& conv, - saw::data>& fields, - saw::data>& macros, - saw::data, particle_size>>& particles + kel::lbm::data>& fields, + kel::lbm::data>& macros, + kel::lbm::data, particle_size>>& particles ){ auto& info_f = fields.template get<"info">(); // Set everything as walls @@ -135,19 +134,19 @@ saw::error_or setup_initial_conditions( {{1u,1u,1u}} ); - for(saw::data i{0u}; i < saw::data{particle_size}; ++i){ + for(kel::lbm::data i{0u}; i < kel::lbm::data{particle_size}; ++i){ auto& part = particles.at(i); } - return saw::make_void(); + return kel::lbm::make_void(); } template -saw::error_or step( +kel::lbm::error_or step( converter& conv, - saw::data>,encode::Sycl>& fields, - saw::data>,encode::Sycl>& macros, - saw::data t_i, + kel::lbm::data>,encode::Sycl>& fields, + kel::lbm::data>,encode::Sycl>& macros, + kel::lbm::data t_i, device& dev ){ auto& q = dev.get_handle(); @@ -156,11 +155,11 @@ saw::error_or step( // auto coll_ev = q.submit([&](acpp::sycl::handler& h){ // Need nicer things to handle the flow. I see improvement here - component> collision{conv.template kinematic_viscosity_si_to_tau({0.1}).handle()}; - // component> collision{0.6}; - component> bb; + component> collision{conv.template kinematic_viscosity_si_to_tau({0.1}).handle()}; + // component> collision{0.6}; + component> bb; - component,encode::Sycl> flow_in{ + component,encode::Sycl> flow_in{ [&](){ uint64_t target_t_i = 256u; if(t_i.get() < target_t_i){ @@ -169,10 +168,10 @@ saw::error_or step( return 1.001; }() }; - component,encode::Sycl> flow_out{1.0}; + component,encode::Sycl> flow_out{1.0}; h.parallel_for(acpp::sycl::range{dim_x,dim_y,dim_z}, [=](acpp::sycl::id idx){ - saw::data> index; + kel::lbm::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); } @@ -203,10 +202,10 @@ saw::error_or step( }).wait(); q.submit([&](acpp::sycl::handler& h){ - component> stream; + component> stream; h.parallel_for(acpp::sycl::range{dim_x,dim_y,dim_z}, [=](acpp::sycl::id idx){ - saw::data> index; + kel::lbm::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); } @@ -226,13 +225,13 @@ saw::error_or step( }).wait(); */ - return saw::make_void(); + return kel::lbm::make_void(); } } } template -saw::error_or lbm_main(int argc, char** argv){ +kel::lbm::error_or lbm_main(int argc, char** argv){ using namespace kel::lbm; using dfi = df_info; @@ -249,7 +248,7 @@ saw::error_or lbm_main(int argc, char** argv){ std::error_code ec; std::filesystem::create_directories(out_dir,ec); if(ec != std::errc{}){ - return saw::make_error("Could not create output directory"); + return kel::lbm::make_error("Could not create output directory"); } } @@ -262,15 +261,16 @@ saw::error_or lbm_main(int argc, char** argv){ print_lbm_meta(conv,{0.1},{0.01},{1024.0}); - auto lbm_data_ptr = saw::heap>>(); - auto lbm_macro_data_ptr = saw::heap>>(); - auto lbm_particle_data_ptr = saw::heap, particle_size>>>(); + auto lbm_data_ptr = kel::lbm::heap>>(); + auto lbm_macro_data_ptr = kel::lbm::heap>>(); + auto lbm_particle_data_ptr = kel::lbm::heap, particle_size>>>(); std::cout<<"Estimated Bytes: "<,sch::MacroStruct>().get()<( + std::string{eo_aio.get_error().get_message()}); } auto& aio = eo_aio.get_value(); saw::wait_scope wait{aio.event_loop}; @@ -296,9 +296,9 @@ saw::error_or 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}; + kel::lbm::data, encode::Sycl> lbm_sycl_data{sycl_q}; + kel::lbm::data, encode::Sycl> lbm_sycl_macro_data{sycl_q}; + kel::lbm::data, particle_size>, encode::Sycl> lbm_sycl_particle_data{sycl_q}; sycl_q.wait(); auto lsd_view = make_view(lbm_sycl_data); @@ -322,9 +322,9 @@ saw::error_or lbm_main(int argc, char** argv){ } } sycl_q.wait(); - saw::data time_steps{2048ul}; + kel::lbm::data time_steps{2048ul}; - for(saw::data i{0u}; i < time_steps and krun; ++i){ + for(kel::lbm::data i{0u}; i < time_steps and krun; ++i){ { { auto eov = write_vtk_file(out_dir,"t",i.get(),*lbm_macro_data_ptr); @@ -386,7 +386,7 @@ saw::error_or lbm_main(int argc, char** argv){ */ sycl_q.wait(); - return saw::make_void(); + return kel::lbm::make_void(); } using FloatT = kel::lbm::sch::Float32; -- cgit v1.3.1