diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/meta/meta.cpp | 61 | ||||
| -rw-r--r-- | examples/poiseulle_particles_2d_gpu/sim.cpp | 25 |
2 files changed, 64 insertions, 22 deletions
diff --git a/examples/meta/meta.cpp b/examples/meta/meta.cpp index 5d3aaa4..a3ed7e7 100644 --- a/examples/meta/meta.cpp +++ b/examples/meta/meta.cpp @@ -1,7 +1,11 @@ #include <kel/lbm/lbm.hpp> +#include <forstio/codec/args.hpp> + #include <iostream> +namespace kel { +namespace lbm { namespace sch { using namespace saw::schema; @@ -17,9 +21,24 @@ using MetaArgs = Args< MetaArgsStruct, Tuple<UInt64,UInt64> >; + +using Prec = Float64; +} +} +} + +template<typename T, typename Desc> +saw::error_or<void> meta_lbm_info(const saw::data<kel::lbm::sch::MetaArgsStruct>& args_str){ + using namespace kel::lbm; + converter<T> conv{ + {args_str.template get<"dx">()}, + {args_str.template get<"dt">()} + }; + print_lbm_meta<T,Desc>(conv, {args_str.template get<"kin_vis">()},{args_str.template get<"char_vel">()},{args_str.template get<"char_len">()}); + + return saw::make_void(); } -template< saw::error_or<void> meta_main(int argc, char** argv){ using namespace kel::lbm; @@ -29,35 +48,44 @@ saw::error_or<void> meta_main(int argc, char** argv){ cfg_file_name = argv[1]; } - saw::data<MetaArgs> args_dat; + saw::data<sch::MetaArgs> args_dat; { - saw::data<MetaArgs, saw::encode::Args> args_enc{argc,argv}; - saw::codec<MetaArgs, saw::encode::Args> args_codec; + { + + } + saw::data<sch::MetaArgs, saw::encode::Args> args_enc{argc,argv}; + saw::codec<sch::MetaArgs, saw::encode::Args> args_codec; auto eov = args_codec.decode(args_enc,args_dat); if(eov.is_error()){ return eov; + } } auto& args_str = args_dat.template get<"args">(); auto& args_pos = args_dat.template get<"positionals">(); - converter<sch::Float64> conv{ - {args_str.template get<"delta_x">()}, - {args_str.template get<"delta_t">()} - }; switch(args_pos.get<0u>().get()){ case 1u: { + switch(args_pos.get<1u>().get()){ + case 3u: + meta_lbm_info<sch::Prec,sch::Descriptor<1u,3u>>(args_str); + break; + default: + return saw::make_error<saw::err::critical>("Second positional needs to be a valid velocity set"); + } } break; case 2u: { switch(args_pos.get<1u>().get()){ case 5u: + meta_lbm_info<sch::Prec,sch::Descriptor<2u,5u>>(args_str); break; case 9u: + meta_lbm_info<sch::Prec,sch::Descriptor<2u,9u>>(args_str); break; default: return saw::make_error<saw::err::critical>("Second positional needs to be a valid velocity set"); @@ -66,13 +94,26 @@ saw::error_or<void> meta_main(int argc, char** argv){ break; case 3u: { - + switch(args_pos.get<1u>().get()){ + case 7u: + return saw::make_error<saw::err::not_implemented>("D3Q7 Velocity Set is not implemented"); + // meta_lbm_info<sch::Prec,sch::Descriptor<3u,19u>>(args_str); + break; + case 19u: + return saw::make_error<saw::err::not_implemented>("D3Q17 Velocity Set is not implemented"); + // meta_lbm_info<sch::Prec,sch::Descriptor<3u,19u>>(args_str); + break; + case 27u: + meta_lbm_info<sch::Prec,sch::Descriptor<3u,27u>>(args_str); + break; + default: + return saw::make_error<saw::err::critical>("Second positional needs to be a valid velocity set"); + } } break; default: return saw::make_error<saw::err::critical>("First positional needs to be Dimension 1,2 or 3"); } - print_lbm_meta<sch::Float64,sch::Descriptor<2,9>>(conv, {args_str.template get<"kinematic_viscosity">()},{args_str.template get<"char_vel">()},{args_str.template get<"char_len">()}); return saw::make_void(); } diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp index 01fec89..1832965 100644 --- a/examples/poiseulle_particles_2d_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_gpu/sim.cpp @@ -10,9 +10,10 @@ namespace kel { namespace lbm { -constexpr uint64_t dim_x = 1024ul; constexpr uint64_t dim_y = 512ul; -constexpr uint64_t particle_size = 1ul; +constexpr uint64_t dim_x = dim_y * 20ul; + +constexpr uint64_t particle_amount = 1ul; namespace sch { using namespace saw::schema; @@ -60,7 +61,7 @@ template<typename T, typename Desc> saw::error_or<void> setup_initial_conditions( saw::data<sch::ChunkStruct<T,Desc>>& fields, saw::data<sch::MacroStruct<T,Desc>>& macros, - saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_size>>& particles + saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_amount>>& particles ){ auto& info_f = fields.template get<"info">(); auto& porous_f = macros.template get<"porosity">(); @@ -142,7 +143,7 @@ saw::error_or<void> setup_initial_conditions( iterator<Desc::D>::apply( [&](auto& index){ saw::data<sch::Vector<T,Desc::D>> middle, ind_vec; - middle.at({{0u}}) = dim_x * 0.5; + middle.at({{0u}}) = dim_x * 0.25; middle.at({{1u}}) = dim_y * 0.5; ind_vec.at({{0u}}) = index.at({{0u}}).template cast_to<T>(); @@ -150,7 +151,7 @@ saw::error_or<void> setup_initial_conditions( auto dist = middle - ind_vec; auto dist_2 = saw::math::dot(dist,dist); - if(dist_2.at({}).get() < 128*128){ + if(dist_2.at({}).get() < dim_y*dim_y*0.01){ porous_f.at(index).at({}) = 0.0; } }, @@ -158,14 +159,14 @@ saw::error_or<void> setup_initial_conditions( df_f.get_dims() ); - for(saw::data<sch::UInt64> i{0u}; i < saw::data<sch::UInt64>{particle_size}; ++i){ + for(saw::data<sch::UInt64> i{0u}; i < saw::data<sch::UInt64>{particle_amount}; ++i){ auto& part = particles.at(i); saw::data<sch::Vector<T,Desc::D>> pos; - pos.at({{0u}}) = dim_x * 0.5; + pos.at({{0u}}) = dim_x * 0.25; pos.at({{1u}}) = dim_y * 0.5; saw::data<sch::Scalar<T>> rad, dense, dt; - rad.at({}) = dim_y * 0.2; + rad.at({}) = dim_y * 0.1; dense.at({}) = 1.0; dt.at({}) = 1.0; part = create_spheroid_particle( @@ -182,7 +183,7 @@ template<typename T, typename Desc> saw::error_or<void> step( saw::data<sch::Ptr<sch::ChunkStruct<T,Desc>>,encode::Sycl<saw::encode::Native>>& fields, saw::data<sch::Ptr<sch::MacroStruct<T,Desc>>,encode::Sycl<saw::encode::Native>>& macros, - saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_size>>& particles, + saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_amount>>& particles, saw::data<sch::UInt64> t_i, device& dev ){ @@ -316,12 +317,12 @@ saw::error_or<void> lbm_main(int argc, char** argv){ {{1.0}} }; - print_lbm_meta<T,Desc>(conv,{0.01},{0.1},{1024.0}); + print_lbm_meta<T,Desc>(conv,{0.01},{0.01},{0.4 * dim_y}); // saw::data<sch::FixedArray<sch::UInt64,Desc::D>> meta{{dim_x,dim_y}}; auto lbm_data_ptr = saw::heap<saw::data<sch::ChunkStruct<T,Desc>>>(); auto lbm_macro_data_ptr = saw::heap<saw::data<sch::MacroStruct<T,Desc>>>(); - auto lbm_particle_data_ptr = saw::heap<saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_size>>>(); + auto lbm_particle_data_ptr = saw::heap<saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_amount>>>(); std::cout<<"Estimated Bytes: "<<memory_estimate<sch::ChunkStruct<T,Desc>,sch::MacroStruct<T,Desc>>().get()<<std::endl; @@ -355,7 +356,7 @@ saw::error_or<void> lbm_main(int argc, char** argv){ 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}; - saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_size>, encode::Sycl<saw::encode::Native>> lbm_sycl_particle_data{sycl_q}; + saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_amount>, encode::Sycl<saw::encode::Native>> lbm_sycl_particle_data{sycl_q}; sycl_q.wait(); auto lsd_view = make_chunk_struct_view(lbm_sycl_data); |