From 95b74577fe5c75e3e8497dc16241b7e6b8d30408 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Fri, 25 Sep 2026 19:40:33 +0200 Subject: Vacation --- .../schaefer_turek_durst_krause_rannbacher/common.hpp | 13 +++++++++++++ examples/schaefer_turek_durst_krause_rannbacher/init.hpp | 6 +++--- examples/schaefer_turek_durst_krause_rannbacher/sim.cpp | 16 ++++++++-------- examples/schaefer_turek_durst_krause_rannbacher/step.hpp | 12 ++++++------ 4 files changed, 30 insertions(+), 17 deletions(-) (limited to 'examples/schaefer_turek_durst_krause_rannbacher') diff --git a/examples/schaefer_turek_durst_krause_rannbacher/common.hpp b/examples/schaefer_turek_durst_krause_rannbacher/common.hpp index 59d2f9c..ac5c94e 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/common.hpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/common.hpp @@ -25,6 +25,19 @@ namespace lbm { constexpr uint64_t dim_y = 41u; constexpr uint64_t dim_x = 220u; +template +struct dimensions { + static constexpr std::array calculate(){ + return {dim_x * N + 1u, dim_y * N + 1u}; + } +}; + +template +constexpr std::array dims{ + dim_x * N + 1u, + dim_y * N + 1u +}; + constexpr uint64_t particle_amount = 1ul; namespace sch { diff --git a/examples/schaefer_turek_durst_krause_rannbacher/init.hpp b/examples/schaefer_turek_durst_krause_rannbacher/init.hpp index 96e2917..45cbaa2 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/init.hpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/init.hpp @@ -41,7 +41,7 @@ saw::error_or init( info_f.at(index).set(3u); }, {{0u,0u}}, - {{1u,dim_y}}, + {{1u,dim_y*N}}, {{0u,1u}} ); @@ -50,8 +50,8 @@ saw::error_or init( [&](auto& index){ info_f.at(index).set(4u); }, - {{dim_x-1u,0u}}, - {{dim_x, dim_y}}, + {{dim_x*N-1u,0u}}, + {{dim_x*N, dim_y*N}}, {{0u,1u}} ); // diff --git a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp index 35c04a4..71410b2 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp @@ -34,7 +34,7 @@ saw::error_or lbm_main(const saw::data& args){ } auto& lbm_dir = eo_lbm_dir.get_value(); - auto out_dir = lbm_dir / "stdkr_2d_gpu" / an.template get<"coupling">().stl_view(); + auto out_dir = lbm_dir / "stdkr_2d" / std::to_string(N) / an.template get<"coupling">().stl_view(); { std::error_code ec; @@ -118,7 +118,7 @@ saw::error_or lbm_main(const saw::data& args){ auto lsdm_view = make_view(lbm_sycl_macro_data); auto lsdp_view = make_view(lbm_sycl_particle_data); - saw::data time_steps{64u*1024ul}; + saw::data time_steps{64u*1024ul * N * N}; auto& info_f = lsd_view.template get<"info">(); @@ -140,7 +140,7 @@ saw::error_or lbm_main(const saw::data& args){ } } { - auto eov = write_vtk_file(out_dir,std::string{"ops_2d_"}+an.template get<"coupling">().stl_string(),i.get(), *lbm_macro_data_ptr); + auto eov = write_vtk_file(out_dir,std::string{"stdkr_2d_"}+std::to_string(N)+std::string{"_"}+an.template get<"coupling">().stl_string(),i.get(), *lbm_macro_data_ptr); if(eov.is_error()){ return eov; } @@ -150,7 +150,7 @@ saw::error_or lbm_main(const saw::data& args){ sycl_q.submit([&](acpp::sycl::handler& h){ component> stream; - h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](acpp::sycl::id idx){ + h.parallel_for(acpp::sycl::range{dim_x*N,dim_y*N}, [=](acpp::sycl::id idx){ saw::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); @@ -180,7 +180,7 @@ saw::error_or lbm_main(const saw::data& args){ } } { - auto eov = write_vtk_file(out_dir,std::string{"stdkr_2d_"}+an.template get<"coupling">().stl_string(),time_steps.get(), *lbm_macro_data_ptr); + auto eov = write_vtk_file(out_dir,std::string{"stdkr_2d_"}+std::to_string(N)+std::string{"_"}+an.template get<"coupling">().stl_string(),time_steps.get(), *lbm_macro_data_ptr); if(eov.is_error()){ return eov; } @@ -212,11 +212,11 @@ saw::error_or k_main(int argc, char** argv){ auto& coupling = an.template get<"coupling">(); if(coupling.stl_view() == "hlbm"){ - return lbm_main(args); + return lbm_main(args); } else if(coupling.stl_view() == "fplbm"){ - return lbm_main(args); + return lbm_main(args); } else if(coupling.stl_view() == "psm"){ - return lbm_main(args); + return lbm_main(args); } return saw::make_error("Invalid coupling"); diff --git a/examples/schaefer_turek_durst_krause_rannbacher/step.hpp b/examples/schaefer_turek_durst_krause_rannbacher/step.hpp index e88f262..3e5f9ba 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/step.hpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/step.hpp @@ -23,7 +23,7 @@ saw::error_or step( if constexpr ( std::is_same_v ){ q.submit([&](acpp::sycl::handler& h){ component> hlbm_reset; - h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](acpp::sycl::id idx){ + h.parallel_for(acpp::sycl::range{dim_x*N,dim_y*N}, [=](acpp::sycl::id idx){ saw::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); @@ -50,7 +50,7 @@ saw::error_or step( component> bb; component,encode::Sycl> flow_out{1.0}; - h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](acpp::sycl::id idx){ + h.parallel_for(acpp::sycl::range{dim_x*N,dim_y*N}, [=](acpp::sycl::id idx){ saw::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); @@ -96,7 +96,7 @@ saw::error_or step( }else if constexpr ( std::is_same_v ){ q.submit([&](acpp::sycl::handler& h){ component> fplbm_reset; - h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](acpp::sycl::id idx){ + h.parallel_for(acpp::sycl::range{dim_x*N,dim_y*N}, [=](acpp::sycl::id idx){ saw::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); @@ -126,7 +126,7 @@ saw::error_or step( component> bb; component,encode::Sycl> flow_out{1.0}; - h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](acpp::sycl::id idx){ + h.parallel_for(acpp::sycl::range{dim_x*N,dim_y*N}, [=](acpp::sycl::id idx){ saw::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); @@ -172,7 +172,7 @@ saw::error_or step( }else if constexpr ( std::is_same_v ){ q.submit([&](acpp::sycl::handler& h){ component> fplbm_reset; - h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](acpp::sycl::id idx){ + h.parallel_for(acpp::sycl::range{dim_x*N,dim_y*N}, [=](acpp::sycl::id idx){ saw::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); @@ -202,7 +202,7 @@ saw::error_or step( component> bb; component,encode::Sycl> flow_out{1.0}; - h.parallel_for(acpp::sycl::range{dim_x,dim_y}, [=](acpp::sycl::id idx){ + h.parallel_for(acpp::sycl::range{dim_x*N,dim_y*N}, [=](acpp::sycl::id idx){ saw::data> index; for(uint64_t i = 0u; i < Desc::D; ++i){ index.at({{i}}).set(idx[i]); -- cgit v1.3.1