From 576b566d09194e923f73e0aa5a576bfdb5cfe945 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 3 Sep 2026 13:42:38 +0200 Subject: Dangling --- .../schaefer_turek_durst_krause_rannbacher/sim.cpp | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'examples/schaefer_turek_durst_krause_rannbacher/sim.cpp') diff --git a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp index a152789..eeb1c54 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp @@ -46,19 +46,21 @@ saw::error_or lbm_main(const saw::data& args){ converter conv { // delta_x - {{0.41 / dim_y}}, + {{0.41 / (dim_y*N)}}, // delta_t - {{1.067e-4}} + {{3e-3/(N*N)}} }; - print_lbm_meta(conv,{1e-3},{1e-4},{0.5 * dim_y}); + print_lbm_meta(conv,{1e-3},{0.3},{0.1}); + + std::cout<<"Inflow free flow velocity: "<> meta{{dim_x,dim_y}}; - auto lbm_data_ptr = saw::heap>>(); - auto lbm_macro_data_ptr = saw::heap>>(); + auto lbm_data_ptr = saw::heap>>(); + auto lbm_macro_data_ptr = saw::heap>>(); auto lbm_particle_data_ptr = saw::heap>>(); - std::cout<<"Estimated Bytes: "<,sch::MacroStruct>().get()<,sch::MacroStruct>().get()< lbm_main(const saw::data& args){ sycl_q.wait(); { - auto eov = init(conv,*lbm_data_ptr,*lbm_macro_data_ptr,*lbm_particle_data_ptr); + auto eov = init(conv,*lbm_data_ptr,*lbm_macro_data_ptr,*lbm_particle_data_ptr); if(eov.is_error()){ return eov; } } - saw::data, encode::Sycl> lbm_sycl_data{sycl_q}; - saw::data, encode::Sycl> lbm_sycl_macro_data{sycl_q}; + saw::data, encode::Sycl> lbm_sycl_data{sycl_q}; + saw::data, encode::Sycl> lbm_sycl_macro_data{sycl_q}; saw::data, encode::Sycl> lbm_sycl_particle_data{sycl_q}; sycl_q.wait(); @@ -123,7 +125,7 @@ saw::error_or lbm_main(const saw::data& args){ for(saw::data i{0u}; i < time_steps and krun; ++i){ // BC + Collision { - auto eov = step(conv,lsd_view,lsdm_view,lsdp_view,i,dev); + auto eov = step(conv,lsd_view,lsdm_view,lsdp_view,i,dev); if(eov.is_error()){ return eov; } @@ -212,11 +214,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"); -- cgit v1.3.1 From 54dfad7ac102fe40d71d8818d77801160a7073c1 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Mon, 7 Sep 2026 13:36:54 +0200 Subject: FpLbm two way couple doing weird things --- examples/one_particle_sedimentation_2d/sim.cpp | 2 +- examples/one_particle_sedimentation_2d/step.hpp | 2 +- examples/schaefer_turek_durst_krause_rannbacher/sim.cpp | 4 +--- modules/core/c++/fplbm.hpp | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'examples/schaefer_turek_durst_krause_rannbacher/sim.cpp') diff --git a/examples/one_particle_sedimentation_2d/sim.cpp b/examples/one_particle_sedimentation_2d/sim.cpp index 8bf8205..0cb3ce0 100644 --- a/examples/one_particle_sedimentation_2d/sim.cpp +++ b/examples/one_particle_sedimentation_2d/sim.cpp @@ -145,7 +145,7 @@ saw::error_or lbm_main(const saw::data& args){ } } { - auto eov = write_csv_file(out_dir,"ops_2d",i.get(), *lbm_macro_data_ptr); + auto eov = write_vtk_file(out_dir,"ops_2d",i.get(), *lbm_macro_data_ptr); if(eov.is_error()){ return eov; } diff --git a/examples/one_particle_sedimentation_2d/step.hpp b/examples/one_particle_sedimentation_2d/step.hpp index 86064ae..c3a3b8a 100644 --- a/examples/one_particle_sedimentation_2d/step.hpp +++ b/examples/one_particle_sedimentation_2d/step.hpp @@ -175,7 +175,7 @@ saw::error_or step( index.at({{i}}).set(idx[i]); } - fplbm_one_part.apply(fields,macros,particles,index,t_i,{16u}); + fplbm_one_part.apply(fields,macros,particles,index,t_i,{32u}); }); }).wait(); diff --git a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp index eeb1c54..35c04a4 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp @@ -132,7 +132,6 @@ saw::error_or lbm_main(const saw::data& args){ } sycl_q.wait(); - /* if(i.get() % 64u == 0u){ { auto eov = dev.copy_to_host(lbm_sycl_macro_data,*lbm_macro_data_ptr); @@ -141,13 +140,12 @@ 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(),i.get(), *lbm_macro_data_ptr); + auto eov = write_vtk_file(out_dir,std::string{"ops_2d_"}+an.template get<"coupling">().stl_string(),i.get(), *lbm_macro_data_ptr); if(eov.is_error()){ return eov; } } } - */ // Stream sycl_q.submit([&](acpp::sycl::handler& h){ component> stream; diff --git a/modules/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp index f50cb1b..0ab7903 100644 --- a/modules/core/c++/fplbm.hpp +++ b/modules/core/c++/fplbm.hpp @@ -352,7 +352,7 @@ public: // vel_s is technically time the density of the particle? - force = ( vel_s - mom) * two * flip_por; + force = global_force_ * por + ( vel_s - mom) * two * flip_por; // force = (vel_s - mom) * flip_por / (flip_por / two + one); force_p = force_p - force; -- cgit v1.3.1