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_particles_2d_psm_gpu/sim.cpp | 78 ++++++++++++------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'examples/poiseulle_particles_2d_psm_gpu/sim.cpp') diff --git a/examples/poiseulle_particles_2d_psm_gpu/sim.cpp b/examples/poiseulle_particles_2d_psm_gpu/sim.cpp index ae15a9a..3fd5579 100644 --- a/examples/poiseulle_particles_2d_psm_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_psm_gpu/sim.cpp @@ -17,7 +17,6 @@ constexpr uint64_t dim_x = dim_y * 20ul; constexpr uint64_t particle_amount = 1ul; namespace sch { -using namespace saw::schema; using InfoChunk = Chunk; @@ -60,9 +59,9 @@ using MacroStruct = Struct< } template -saw::error_or setup_initial_conditions( - saw::data>& fields, - saw::data>& macros +kel::lbm::error_or setup_initial_conditions( + kel::lbm::data>& fields, + kel::lbm::data>& macros ){ auto& info_f = fields.template get<"info">(); auto& porous_f = macros.template get<"porosity">(); @@ -160,11 +159,11 @@ saw::error_or setup_initial_conditions( {{1u,1u}} ); - saw::data> eps; + kel::lbm::data> eps; eps.at({}).set(1.5f); - saw::data> rad; + kel::lbm::data> rad; rad.at({}).set(dim_y*0.1); - saw::data> p_pos; + kel::lbm::data> p_pos; { p_pos.at({{0u}}) = dim_x * 0.25; p_pos.at({{1u}}) = dim_y * 0.5; @@ -184,7 +183,7 @@ saw::error_or setup_initial_conditions( /* iterator::apply( [&](auto& index){ - saw::data> middle, ind_vec; + kel::lbm::data> middle, ind_vec; middle.at({{0u}}) = dim_x * 0.25; middle.at({{1u}}) = dim_y * 0.5; @@ -192,7 +191,7 @@ saw::error_or setup_initial_conditions( ind_vec.at({{1u}}) = index.at({{1u}}).template cast_to(); auto dist = middle - ind_vec; - auto dist_2 = saw::math::dot(dist,dist); + auto dist_2 = kel::lbm::math::dot(dist,dist); if(dist_2.at({}).get() < dim_y*dim_y*0.01){ porous_f.at(index).at({}) = 0.0; } @@ -202,14 +201,14 @@ saw::error_or setup_initial_conditions( ); */ - return saw::make_void(); + return kel::lbm::make_void(); } template -saw::error_or step( - saw::data>,encode::Sycl>& fields, - saw::data>,encode::Sycl>& macros, - saw::data t_i, +kel::lbm::error_or step( + kel::lbm::data>,encode::Sycl>& fields, + kel::lbm::data>,encode::Sycl>& macros, + kel::lbm::data t_i, device& dev ){ auto& q = dev.get_handle(); @@ -217,22 +216,22 @@ saw::error_or step( auto& porous_f = macros.template get<"porosity">(); q.submit([&](acpp::sycl::handler& h){ - component> bgk{0.8}; - component> collision{0.8}; - component> bb; + component> bgk{0.8}; + component> collision{0.8}; + component> bb; - saw::data> eps; + kel::lbm::data> eps; eps.at({}).set(1.5f); - saw::data> rad; + kel::lbm::data> rad; rad.at({}).set(dim_y*0.1); - saw::data> p_pos; + kel::lbm::data> p_pos; { p_pos.at({{0u}}) = dim_x * 0.25; p_pos.at({{1u}}) = dim_y * 0.5; } - component> opa{p_pos,rad,eps}; + component> opa{p_pos,rad,eps}; - component,encode::Sycl> flow_in{ + component,encode::Sycl> flow_in{ [&](){ uint64_t target_t_i = 64u; if(t_i.get() < target_t_i){ @@ -241,12 +240,12 @@ saw::error_or step( return 1.0002; }() }; - component,encode::Sycl> flow_out{1.0}; + component,encode::Sycl> flow_out{1.0}; - component> fg; + component> fg; h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](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]); } @@ -292,13 +291,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; @@ -315,7 +314,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"); } } @@ -328,15 +327,16 @@ saw::error_or lbm_main(int argc, char** argv){ print_lbm_meta(conv,{0.1},{1e-4},{0.4 * dim_y}); - // saw::data> meta{{dim_x,dim_y}}; - auto lbm_data_ptr = saw::heap>>(); - auto lbm_macro_data_ptr = saw::heap>>(); + // kel::lbm::data> meta{{dim_x,dim_y}}; + auto lbm_data_ptr = kel::lbm::heap>>(); + auto lbm_macro_data_ptr = kel::lbm::heap>>(); 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}; @@ -368,8 +368,8 @@ 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}; + kel::lbm::data, encode::Sycl> lbm_sycl_data{sycl_q}; + kel::lbm::data, encode::Sycl> lbm_sycl_macro_data{sycl_q}; sycl_q.wait(); { @@ -388,11 +388,11 @@ saw::error_or lbm_main(int argc, char** argv){ auto lsd_view = make_view(lbm_sycl_data); auto lsdm_view = make_view(lbm_sycl_macro_data); - saw::data time_steps{16u*4096ul}; + kel::lbm::data time_steps{16u*4096ul}; auto& info_f = lsd_view.template get<"info">(); - for(saw::data i{0u}; i < time_steps and krun; ++i){ + for(kel::lbm::data i{0u}; i < time_steps and krun; ++i){ // BC + Collision { auto eov = step(lsd_view,lsdm_view,i,dev); @@ -404,10 +404,10 @@ saw::error_or lbm_main(int argc, char** argv){ // Stream sycl_q.submit([&](acpp::sycl::handler& h){ - component> stream; + component> stream; h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](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]); } @@ -449,7 +449,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