From afc0998f10882af12c136cbffee85f40573f2b40 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Wed, 25 Mar 2026 13:40:32 +0100 Subject: Moving to finally implementing particles on gpu --- examples/settling_cubes_2d_ibm_gpu/sim.cpp | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'examples/settling_cubes_2d_ibm_gpu/sim.cpp') diff --git a/examples/settling_cubes_2d_ibm_gpu/sim.cpp b/examples/settling_cubes_2d_ibm_gpu/sim.cpp index 05a4a09..bb6ab59 100644 --- a/examples/settling_cubes_2d_ibm_gpu/sim.cpp +++ b/examples/settling_cubes_2d_ibm_gpu/sim.cpp @@ -53,13 +53,19 @@ using MacroStruct = Struct< //using ParticleArray = Array< // Particle //>; + +template +using ParticleGroups = Tuple< + ParticleGroup< + T,Desc::D + > +>; } template saw::error_or setup_initial_conditions( saw::data>& fields, - saw::data>& macros, - saw::data, particle_amount>>& particles + saw::data>& macros ){ auto& info_f = fields.template get<"info">(); // Set everything as walls @@ -111,7 +117,6 @@ template saw::error_or step( saw::data>,encode::Sycl>& fields, saw::data>,encode::Sycl>& macros, - saw::data, particle_amount>>& particles, saw::data t_i, device& dev ){ @@ -119,10 +124,6 @@ saw::error_or step( auto& info_f = fields.template get<"info">(); { - auto& p = particles.at({{0u}}); - - auto& p_coll = p.template get<"collision">(); - auto& p_rad = p_coll.template get<"radius">(); } @@ -204,7 +205,6 @@ saw::error_or lbm_main(int argc, char** argv){ // saw::data> meta{{dim_x,dim_y}}; auto lbm_data_ptr = saw::heap>>(); auto lbm_macro_data_ptr = saw::heap>>(); - auto lbm_particle_data_ptr = saw::heap, particle_amount>>>(); std::cout<<"Estimated Bytes: "<,sch::MacroStruct>().get()< lbm_main(int argc, char** argv){ sycl_q.wait(); { - auto eov = setup_initial_conditions(*lbm_data_ptr,*lbm_macro_data_ptr,*lbm_particle_data_ptr); + auto eov = setup_initial_conditions(*lbm_data_ptr,*lbm_macro_data_ptr); if(eov.is_error()){ return eov; } @@ -244,7 +244,6 @@ saw::error_or lbm_main(int argc, char** argv){ saw::data, encode::Sycl> lbm_sycl_data{sycl_q}; saw::data, encode::Sycl> lbm_sycl_macro_data{sycl_q}; - saw::data, particle_amount>, encode::Sycl> lbm_sycl_particle_data{sycl_q}; sycl_q.wait(); auto lsd_view = make_chunk_struct_view(lbm_sycl_data); @@ -261,12 +260,6 @@ saw::error_or lbm_main(int argc, char** argv){ 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(); saw::data time_steps{16u*4096ul}; @@ -275,7 +268,7 @@ saw::error_or lbm_main(int argc, char** argv){ for(saw::data i{0u}; i < time_steps and krun; ++i){ // BC + Collision { - auto eov = step(lsd_view,lsdm_view,*lbm_particle_data_ptr,i,dev); + auto eov = step(lsd_view,lsdm_view,i,dev); if(eov.is_error()){ return eov; } -- cgit v1.2.3 From 0a11f4fbdbdf62d153904c9ed7de6c82a8916b7d Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 26 Mar 2026 12:08:19 +0100 Subject: Dangling changes. Restructuring particle setup --- examples/settling_cubes_2d_ibm_gpu/sim.cpp | 35 ++++++++++++++++++------------ 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'examples/settling_cubes_2d_ibm_gpu/sim.cpp') diff --git a/examples/settling_cubes_2d_ibm_gpu/sim.cpp b/examples/settling_cubes_2d_ibm_gpu/sim.cpp index bb6ab59..aec8bb9 100644 --- a/examples/settling_cubes_2d_ibm_gpu/sim.cpp +++ b/examples/settling_cubes_2d_ibm_gpu/sim.cpp @@ -49,15 +49,10 @@ using MacroStruct = Struct< Member, "force"> >; -//template -//using ParticleArray = Array< -// Particle -//>; - template using ParticleGroups = Tuple< ParticleGroup< - T,Desc::D + T,Desc::D,sch::ParticleCollisionSpheroid > >; } @@ -65,7 +60,8 @@ using ParticleGroups = Tuple< template saw::error_or setup_initial_conditions( saw::data>& fields, - saw::data>& macros + saw::data>& macros, + saw::data>& particles ){ auto& info_f = fields.template get<"info">(); // Set everything as walls @@ -105,12 +101,20 @@ saw::error_or setup_initial_conditions( df_f.get_dims() ); - return saw::make_void(); -} + // Particles + { + saw::data> rad_p, dense_p; + rad_p.at({}).set(2.0); + dense_p.at({}).set(1); + auto& spheroid_group = particles.template get<0u>(); + spheroid_group = create_spheroid_particle_group( + rad_p, + dense_p, + {64u} + ); + } -template -void add_particles(saw::data>>& particles){ - ////// TODO + return saw::make_void(); } template @@ -129,6 +133,8 @@ saw::error_or step( // auto coll_ev = q.submit([&](acpp::sycl::handler& h){ + saw::data> force; + force.at({{1}}).set(-1.0); // Need nicer things to handle the flow. I see improvement here component> collision{0.8}; component> bb; @@ -205,7 +211,8 @@ saw::error_or lbm_main(int argc, char** argv){ // saw::data> meta{{dim_x,dim_y}}; auto lbm_data_ptr = saw::heap>>(); auto lbm_macro_data_ptr = saw::heap>>(); - + auto lbm_particles_data = saw::data>(); + std::cout<<"Estimated Bytes: "<,sch::MacroStruct>().get()< lbm_main(int argc, char** argv){ sycl_q.wait(); { - auto eov = setup_initial_conditions(*lbm_data_ptr,*lbm_macro_data_ptr); + auto eov = setup_initial_conditions(*lbm_data_ptr,*lbm_macro_data_ptr,lbm_particles_data); if(eov.is_error()){ return eov; } -- cgit v1.2.3 From 0311c4f846efba9f39ce6d1a3fd3a978efc5cdb3 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 26 Mar 2026 20:28:00 +0100 Subject: Fixing moving particle system --- examples/settling_cubes_2d_ibm_gpu/sim.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'examples/settling_cubes_2d_ibm_gpu/sim.cpp') diff --git a/examples/settling_cubes_2d_ibm_gpu/sim.cpp b/examples/settling_cubes_2d_ibm_gpu/sim.cpp index aec8bb9..3281239 100644 --- a/examples/settling_cubes_2d_ibm_gpu/sim.cpp +++ b/examples/settling_cubes_2d_ibm_gpu/sim.cpp @@ -164,7 +164,6 @@ saw::error_or step( }).wait(); - // Step /* q.submit([&](acpp::sycl::handler& h){ -- cgit v1.2.3