Merge branch 'dev'

1 files changed, 52 insertions, 24 deletions

diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp
index 4bc9dfb..bb81383 100644
--- a/examples/poiseulle_particles_2d_gpu/sim.cpp
+++ b/examples/poiseulle_particles_2d_gpu/sim.cpp
@@ -131,7 +131,7 @@ saw::error_or<void> setup_initial_conditions(
 			rho.at({}) = {1};
 			auto& vel = vel_f.at(index);
 			if(info_f.at(index).get() == 2u){
-				vel.at({{0u}}) = 0.01;
+				vel.at({{0u}}) = 0.0;
 			}
 			auto eq = equilibrium<T,Desc>(rho,vel);
 
@@ -259,22 +259,6 @@ saw::error_or<void> step(
 		});
 	}).wait();
 
-	q.submit([&](acpp::sycl::handler& h){
-		component<T,Desc,cmpt::Stream,encode::Sycl<saw::encode::Native>> stream;
-
-		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);
-			
-			if(info.get() > 0u){
-				stream.apply(fields,index,t_i);
-			}
-		});
-	}).wait();
 	
 	// Step
 	/*
@@ -353,6 +337,12 @@ saw::error_or<void> lbm_main(int argc, char** argv){
 			return eov;
 		}
 	}
+	{
+		auto eov = write_vtk_file(out_dir,"initial_state",0u,*lbm_data_ptr);
+		if(eov.is_error()){
+			return eov;
+		}
+	}
 
 	saw::data<sch::ChunkStruct<T,Desc>, encode::Sycl<saw::encode::Native>> lbm_sycl_data{sycl_q};
 	saw::data<sch::MacroStruct<T,Desc>, encode::Sycl<saw::encode::Native>> lbm_sycl_macro_data{sycl_q};
@@ -380,38 +370,76 @@ saw::error_or<void> lbm_main(int argc, char** argv){
 		}
 	}
 	sycl_q.wait();
-	saw::data<sch::UInt64> time_steps{4096ul};
+	saw::data<sch::UInt64> time_steps{32ul};
+
+	auto& info_f = lsd_view.template get<"info">();
 
 	for(saw::data<sch::UInt64> i{0u}; i < time_steps and krun; ++i){
+		// BC + Collision
 		{
-			auto eov = dev.copy_to_host(lbm_sycl_macro_data,*lbm_macro_data_ptr);
+			auto eov = step<T,Desc>(lsd_view,lsdm_view,*lbm_particle_data_ptr,i,dev);
 			if(eov.is_error()){
 				return eov;
 			}
 		}
+		sycl_q.wait();
 		{
 			{
-				auto eov = write_vtk_file(out_dir,"t",i.get(), *lbm_macro_data_ptr);
+				auto eov = dev.copy_to_host(lbm_sycl_macro_data,*lbm_macro_data_ptr);
+				if(eov.is_error()){
+					return eov;
+				}
+			}
+			{
+				auto eov = write_vtk_file(out_dir,"m",i.get(), *lbm_macro_data_ptr);
 				if(eov.is_error()){
 					return eov;
 				}
 			}
 		}
 		{
-			auto eov = step<T,Desc>(lsd_view,lsdm_view,*lbm_particle_data_ptr,i,dev);
-			if(eov.is_error()){
-				return eov;
+			{
+				auto eov = dev.copy_to_host(lbm_sycl_data,*lbm_data_ptr);
+				if(eov.is_error()){
+					return eov;
+				}
+			}
+			{
+				auto eov = write_csv_file(out_dir,"lbm",i.get(), *lbm_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;
+
+			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);
+				
+				if(info.get() > 0u){
+					stream.apply(lsd_view,index,i);
+				}
+			});
+		}).wait();
 		wait.poll();
 		if(print_status){
 			std::cout<<"Status: "<<i.get()<<" of "<<time_steps.get()<<" - "<<(i.template cast_to<sch::Float64>().get() * 100 / time_steps.get())<<"%"<<std::endl;
 			print_status = false;
 		}
+		print_progress_bar(i.get(), time_steps.get()-1u);
 	}
+
+	// After Loop
 	sycl_q.wait();
 	{
-		auto eov = write_vtk_file(out_dir,"t",time_steps.get(), *lbm_macro_data_ptr);
+		auto eov = write_vtk_file(out_dir,"m",time_steps.get(), *lbm_macro_data_ptr);
 		if(eov.is_error()){
 			return eov;
 		}