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/poiseulle_2d.cpp | 71 +++++++++++++++++----------------- 1 file changed, 35 insertions(+), 36 deletions(-) (limited to 'examples/poiseulle_2d') diff --git a/examples/poiseulle_2d/poiseulle_2d.cpp b/examples/poiseulle_2d/poiseulle_2d.cpp index f9db3df..7ade1ca 100644 --- a/examples/poiseulle_2d/poiseulle_2d.cpp +++ b/examples/poiseulle_2d/poiseulle_2d.cpp @@ -8,7 +8,6 @@ namespace kel { namespace lbm { namespace sch { -using namespace saw::schema; /** * Basic distribution function @@ -73,16 +72,16 @@ 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, uint64_t time_step){ + void apply(kel::lbm::data& field, kel::lbm::data> index, uint64_t time_step){ using dfi = df_info; bool is_even = ((time_step % 2) == 0); @@ -98,8 +97,8 @@ public: /** * Sum all known DFs */ - saw::data sum_df{0}; - for(saw::data k{0u}; k < saw::data{Descriptor::Q}; ++k){ + kel::lbm::data sum_df{0}; + for(kel::lbm::data k{0u}; k < kel::lbm::data{Descriptor::Q}; ++k){ auto c_k = dfi::directions[k.get()]; auto& cell_n = field({{index.at({0u})+c_k[0u], index.at({1u})+c_k[1u]}}); auto& info_n = cell_n.template get<"info">(); @@ -114,9 +113,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{Descriptor::Q}; ++k){ + for(kel::lbm::data k{0u}; k < kel::lbm::data{Descriptor::Q}; ++k){ auto c_k = dfi::directions[k.get()]; auto& cell_n = field({{index.at({0u})+c_k[0u], index.at({1u})+c_k[1u]}}); auto& info_n = cell_n.template get<"info">(); @@ -131,20 +130,20 @@ 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})); } } }; } } -void set_geometry(saw::data& latt){ +void set_geometry(kel::lbm::data& latt){ using namespace kel::lbm; auto meta = latt.meta(); @@ -152,7 +151,7 @@ void set_geometry(saw::data& latt){ /** * Set ghost */ - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& info = cell.template get<"info">(); @@ -163,7 +162,7 @@ void set_geometry(saw::data& latt){ /** * Set wall */ - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& info = cell.template get<"info">(); @@ -174,7 +173,7 @@ void set_geometry(saw::data& latt){ /** * Set fluid */ - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& info = cell.template get<"info">(); @@ -185,7 +184,7 @@ void set_geometry(saw::data& latt){ /** * Set inflow */ - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& info = cell.template get<"info">(); @@ -196,7 +195,7 @@ void set_geometry(saw::data& latt){ /** * Set outflow */ - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& info = cell.template get<"info">(); @@ -205,11 +204,11 @@ void set_geometry(saw::data& latt){ }, {{meta.at({0u})-2u,0u}}, {{meta.at({0u})-1u, meta.at({1u})}}, {{0u,2u}}); } -void set_initial_conditions(saw::data& latt){ +void set_initial_conditions(kel::lbm::data& latt){ 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); auto meta = latt.meta(); @@ -217,12 +216,12 @@ void set_initial_conditions(saw::data& latt){ /** * Set distribution */ - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& dfs = cell.template get<"dfs">(); auto& dfs_old = cell.template get<"dfs_old">(); - for(saw::data k = 0; k < saw::data{sch::D2Q9::Q}; ++k){ + for(kel::lbm::data k = 0; k < kel::lbm::data{sch::D2Q9::Q}; ++k){ dfs(k) = eq.at(k); dfs_old(k) = eq.at(k); } @@ -231,7 +230,7 @@ void set_initial_conditions(saw::data& latt){ } void lbm_step( - saw::data& latt, + kel::lbm::data& latt, uint64_t time_step ){ using namespace kel::lbm; @@ -251,7 +250,7 @@ void lbm_step( /** * Collision */ - iterator::apply([&](const saw::data>& index){ + iterator::apply([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& info = cell.template get<"info">(); @@ -279,7 +278,7 @@ void lbm_step( }, {{0u,0u}}, meta); // Stream - iterator::apply([&](const saw::data>& index){ + iterator::apply([&](const kel::lbm::data>& index){ auto& cell = latt(index); auto& df_new = even_step ? cell.template get<"dfs">() : cell.template get<"dfs_old">(); auto& info_new = cell.template get<"info">(); @@ -334,8 +333,8 @@ int main(int argc, char** argv){ print_lbm_meta>(conv, {conf.template get<"kinematic_viscosity">()}); - saw::data> dim{{1024u, 128u}}; - saw::data lattice{dim}; + kel::lbm::data> dim{{1024u, 128u}}; + kel::lbm::data lattice{dim}; auto meta = lattice.meta(); /** @@ -345,9 +344,9 @@ int main(int argc, char** argv){ { - saw::data, sch::D2Q9::D>> geo{dim}; + kel::lbm::data, sch::D2Q9::D>> geo{dim}; - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = lattice(index); auto& info = cell.template get<"info">(); @@ -363,21 +362,21 @@ int main(int argc, char** argv){ */ set_initial_conditions(lattice); - saw::data,sch::D2Q9::D>> macros{dim}; + kel::lbm::data,sch::D2Q9::D>> macros{dim}; for(uint64_t i = 0u; i < 4096u*16u; ++i){ bool even_step = ((i % 2u) == 0u); { // Stream - iterate_over([&](const saw::data>& index){ + iterate_over([&](const kel::lbm::data>& index){ auto& cell = lattice(index); auto& dfs = even_step ? cell.template get<"dfs">() : cell.template get<"dfs_old">(); auto& rho = macros.at(index).template get<"pressure">(); auto& vel = macros.at(index).template get<"momentum">(); compute_rho_u(dfs,rho,vel); - rho = rho * saw::data{dfi::cs2}; + rho = rho * kel::lbm::data{dfi::cs2}; }, {{0u,0u}}, meta); std::string vtk_f_name{"poiseulle_2d_"}; -- cgit v1.3.1