From fb3a5f5bcba542974cf2f3f1f401ec717e662942 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Mon, 27 Jul 2026 13:32:05 +0200
Subject: Cleaning up simulation setup

---
 examples/poiseulle_particles_2d_gpu/common.hpp |  2 +-
 examples/poiseulle_particles_2d_gpu/sim.cpp    | 16 ++++++++--------
 examples/poiseulle_particles_2d_gpu/step.hpp   |  5 +++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/examples/poiseulle_particles_2d_gpu/common.hpp b/examples/poiseulle_particles_2d_gpu/common.hpp
index 6c05b64..90b7687 100644
--- a/examples/poiseulle_particles_2d_gpu/common.hpp
+++ b/examples/poiseulle_particles_2d_gpu/common.hpp
@@ -55,7 +55,7 @@ using MacroStruct = Struct<
 >;
 
 template<typename T, typename Desc>
-using ParticleSpheroidGroup = ParticleGroup<T,Desc::D,coll::Spheroid<T>>;
+using ParticleSpheroidGroup = ParticleGroup<T,Desc::D,1u,coll::Spheroid<T>>;
 }
 
 }
diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp
index bb5787f..a4f08f0 100644
--- a/examples/poiseulle_particles_2d_gpu/sim.cpp
+++ b/examples/poiseulle_particles_2d_gpu/sim.cpp
@@ -22,7 +22,7 @@ using LbmArgs = Args<
 }
 
 template<typename T, typename Desc, typename Coll>
-saw::error_or<void> lbm_main(const saw::data<sch::LbmArgs>& args){
+saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){
 	using namespace kel::lbm;
 
 	using dfi = df_info<T,Desc>;
@@ -111,7 +111,6 @@ saw::error_or<void> lbm_main(const saw::data<sch::LbmArgs>& args){
 		}
 	}
 	sycl_q.wait();
-
 	auto lsd_view = make_view(lbm_sycl_data);
 	auto lsdm_view = make_view(lbm_sycl_macro_data);
 	auto lsdp_view = make_view(lbm_sycl_particle_data);
@@ -188,13 +187,13 @@ saw::error_or<void> lbm_main(const saw::data<sch::LbmArgs>& args){
 	return saw::make_void();
 }
 
-
 using FloatT = kel::lbm::sch::Float32;
+using DescT = kel::lbm::sch::D2Q9;
 
 saw::error_or<void> k_main(int argc, char** argv){
 	using namespace kel::lbm;
 	
-	saw::data<sch::LbmArgsStruct> args;
+	saw::data<args::LbmArgs> args;
 	{
 		auto eov = saw::parse_args(args,argc,argv);
 		return eov;
@@ -202,17 +201,18 @@ saw::error_or<void> k_main(int argc, char** argv){
 	auto& an = args.template get<"args">();
 	auto& coupling = an.template get<"coupling">();
 
-	if(coupling.view() == "hlbm"){
-		return lbm_main<T,Desc,method::Hlbm>(args);
+	if(coupling.stl_view() == "hlbm"){
+		return lbm_main<FloatT,DescT,method::Hlbm>(args);
 	//}else if(coupling.view() == "psm"){
-	//	return kmain<T,Desc,coupling::Psm>(args);
+	//	return kmain<FloatT,DescT,coupling::Psm>(args);
 	}
 
 	return saw::make_error<saw::err::critical>("Invalid coupling");
 }
 
+
 int main(int argc, char** argv){
-	auto eov = k_main<FloatT,kel::lbm::sch::D2Q9>(argc, argv);
+	auto eov = k_main(argc, argv);
 	if(eov.is_error()){
 		auto& err = eov.get_error();
 		std::cerr<<"[Error] "<<err.get_category();
diff --git a/examples/poiseulle_particles_2d_gpu/step.hpp b/examples/poiseulle_particles_2d_gpu/step.hpp
index aa0e382..c1b148f 100644
--- a/examples/poiseulle_particles_2d_gpu/step.hpp
+++ b/examples/poiseulle_particles_2d_gpu/step.hpp
@@ -18,13 +18,12 @@ saw::error_or<void> step(
 	auto& info_f = fields.template get<"info">();
 	auto& porous_f = macros.template get<"porosity">();
 
-	component<T,Desc,cmpt::HlbmParticle,encode::Sycl<saw::encode::Native>> particle;
+	// component<T,Desc,cmpt::HlbmOneParticle,encode::Sycl<saw::encode::Native>> particle;
 
 	// auto coll_ev = 
 	q.submit([&](acpp::sycl::handler& h){
 		component<T,Desc,cmpt::Hlbm,encode::Sycl<saw::encode::Native>> collision{0.8};
 		component<T,Desc,cmpt::BounceBack,encode::Sycl<saw::encode::Native>> bb;
-		component<T,Desc,cmpt::AntiBounceBack<0u>,encode::Sycl<saw::encode::Native>> abb;
 
 		saw::data<sch::Scalar<T>> rho_b;
 		rho_b.at({}) = 1.0;
@@ -77,11 +76,13 @@ saw::error_or<void> step(
 		});
 	}).wait();
 
+	/*
 	q.submit([&](acpp::sycl::handler& h){
 		h.parallel_for(acpp::sycl::range<1u>{1u}, [=](acpp::sycl::id<1u> idx){
 			particle.apply(fields,macros,particles,{{0u}},t_i);
 		});
 	}).wait();
+	*/
 	
 	// Step
 	/*
-- 
cgit v1.2.3