diff options
| -rw-r--r-- | examples/one_particle_sedimentation_2d/sim.cpp | 2 | ||||
| -rw-r--r-- | examples/one_particle_sedimentation_2d/step.hpp | 2 | ||||
| -rw-r--r-- | examples/schaefer_turek_durst_krause_rannbacher/sim.cpp | 4 | ||||
| -rw-r--r-- | modules/core/c++/fplbm.hpp | 2 |
4 files changed, 4 insertions, 6 deletions
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<void> lbm_main(const saw::data<args::LbmArgs>& 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<void> 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<void> lbm_main(const saw::data<args::LbmArgs>& 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<void> lbm_main(const saw::data<args::LbmArgs>& 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<T,Desc,cmpt::Stream,encode::Sycl<saw::encode::Native>> 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; |