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_2d_gpu/poiseulle_2d_gpu.cpp | 83 +++++++++++++------------- 1 file changed, 41 insertions(+), 42 deletions(-) (limited to 'examples/poiseulle_2d_gpu/poiseulle_2d_gpu.cpp') diff --git a/examples/poiseulle_2d_gpu/poiseulle_2d_gpu.cpp b/examples/poiseulle_2d_gpu/poiseulle_2d_gpu.cpp index 9963c59..bece18f 100644 --- a/examples/poiseulle_2d_gpu/poiseulle_2d_gpu.cpp +++ b/examples/poiseulle_2d_gpu/poiseulle_2d_gpu.cpp @@ -4,12 +4,11 @@ #include template -using SyclHostAlloc = acpp::sycl::usm_allocator, acpp::sycl::usm::alloc::host>; +using SyclHostAlloc = acpp::sycl::usm_allocator, acpp::sycl::usm::alloc::host>; namespace kel { namespace lbm { namespace sch { -using namespace saw::schema; /** * Basic distribution function @@ -50,19 +49,19 @@ struct PressureBoundaryRestrictedVelocityTo {}; template struct component> { private: - saw::data pressure_setting_; - saw::data rho_setting_; + kel::lbm::data pressure_setting_; + kel::lbm::data rho_setting_; public: - component(const saw::data& pressure_setting__): + component(const kel::lbm::data& pressure_setting__): pressure_setting_{pressure_setting__}, rho_setting_{pressure_setting__ * df_info::inv_cs2} {} template void apply( - saw::data* field, - saw::data> index, - const saw::data>& meta, + kel::lbm::data* field, + kel::lbm::data> index, + const kel::lbm::data>& meta, uint64_t time_step ) const { @@ -82,8 +81,8 @@ public: /** * Sum all known DFs */ - saw::data sum_df{0u}; - for(saw::data k{0u}; k < saw::data{Desc::Q}; ++k){ + kel::lbm::data sum_df{0u}; + for(kel::lbm::data k{0u}; k < kel::lbm::data{Desc::Q}; ++k){ auto c_k = dfi::directions[k.get()]; auto flat_ind_n = flatten_index::apply({{index.at({0u})+c_k[0u], index.at({1u})+c_k[1u]}},meta); auto& cell_n = field[flat_ind_n.get()]; @@ -99,9 +98,9 @@ public: * Get the sum of the unknown dfs and precalculate the direction */ constexpr int known_dir = East ? 1 : -1; - auto sum_unknown_dfs = (rho_setting_ - sum_df) * saw::data{known_dir}; + auto sum_unknown_dfs = (rho_setting_ - sum_df) * kel::lbm::data{known_dir}; - for(saw::data k{0u}; k < saw::data{Desc::Q}; ++k){ + for(kel::lbm::data k{0u}; k < kel::lbm::data{Desc::Q}; ++k){ auto c_k = dfi::directions[k.get()]; auto flat_ind_n = flatten_index::apply({{index.at({0u})+c_k[0u], index.at({1u})+c_k[1u]}},meta); auto& cell_n = field[flat_ind_n.get()]; @@ -116,13 +115,13 @@ public: auto vel_x = sum_unknown_dfs / rho_setting_; if constexpr (East) { - dfs_old({2u}) = dfs_old({1u}) + saw::data{2.0 / 3.0} * rho_setting_ * vel_x; - dfs_old({6u}) = dfs_old({5u}) + saw::data{1.0 / 6.0} * rho_setting_ * vel_x + saw::data{0.5} * (dfs_old({4u}) - dfs_old({3u})); - dfs_old({8u}) = dfs_old({7u}) + saw::data{1.0 / 6.0} * rho_setting_ * vel_x + saw::data{0.5} * (dfs_old({3u}) - dfs_old({4u})); + dfs_old({2u}) = dfs_old({1u}) + kel::lbm::data{2.0 / 3.0} * rho_setting_ * vel_x; + dfs_old({6u}) = dfs_old({5u}) + kel::lbm::data{1.0 / 6.0} * rho_setting_ * vel_x + kel::lbm::data{0.5} * (dfs_old({4u}) - dfs_old({3u})); + dfs_old({8u}) = dfs_old({7u}) + kel::lbm::data{1.0 / 6.0} * rho_setting_ * vel_x + kel::lbm::data{0.5} * (dfs_old({3u}) - dfs_old({4u})); }else if constexpr (not East){ - dfs_old({1u}) = dfs_old({2u}) - saw::data{2.0 / 3.0} * rho_setting_ * vel_x; - dfs_old({5u}) = dfs_old({6u}) - saw::data{1.0 / 6.0} * rho_setting_ * vel_x + saw::data{0.5} * (dfs_old({3u}) - dfs_old({4u})); - dfs_old({7u}) = dfs_old({8u}) - saw::data{1.0 / 6.0} * rho_setting_ * vel_x + saw::data{0.5} * (dfs_old({4u}) - dfs_old({3u})); + dfs_old({1u}) = dfs_old({2u}) - kel::lbm::data{2.0 / 3.0} * rho_setting_ * vel_x; + dfs_old({5u}) = dfs_old({6u}) - kel::lbm::data{1.0 / 6.0} * rho_setting_ * vel_x + kel::lbm::data{0.5} * (dfs_old({3u}) - dfs_old({4u})); + dfs_old({7u}) = dfs_old({8u}) - kel::lbm::data{1.0 / 6.0} * rho_setting_ * vel_x + kel::lbm::data{0.5} * (dfs_old({4u}) - dfs_old({3u})); } } }; @@ -141,15 +140,15 @@ public: */ template -saw::error_or set_geometry( - saw::data* cells, - const saw::data>& meta, +kel::lbm::error_or set_geometry( + kel::lbm::data* cells, + const kel::lbm::data>& meta, acpp::sycl::queue& sycl_q ){ using namespace kel::lbm; - saw::data rho{1.0}; - saw::data> vel{{0.0,0.0}}; + kel::lbm::data rho{1.0}; + kel::lbm::data> vel{{0.0,0.0}}; auto eq = equilibrium(rho, vel); sycl_q.submit([&](acpp::sycl::handler& h){ @@ -178,28 +177,28 @@ saw::error_or set_geometry( }else { info.set({0u}); } - for(saw::data k{0u}; k < saw::data{Desc::Q}; ++k){ + for(kel::lbm::data k{0u}; k < kel::lbm::data{Desc::Q}; ++k){ dfs(k) = eq.at(k); dfs_old(k) = eq.at(k); } }); }).wait(); - return saw::make_void(); + return kel::lbm::make_void(); } template void step( - saw::data* cells, - saw::data* macro_cells, - const saw::data>& meta, + kel::lbm::data* cells, + kel::lbm::data* macro_cells, + const kel::lbm::data>& meta, uint64_t time_step, acpp::sycl::queue& sycl_q ){ using namespace kel::lbm; using dfi = df_info; - constexpr saw::data frequency{1.0 / 0.6}; + constexpr kel::lbm::data frequency{1.0 / 0.6}; bool is_even = ((time_step % 2u) == 0u); /** @@ -244,8 +243,8 @@ void step( auto& macro_c = macro_cells[acc_id]; - saw::data& rho = macro_c.template get<"pressure">(); - saw::data>& vel = macro_c.template get<"momentum">(); + kel::lbm::data& rho = macro_c.template get<"pressure">(); + kel::lbm::data>& vel = macro_c.template get<"momentum">(); compute_rho_u(dfs_old,rho,vel); auto eq = equilibrium(rho,vel); @@ -261,8 +260,8 @@ void step( auto& macro_c = macro_cells[acc_id]; - saw::data& rho = macro_c.template get<"pressure">(); - saw::data>& vel = macro_c.template get<"momentum">(); + kel::lbm::data& rho = macro_c.template get<"pressure">(); + kel::lbm::data>& vel = macro_c.template get<"momentum">(); compute_rho_u(dfs_old,rho,vel); auto eq = equilibrium(rho,vel); @@ -278,8 +277,8 @@ void step( auto& macro_c = macro_cells[acc_id]; - saw::data& rho = macro_c.template get<"pressure">(); - saw::data>& vel = macro_c.template get<"momentum">(); + kel::lbm::data& rho = macro_c.template get<"pressure">(); + kel::lbm::data>& vel = macro_c.template get<"momentum">(); compute_rho_u(dfs_old,rho,vel); auto eq = equilibrium(rho,vel); @@ -327,7 +326,7 @@ void step( } template -saw::error_or kel_main(int argc, char** argv){ +kel::lbm::error_or kel_main(int argc, char** argv){ using namespace kel; using dfi = lbm::df_info; @@ -350,16 +349,16 @@ saw::error_or kel_main(int argc, char** argv){ uint64_t x_d = 1024u; uint64_t y_d = 512u; - saw::data> meta{{x_d,y_d}}; + kel::lbm::data> meta{{x_d,y_d}}; acpp::sycl::queue sycl_q; SyclHostAlloc sycl_host_alloc{sycl_q}; // SyclDeviceAlloc sycl_dev_alloc{sycl_q}; - std::vector, SyclHostAlloc> host_cells{x_d * y_d,sycl_host_alloc}; + std::vector, SyclHostAlloc> host_cells{x_d * y_d,sycl_host_alloc}; - saw::data* cells = acpp::sycl::malloc_device>(x_d * y_d,sycl_q); - saw::data* macro_cells = acpp::sycl::malloc_device>(x_d * y_d,sycl_q); + kel::lbm::data* cells = acpp::sycl::malloc_device>(x_d * y_d,sycl_q); + kel::lbm::data* macro_cells = acpp::sycl::malloc_device>(x_d * y_d,sycl_q); { auto eov = lbm::set_geometry(cells,meta,sycl_q); if(eov.is_error()){ @@ -376,7 +375,7 @@ saw::error_or kel_main(int argc, char** argv){ std::string vtk_f_name{"tmp/poiseulle_2d_gpu_"}; vtk_f_name += std::to_string(i) + ".vtk"; // write_vtk_file(vtk_f_name,host_cells); - sycl_q.memcpy(&host_cells[0u], macro_cells, x_d * y_d * sizeof(saw::data) ).wait(); + sycl_q.memcpy(&host_cells[0u], macro_cells, x_d * y_d * sizeof(kel::lbm::data) ).wait(); lbm::write_vtk_file(vtk_f_name, &host_cells[0], meta); } } @@ -386,7 +385,7 @@ saw::error_or kel_main(int argc, char** argv){ acpp::sycl::free(macro_cells, sycl_q); sycl_q.wait(); - return saw::make_void(); + return kel::lbm::make_void(); } int main(int argc, char** argv){ -- cgit v1.3.1