Merge branch 'dev'

4 files changed, 85 insertions, 4 deletions

diff --git a/examples/schaefer_turek_durst_krause_rannbacher/common.hpp b/examples/schaefer_turek_durst_krause_rannbacher/common.hpp
index ec6f80f..be9a538 100644
--- a/examples/schaefer_turek_durst_krause_rannbacher/common.hpp
+++ b/examples/schaefer_turek_durst_krause_rannbacher/common.hpp
@@ -59,7 +59,8 @@ template<typename T, typename Desc>
 using MacroStruct = Struct<
 	Member<VelChunk<T,Desc>, "momentum">,
 	Member<RhoChunk<T>, "density">,
-	Member<ScalarChunk<T,Desc>, "porosity">
+	Member<ScalarChunk<T,Desc>, "porosity">,
+	Member<VelChunk<T,Desc>, "force">
 >;
 
 template<typename T, typename Desc>
diff --git a/examples/schaefer_turek_durst_krause_rannbacher/init.hpp b/examples/schaefer_turek_durst_krause_rannbacher/init.hpp
index aa4919b..af7eb89 100644
--- a/examples/schaefer_turek_durst_krause_rannbacher/init.hpp
+++ b/examples/schaefer_turek_durst_krause_rannbacher/init.hpp
@@ -95,10 +95,11 @@ saw::error_or<void> init(
 
 	{
 		saw::data<sch::Scalar<T>> radius_p;
-		radius_p.at({}).set(conv.meter_si_to_lbm({{0.16}}).handle().get());
+		radius_p.at({}).set(conv.meter_si_to_lbm({{0.05}}).handle().get());
+		std::cout<<"RADIUS: "<<radius_p.at({}).get()<<std::endl;
 		saw::data<sch::Scalar<T>> dense_p;
 		dense_p.at({}).set(1);
-		particles = create_spheroid_particle_group<T,Desc::D,1u>(radius_p, dense_p, {{16u}});
+		particles = create_spheroid_particle_group<T,Desc::D,1u>(radius_p, dense_p, {{64u}});
 		auto& parts = particles.template get<"particles">();
 
 		{
diff --git a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp
index 6113f6c..b41f850 100644
--- a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp
+++ b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp
@@ -111,6 +111,12 @@ saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){
 			return eov;
 		}
 	}
+	{
+		auto eov = dev.copy_to_device(*lbm_particle_data_ptr,lbm_sycl_particle_data);
+		if(eov.is_error()){
+			return eov;
+		}
+	}
 	sycl_q.wait();
 	auto lsd_view = make_view(lbm_sycl_data);
 	auto lsdm_view = make_view(lbm_sycl_macro_data);
@@ -178,7 +184,7 @@ saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){
 		}
 	}
 	{
-		auto eov = write_vtk_file(out_dir,"stdkr_2d",time_steps.get(), *lbm_macro_data_ptr);
+		auto eov = write_vtk_file(out_dir,std::string{"stdkr_2d_"}+an.template get<"coupling">().stl_string(),time_steps.get(), *lbm_macro_data_ptr);
 		if(eov.is_error()){
 			return eov;
 		}
diff --git a/examples/schaefer_turek_durst_krause_rannbacher/step.hpp b/examples/schaefer_turek_durst_krause_rannbacher/step.hpp
index 1a70f6a..1739edd 100644
--- a/examples/schaefer_turek_durst_krause_rannbacher/step.hpp
+++ b/examples/schaefer_turek_durst_krause_rannbacher/step.hpp
@@ -91,6 +91,79 @@ saw::error_or<void> step(
 			});
 		}).wait();
 	}else if constexpr ( std::is_same_v<Coll, method::FpLbm> ){
+		q.submit([&](acpp::sycl::handler& h){
+			component<T,Desc,cmpt::FpLbmReset,encode::Sycl<saw::encode::Native>> fplbm_reset;
+			h.parallel_for(acpp::sycl::range<Desc::D>{dim_x,dim_y}, [=](acpp::sycl::id<Desc::D> idx){
+				saw::data<sch::FixedArray<sch::UInt64,Desc::D>> index;
+				for(uint64_t i = 0u; i < Desc::D; ++i){
+					index.at({{i}}).set(idx[i]);
+				}
+				
+				fplbm_reset.apply(fields,macros,index,t_i);
+			});
+		}).wait();
+
+		q.submit([&](acpp::sycl::handler& h){
+			component<T,Desc,cmpt::FpLbmOneParticle,encode::Sycl<saw::encode::Native>> fplbm_one_part;
+
+			h.parallel_for(acpp::sycl::range<1u>{particle_amount}, [=](acpp::sycl::id<1u> idx){
+				saw::data<sch::FixedArray<sch::UInt64,1u>> index;
+				for(uint64_t i = 0u; i < 1u; ++i){
+					index.at({{i}}).set(idx[i]);
+				}
+
+				fplbm_one_part.apply(fields,macros,particles,index,t_i,{0u});
+			});
+		}).wait();
+
+		// auto coll_ev = 
+		q.submit([&](acpp::sycl::handler& h){
+			component<T,Desc,cmpt::BGK,encode::Sycl<saw::encode::Native>> bgk{0.8};
+			component<T,Desc,cmpt::FpLbm,encode::Sycl<saw::encode::Native>> collision{0.8};
+			component<T,Desc,cmpt::BounceBack,encode::Sycl<saw::encode::Native>> bb;
+
+			component<T,Desc,cmpt::ZouHeHorizontal<true>,encode::Sycl<saw::encode::Native>> flow_in{
+				[&](){
+					uint64_t target_t_i = 8u;
+					if(t_i.get() < target_t_i){
+						return 1.0 + (0.01 / target_t_i) * t_i.get();
+					}
+					return 1.01;
+				}()
+			};
+			component<T,Desc,cmpt::ZouHeHorizontal<false>,encode::Sycl<saw::encode::Native>> flow_out{1.0};
+
+			h.parallel_for(acpp::sycl::range<Desc::D>{dim_x,dim_y}, [=](acpp::sycl::id<Desc::D> idx){
+				saw::data<sch::FixedArray<sch::UInt64,Desc::D>> index;
+				for(uint64_t i = 0u; i < Desc::D; ++i){
+					index.at({{i}}).set(idx[i]);
+				}
+
+				auto info = info_f.at(index);
+				
+				switch(info.get()){
+					case 0u:
+					break;
+					case 1u:
+						bb.apply(fields,index,t_i);
+					break;
+					case 2u:
+						collision.apply(fields,macros,index,t_i);
+						break;
+					case 3u:
+						flow_in.apply(fields,index,t_i);
+						bgk.apply(fields,macros,index,t_i);
+						break;
+					case 4u:
+						flow_out.apply(fields,index,t_i);
+						bgk.apply(fields,macros,index,t_i);
+					break;
+					default:
+					break;
+				}
+			});
+		}).wait();
+	}else if constexpr ( std::is_same_v<Coll, method::Psm> ){
 	}
 
 	return saw::make_void();