diff options
Diffstat (limited to 'examples/schaefer_turek_durst_krause_rannbacher')
4 files changed, 51 insertions, 49 deletions
diff --git a/examples/schaefer_turek_durst_krause_rannbacher/common.hpp b/examples/schaefer_turek_durst_krause_rannbacher/common.hpp index a85cd50..59d2f9c 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/common.hpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/common.hpp @@ -19,6 +19,7 @@ namespace lbm { * viscosity 10^-3 * particle diameter 0.1m * position at (0.16m,0.2m) + * velocity of 0.3 m/s from 1.2/0.41 * x - 1.2/0.41² * x² at x=0.41/2 */ constexpr uint64_t dim_y = 41u; @@ -29,38 +30,39 @@ constexpr uint64_t particle_amount = 1ul; namespace sch { using namespace saw::schema; -using InfoChunk = Chunk<UInt8, 0u, dim_x, dim_y>; +template<uint64_t N> +using InfoChunk = Chunk<UInt8, 0u, dim_x*N, dim_y*N>; -template<typename T, typename Desc> -using DfChunk = Chunk<FixedArray<T,Desc::Q>, 1u, dim_x, dim_y>; +template<typename T, typename Desc, uint64_t N> +using DfChunk = Chunk<FixedArray<T,Desc::Q>, 1u, dim_x*N, dim_y*N>; -template<typename T, typename Desc> -using ScalarChunk = Chunk<Scalar<T>, 0u, dim_x, dim_y>; +template<typename T, typename Desc, uint64_t N> +using ScalarChunk = Chunk<Scalar<T>, 0u, dim_x*N, dim_y*N>; -template<typename T, typename Desc> -using VectorChunk = Chunk<Vector<T,Desc::D>, 0u, dim_x, dim_y>; +template<typename T, typename Desc, uint64_t N> +using VectorChunk = Chunk<Vector<T,Desc::D>, 0u, dim_x*N, dim_y*N>; -template<typename T, typename Desc> +template<typename T, typename Desc, uint64_t N = 1u> using ChunkStruct = Struct< - Member<InfoChunk, "info">, - Member<DfChunk<T,Desc>, "dfs">, - Member<DfChunk<T,Desc>, "dfs_old">, - Member<VectorChunk<T,Desc>, "particle_N">, - Member<ScalarChunk<T,Desc>, "particle_D"> + Member<InfoChunk<N>, "info">, + Member<DfChunk<T,Desc,N>, "dfs">, + Member<DfChunk<T,Desc,N>, "dfs_old">, + Member<VectorChunk<T,Desc,N>, "particle_N">, + Member<ScalarChunk<T,Desc,N>, "particle_D"> >; -template<typename T, typename Desc> -using VelChunk = Chunk<Vector<T,Desc::D>, 0u, dim_x, dim_y>; +template<typename T, typename Desc, uint64_t N> +using VelChunk = Chunk<Vector<T,Desc::D>, 0u, dim_x*N, dim_y*N>; -template<typename T> -using RhoChunk = Chunk<Scalar<T>, 0u, dim_x, dim_y>; +template<typename T, uint64_t N> +using RhoChunk = Chunk<Scalar<T>, 0u, dim_x*N, dim_y*N>; -template<typename T, typename Desc> +template<typename T, typename Desc, uint64_t N = 1u> using MacroStruct = Struct< - Member<VelChunk<T,Desc>, "momentum">, - Member<RhoChunk<T>, "density">, - Member<ScalarChunk<T,Desc>, "porosity">, - Member<VelChunk<T,Desc>, "force"> + Member<VelChunk<T,Desc,N>, "momentum">, + Member<RhoChunk<T,N>, "density">, + Member<ScalarChunk<T,Desc,N>, "porosity">, + Member<VelChunk<T,Desc,N>, "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 af7eb89..96e2917 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/init.hpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/init.hpp @@ -5,11 +5,11 @@ namespace kel { namespace lbm { -template<typename T, typename Desc, typename Coll> +template<typename T, typename Desc, typename Coll, uint64_t N> saw::error_or<void> init( const converter<T>& conv, - saw::data<sch::ChunkStruct<T,Desc>>& fields, - saw::data<sch::MacroStruct<T,Desc>>& macros, + saw::data<sch::ChunkStruct<T,Desc,N>>& fields, + saw::data<sch::MacroStruct<T,Desc,N>>& macros, saw::data<sch::ParticleSpheroidGroup<T,Desc>>& particles ){ (void) conv; diff --git a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp index a152789..35c04a4 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/sim.cpp @@ -46,19 +46,21 @@ saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){ converter<T> conv { // delta_x - {{0.41 / dim_y}}, + {{0.41 / (dim_y*N)}}, // delta_t - {{1.067e-4}} + {{3e-3/(N*N)}} }; - print_lbm_meta<T,Desc>(conv,{1e-3},{1e-4},{0.5 * dim_y}); + print_lbm_meta<T,Desc>(conv,{1e-3},{0.3},{0.1}); + + std::cout<<"Inflow free flow velocity: "<<conv.velocity_si_to_lbm({0.3}).handle().get()<<std::endl; // 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_data_ptr = saw::heap<saw::data<sch::ChunkStruct<T,Desc,N>>>(); + auto lbm_macro_data_ptr = saw::heap<saw::data<sch::MacroStruct<T,Desc,N>>>(); auto lbm_particle_data_ptr = saw::heap<saw::data<sch::ParticleSpheroidGroup<T,Desc>>>(); - std::cout<<"Estimated Bytes: "<<memory_estimate<sch::ChunkStruct<T,Desc>,sch::MacroStruct<T,Desc>>().get()<<std::endl; + std::cout<<"Estimated Bytes: "<<memory_estimate<sch::ChunkStruct<T,Desc,N>,sch::MacroStruct<T,Desc,N>>().get()<<std::endl; auto eo_aio = saw::setup_async_io(); if(eo_aio.is_error()){ @@ -82,14 +84,14 @@ saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){ sycl_q.wait(); { - auto eov = init<T,Desc,Coll>(conv,*lbm_data_ptr,*lbm_macro_data_ptr,*lbm_particle_data_ptr); + auto eov = init<T,Desc,Coll,N>(conv,*lbm_data_ptr,*lbm_macro_data_ptr,*lbm_particle_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}; + saw::data<sch::ChunkStruct<T,Desc,N>, encode::Sycl<saw::encode::Native>> lbm_sycl_data{sycl_q}; + saw::data<sch::MacroStruct<T,Desc,N>, encode::Sycl<saw::encode::Native>> lbm_sycl_macro_data{sycl_q}; saw::data<sch::ParticleSpheroidGroup<T,Desc>, encode::Sycl<saw::encode::Native>> lbm_sycl_particle_data{sycl_q}; sycl_q.wait(); @@ -123,14 +125,13 @@ saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){ for(saw::data<sch::UInt64> i{0u}; i < time_steps and krun; ++i){ // BC + Collision { - auto eov = step<T,Desc,Coll>(conv,lsd_view,lsdm_view,lsdp_view,i,dev); + auto eov = step<T,Desc,Coll,N>(conv,lsd_view,lsdm_view,lsdp_view,i,dev); if(eov.is_error()){ return eov; } } sycl_q.wait(); - /* if(i.get() % 64u == 0u){ { auto eov = dev.copy_to_host(lbm_sycl_macro_data,*lbm_macro_data_ptr); @@ -139,13 +140,12 @@ saw::error_or<void> lbm_main(const saw::data<args::LbmArgs>& args){ } } { - auto eov = write_vtk_file(out_dir,std::string{"stdkr_2d_"}+an.template get<"coupling">().stl_string(),i.get(), *lbm_macro_data_ptr); + auto eov = write_vtk_file(out_dir,std::string{"ops_2d_"}+an.template get<"coupling">().stl_string(),i.get(), *lbm_macro_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; @@ -212,11 +212,11 @@ saw::error_or<void> k_main(int argc, char** argv){ auto& coupling = an.template get<"coupling">(); if(coupling.stl_view() == "hlbm"){ - return lbm_main<FloatT,DescT,method::Hlbm,1u>(args); + return lbm_main<FloatT,DescT,method::Hlbm,2u>(args); } else if(coupling.stl_view() == "fplbm"){ - return lbm_main<FloatT,DescT,method::FpLbm,1u>(args); + return lbm_main<FloatT,DescT,method::FpLbm,2u>(args); } else if(coupling.stl_view() == "psm"){ - return lbm_main<FloatT,DescT,method::Psm,1u>(args); + return lbm_main<FloatT,DescT,method::Psm,2u>(args); } return saw::make_error<saw::err::critical>("Invalid coupling"); diff --git a/examples/schaefer_turek_durst_krause_rannbacher/step.hpp b/examples/schaefer_turek_durst_krause_rannbacher/step.hpp index 9a75e6f..e88f262 100644 --- a/examples/schaefer_turek_durst_krause_rannbacher/step.hpp +++ b/examples/schaefer_turek_durst_krause_rannbacher/step.hpp @@ -5,11 +5,11 @@ namespace kel { namespace lbm { -template<typename T, typename Desc, typename Coll> +template<typename T, typename Desc, typename Coll, uint64_t N> saw::error_or<void> step( const converter<T>& conv, - 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::Ptr<sch::ChunkStruct<T,Desc,N>>,encode::Sycl<saw::encode::Native>>& fields, + saw::data<sch::Ptr<sch::MacroStruct<T,Desc,N>>,encode::Sycl<saw::encode::Native>>& macros, saw::data<sch::Ptr<sch::ParticleSpheroidGroup<T,Desc>>,encode::Sycl<saw::encode::Native>>& particles, saw::data<sch::UInt64> t_i, device& dev @@ -46,7 +46,7 @@ saw::error_or<void> step( }).wait(); q.submit([&](acpp::sycl::handler& h){ - component<T,Desc,cmpt::Hlbm,encode::Sycl<saw::encode::Native>> collision{1.0}; + component<T,Desc,cmpt::Hlbm,encode::Sycl<saw::encode::Native>> collision{0.59}; component<T,Desc,cmpt::BounceBack,encode::Sycl<saw::encode::Native>> bb; component<T,Desc,cmpt::ZouHeHorizontal<false>,encode::Sycl<saw::encode::Native>> flow_out{1.0}; @@ -121,8 +121,8 @@ saw::error_or<void> step( // auto coll_ev = q.submit([&](acpp::sycl::handler& h){ - component<T,Desc,cmpt::BGK,encode::Sycl<saw::encode::Native>> bgk{1.0}; - component<T,Desc,cmpt::FpLbm,encode::Sycl<saw::encode::Native>> collision{1.0}; + component<T,Desc,cmpt::BGK,encode::Sycl<saw::encode::Native>> bgk{0.59}; + component<T,Desc,cmpt::FpLbm,encode::Sycl<saw::encode::Native>> collision{0.59}; component<T,Desc,cmpt::BounceBack,encode::Sycl<saw::encode::Native>> bb; component<T,Desc,cmpt::ZouHeHorizontal<false>,encode::Sycl<saw::encode::Native>> flow_out{1.0}; @@ -197,8 +197,8 @@ saw::error_or<void> step( // auto coll_ev = q.submit([&](acpp::sycl::handler& h){ - component<T,Desc,cmpt::BGK,encode::Sycl<saw::encode::Native>> bgk{1.0}; - component<T,Desc,cmpt::Psm,encode::Sycl<saw::encode::Native>> collision{1.0}; + component<T,Desc,cmpt::BGK,encode::Sycl<saw::encode::Native>> bgk{0.59}; + component<T,Desc,cmpt::Psm,encode::Sycl<saw::encode::Native>> collision{0.59}; component<T,Desc,cmpt::BounceBack,encode::Sycl<saw::encode::Native>> bb; component<T,Desc,cmpt::ZouHeHorizontal<false>,encode::Sycl<saw::encode::Native>> flow_out{1.0}; |