From 4e25534211969951e5b932caf4501f6bd0061c2a Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 15 Jan 2026 19:14:46 +0100 Subject: Working around stuff --- .../poiseulle_2d_gpu.cpp | 386 --------------------- examples/poiseulle_particles_2d_gpu/sim.cpp | 10 +- lib/core/c++/geometry.hpp | 5 + 3 files changed, 9 insertions(+), 392 deletions(-) delete mode 100644 examples/poiseulle_particles_2d_gpu/poiseulle_2d_gpu.cpp diff --git a/examples/poiseulle_particles_2d_gpu/poiseulle_2d_gpu.cpp b/examples/poiseulle_particles_2d_gpu/poiseulle_2d_gpu.cpp deleted file mode 100644 index 1fcfd9c..0000000 --- a/examples/poiseulle_particles_2d_gpu/poiseulle_2d_gpu.cpp +++ /dev/null @@ -1,386 +0,0 @@ -#include -#include - -#include - -template -using SyclHostAlloc = acpp::sycl::usm_allocator, acpp::sycl::usm::alloc::host>; - -namespace kel { -namespace lbm { -namespace sch { -using namespace saw::schema; - -/** - * Basic distribution function - * Base type - * D - * Q - * Scalar factor - * D factor - * Q factor - */ -using T = Float64; -using D2Q9 = Descriptor<2u,9u>; - -using DfCell = Cell; -using CellInfo = Cell; -using CellForceField = Cell; - -/** - * Basic type for simulation - */ -using CellStruct = Struct< - Member, - Member, - Member, - Member ->; - -using MacroStruct = Struct< - Member, "velocity">, - Member, - Member ->; - -} - -namespace cmpt { -template -struct PressureBoundaryRestrictedVelocityTo {}; -} - -template -struct component> { -private: - saw::data pressure_setting_; - saw::data rho_setting_; -public: - component(const saw::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, - uint64_t time_step - ) const { - - using dfi = df_info; - - auto flat_ind = flatten_index::apply(index,meta); - - bool is_even = ((time_step % 2u) == 0u); - auto& cell = field[flat_ind.get()]; - - auto& info = cell.template get<"info">(); - if(info({0u}).get() == 0u){ - return; - } - auto& dfs_old = (is_even) ? cell.template get<"dfs_old">() : cell.template get<"dfs">(); - - /** - * Sum all known DFs - */ - saw::data sum_df{0u}; - for(saw::data k{0u}; k < saw::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()]; - auto& info_n = cell_n.template get<"info">(); - auto info_n_val = info_n({0u}); - auto k_opp = dfi::opposite_index[k.get()]; - - if(info_n_val.get() > 0u){ - sum_df += dfs_old({k_opp}); - } - } - /** - * 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}; - - for(saw::data k{0u}; k < saw::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()]; - auto& info_n = cell_n.template get<"info">(); - auto info_n_val = info_n({0u}); - - if(info_n_val.get() > 0u){ - sum_unknown_dfs += dfs_old({k}) * c_k[0u]; - } - } - - 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})); - }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})); - } - } -}; - -/** - * This is massively hacky and expects a lot of conditions - * Either this or mirrored along the horizontal line works - * - * 0 - 2 - 2 - * 0 - 3 - 1 - * 0 - 3 - 1 - * ......... - * 0 - 3 - 1 - * 0 - 2 - 2 - * - */ - -template -saw::error_or set_geometry( - saw::data* cells, - saw::data* macro_cells, - const saw::data>& meta, - acpp::sycl::queue& sycl_q -){ - using namespace kel::lbm; - - saw::data rho{1.0}; - saw::data> vel{{0.0,0.0}}; - auto eq = equilibrium(rho, vel); - - sycl_q.submit([&](acpp::sycl::handler& h){ - h.parallel_for(acpp::sycl::range<2>{meta.at({0}).get(), meta.at({1}).get()},[=](acpp::sycl::id<2> idx){ - size_t i = idx[0]; - size_t j = idx[1]; - size_t acc_id = j * meta.at({0u}).get() + i; - - auto& c = cells[acc_id]; - auto& info = c.template get<"info">()({0}); - auto& dfs = c.template get<"dfs">(); - auto& dfs_old = c.template get<"dfs_old">(); - - if(i >= 2u and j >= 2u and (i+2u) < meta.at({0u}).get() and (j+2u) < meta.at({1u}).get()){ - // Fluid - info.set({2u}); - }else if(((j+2u) == meta.at({1u}).get() or j == 1u) and (i>=1u and (i+1u)= 1 and (j+1 < meta.at({1u}).get()) ) ){ - // Left input - info.set({3u}); - }else if((i+2u) == meta.at({0u}).get() and (j >= 1 and (j+1) < meta.at({1u}).get() )){ - // Right output - info.set({4u}); - }else { - info.set({0u}); - } - for(saw::data k{0u}; k < saw::data{Desc::Q}; ++k){ - dfs(k) = eq.at(k); - dfs_old(k) = eq.at(k); - } - }); - }).wait(); - - return saw::make_void(); -} - -template -void step( - saw::data* cells, - saw::data* macro_cells, - const saw::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.51}; - - bool is_even = ((time_step % 2u) == 0u); - /** - * 1. Relaxation parameter \tau - */ - /* - component coll{0.5384}; - component bb; - */ - component> inlet{1.1 * dfi::cs2}; - component> outlet{1.0 * dfi::cs2}; - - - // auto collision_ev = - sycl_q.submit([&](acpp::sycl::handler& h){ - - /// Collision - h.parallel_for(acpp::sycl::range<2>{meta.at({0}).get(), meta.at({1}).get()},[=](acpp::sycl::id idx){ - size_t i = idx[0]; - size_t j = idx[1]; - size_t acc_id = j * meta.at({0u}).get() + i; - - auto& c = cells[acc_id]; - auto& info = cells[acc_id].template get<"info">(); - - switch (info({0u}).get()) { - // Bounce Back - case 1u: { - auto& dfs_old = is_even ? c.template get<"dfs_old">() : c.template get<"dfs">(); - auto df_cpy = dfs_old.copy(); - - for(uint64_t k = 1u; k < Desc::Q; ++k){ - dfs_old({k}) = df_cpy({dfi::opposite_index.at(k)}); - } - - break; - } - // Collision - case 2u: { - // coll.apply(latt_acc, {i, j}, time_step); - auto& dfs_old = is_even ? c.template get<"dfs_old">() : c.template get<"dfs">(); - - auto& macro_c = macro_cells[acc_id]; - - saw::data& rho = macro_c.template get<"pressure">(); - saw::data>& vel = macro_c.template get<"velocity">(); - - compute_rho_u(dfs_old,rho,vel); - auto eq = equilibrium(rho,vel); - - for(uint64_t k = 0u; k < Desc::Q; ++k){ - dfs_old({k}) = dfs_old({k}) + frequency * (eq.at({k}) - dfs_old({k})); - } - break; - } - case 3u: { - inlet.apply(cells, {{i,j}}, meta, time_step); - break; - } - case 4u: { - outlet.apply(cells, {{i,j}}, meta, time_step); - break; - } - default: - // Do nothing - break; - } - }); - }).wait(); - - //auto stream_ev = - sycl_q.submit([&](acpp::sycl::handler& h){ - /// Stream - h.parallel_for(acpp::sycl::range<2>{meta.at({0}).get(), meta.at({1}).get()},[=](acpp::sycl::id idx){ - size_t i = idx[0]; - size_t j = idx[1]; - size_t acc_id = j * meta.at({0u}).get() + i; - - auto& c = cells[acc_id]; - auto& info = c.template get<"info">(); - auto& dfs_new = is_even ? c.template get<"dfs">() : c.template get<"dfs_old">(); - - if (info({0u}).get() > 1u) { - for (uint64_t k = 0u; k < Desc::Q; ++k) { - auto dir = dfi::directions[dfi::opposite_index[k]]; - size_t acc_old_id = (j+dir[1]) * meta.at({0u}).get() + (i+dir[0]); - - auto& dfs_old = is_even ? cells[acc_old_id].template get<"dfs_old">() : cells[acc_old_id].template get<"dfs">(); - auto& info_old = cells[acc_old_id].template get<"info">(); - - dfs_new({k}) = dfs_old({k}); - } - } - - }); - }).wait(); -} -} -} - -template -saw::error_or kel_main(int argc, char** argv){ - using namespace kel; - - using dfi = lbm::df_info; - - auto eo_lbm_dir = lbm::output_directory(); - if(eo_lbm_dir.is_error()){ - return std::move(eo_lbm_dir.get_error()); - } - auto& lbm_dir = eo_lbm_dir.get_value(); - auto out_dir = lbm_dir / "poiseulle_channel_2d_gpu"; - - // Create Dir TODO - - // - lbm::converter conv { - // delta_x - {{1.0}}, - // delta_t - {{1.0}} - }; - - uint64_t x_d = 256u; - uint64_t y_d = 64u; - - saw::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}; - - 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); - { - auto eov = lbm::set_geometry(cells,macro_cells - ,meta,sycl_q); - if(eov.is_error()){ - return eov; - } - } - - uint64_t time_max_step = 1024u*128u; - - for(uint64_t i = 0u; i < time_max_step; ++i){ - lbm::step(cells,macro_cells,meta,i,sycl_q); - sycl_q.wait(); - if(i%1u == 4u){ - 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(); - lbm::write_vtk_file(vtk_f_name, &host_cells[0], meta); - } - } - - sycl_q.wait(); - acpp::sycl::free(cells, sycl_q); - acpp::sycl::free(macro_cells, sycl_q); - sycl_q.wait(); - - return saw::make_void(); -} - -int main(int argc, char** argv){ - auto eov = kel_main(argc, argv); - if(eov.is_error()){ - auto& err = eov.get_error(); - std::cerr<<"[Error] "< 0u){ - std::cerr<<" - "< -using MesoStruct = Struct< - Member ->; - -template -using MacroStruct = Struct< +using CellStruct = Struct< + Member, "dfs">, + Member, "dfs_old">, + Member, Member, "velocity">, Member, "force"> >; diff --git a/lib/core/c++/geometry.hpp b/lib/core/c++/geometry.hpp index 9802feb..d582b2c 100644 --- a/lib/core/c++/geometry.hpp +++ b/lib/core/c++/geometry.hpp @@ -10,5 +10,10 @@ struct geometry { } }; */ + +// Ghost - 0 +// Wall - 1 +// Fluid - 2 +// Other Stuff - 3-x } } -- cgit v1.2.3