diff options
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | examples/meta/.nix/derivation.nix (renamed from examples/meta_2d/.nix/derivation.nix) | 0 | ||||
| -rw-r--r-- | examples/meta/SConscript (renamed from examples/meta_2d/SConscript) | 4 | ||||
| -rw-r--r-- | examples/meta/SConstruct (renamed from examples/meta_2d/SConstruct) | 0 | ||||
| -rw-r--r-- | examples/meta/meta.cpp | 96 | ||||
| -rw-r--r-- | examples/meta_2d/meta_2d.cpp | 36 | ||||
| -rw-r--r-- | examples/poiseulle_3d_gpu/sim.cpp | 2 | ||||
| -rw-r--r-- | examples/poiseulle_particles_2d_gpu/sim.cpp | 2 | ||||
| -rw-r--r-- | lib/core/c++/converter.hpp | 8 | ||||
| -rw-r--r-- | lib/core/c++/lbm.hpp | 24 |
10 files changed, 130 insertions, 44 deletions
diff --git a/default.nix b/default.nix index cc0a84c..81a03b4 100644 --- a/default.nix +++ b/default.nix @@ -132,7 +132,7 @@ in rec { inherit kel; }; - meta_2d = pkgs.callPackage ./examples/meta_2d/.nix/derivation.nix { + meta = pkgs.callPackage ./examples/meta/.nix/derivation.nix { inherit pname version stdenv forstio; inherit kel; }; diff --git a/examples/meta_2d/.nix/derivation.nix b/examples/meta/.nix/derivation.nix index 26706e6..26706e6 100644 --- a/examples/meta_2d/.nix/derivation.nix +++ b/examples/meta/.nix/derivation.nix diff --git a/examples/meta_2d/SConscript b/examples/meta/SConscript index f14fd77..066a741 100644 --- a/examples/meta_2d/SConscript +++ b/examples/meta/SConscript @@ -20,8 +20,8 @@ env.headers += examples_env.headers; # Cavity2D examples_objects = []; -examples_env.add_source_files(examples_objects, ['meta_2d.cpp'], shared=False); -examples_env.meta_2d = examples_env.Program('#bin/meta_2d', [examples_objects]); +examples_env.add_source_files(examples_objects, ['meta.cpp'], shared=False); +examples_env.meta_2d = examples_env.Program('#bin/meta', [examples_objects]); # Set Alias env.examples = [ diff --git a/examples/meta_2d/SConstruct b/examples/meta/SConstruct index a7201cb..a7201cb 100644 --- a/examples/meta_2d/SConstruct +++ b/examples/meta/SConstruct diff --git a/examples/meta/meta.cpp b/examples/meta/meta.cpp new file mode 100644 index 0000000..5d3aaa4 --- /dev/null +++ b/examples/meta/meta.cpp @@ -0,0 +1,96 @@ +#include <kel/lbm/lbm.hpp> + +#include <iostream> + +namespace sch { +using namespace saw::schema; + +using MetaArgsStruct = Struct< + Member<Float64, "dx">, + Member<Float64, "dt">, + Member<Float64, "kin_vis">, + Member<Float64, "char_vel">, + Member<Float64, "char_len"> +>; + +using MetaArgs = Args< + MetaArgsStruct, + Tuple<UInt64,UInt64> +>; +} + +template< + +saw::error_or<void> meta_main(int argc, char** argv){ + using namespace kel::lbm; + + std::string_view cfg_file_name = "config.json"; + if(argc > 1){ + cfg_file_name = argv[1]; + } + + saw::data<MetaArgs> args_dat; + { + saw::data<MetaArgs, saw::encode::Args> args_enc{argc,argv}; + saw::codec<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: + { + } + break; + case 2u: + { + switch(args_pos.get<1u>().get()){ + case 5u: + break; + case 9u: + break; + default: + return saw::make_error<saw::err::critical>("Second positional needs to be a valid velocity set"); + } + } + break; + case 3u: + { + + } + 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(); +} + +int main(int argc, char** argv){ + auto eov = meta_main(argc,argv); + if(eov.is_error()){ + auto& err = eov.get_error(); + + std::cerr<<"[Error]: "<<err.get_category(); + + auto err_msg = err.get_message(); + if(not err_msg.empty()){ + std::cerr<<" - "<<err_msg; + } + + std::cerr<<std::endl; + } + + return 0; +} diff --git a/examples/meta_2d/meta_2d.cpp b/examples/meta_2d/meta_2d.cpp deleted file mode 100644 index 6d19800..0000000 --- a/examples/meta_2d/meta_2d.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include <kel/lbm/lbm.hpp> - -#include <iostream> - -int main(int argc, char** argv){ - using namespace kel::lbm; - - std::string_view cfg_file_name = "config.json"; - if(argc > 1){ - cfg_file_name = argv[1]; - } - - auto eo_conf = load_lbm_config<sch::Float64,sch::Descriptor<2,9>>(cfg_file_name); - if(eo_conf.is_error()){ - auto& err = eo_conf.get_error(); - std::cerr<<"[Error]: "<<err.get_category(); - auto err_msg = err.get_message(); - if(!err_msg.empty()){ - std::cerr<<" - "<<err_msg; - } - std::cerr<<std::endl; - - return err.get_id(); - } - - auto& conf = eo_conf.get_value(); - - converter<sch::Float64> conv{ - {conf.template get<"delta_x">()}, - {conf.template get<"delta_t">()} - }; - - print_lbm_meta<sch::Float64,sch::Descriptor<2,9>>(conv, {conf.template get<"kinematic_viscosity">()}); - - return 0; -} diff --git a/examples/poiseulle_3d_gpu/sim.cpp b/examples/poiseulle_3d_gpu/sim.cpp index e7294e5..93df1f8 100644 --- a/examples/poiseulle_3d_gpu/sim.cpp +++ b/examples/poiseulle_3d_gpu/sim.cpp @@ -274,7 +274,7 @@ saw::error_or<void> lbm_main(int argc, char** argv){ {{1.0}} }; - print_lbm_meta<T,Desc>(conv,{0.1}); + print_lbm_meta<T,Desc>(conv,{0.1},{0.01},{1024.0}); 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>>>(); diff --git a/examples/poiseulle_particles_2d_gpu/sim.cpp b/examples/poiseulle_particles_2d_gpu/sim.cpp index ae197f9..01fec89 100644 --- a/examples/poiseulle_particles_2d_gpu/sim.cpp +++ b/examples/poiseulle_particles_2d_gpu/sim.cpp @@ -316,7 +316,7 @@ saw::error_or<void> lbm_main(int argc, char** argv){ {{1.0}} }; - print_lbm_meta<T,Desc>(conv,{0.01}); + print_lbm_meta<T,Desc>(conv,{0.01},{0.1},{1024.0}); // 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>>>(); diff --git a/lib/core/c++/converter.hpp b/lib/core/c++/converter.hpp index 5c19c68..4370a2c 100644 --- a/lib/core/c++/converter.hpp +++ b/lib/core/c++/converter.hpp @@ -50,6 +50,14 @@ public: return second_conv_*saw::data<sch::LbmSecond<T>>{1.0}; } + auto delta_v() const { + return (meter_conv_ / second_conv_) * saw::data<sch::LbmVelocity<T>>{1.0}; + } + + auto delta_a() const { + return (meter_conv_ / (second_conv_*second_conv_)) * saw::data<sch::LbmAcceleration<T>>{1.0}; + } + saw::data<sch::LbmMeter<T>> meter_si_to_lbm(const saw::data<sch::SiMeter<T>>& m_si) const { return m_si / meter_conv_; } diff --git a/lib/core/c++/lbm.hpp b/lib/core/c++/lbm.hpp index 27a7df3..a1e088e 100644 --- a/lib/core/c++/lbm.hpp +++ b/lib/core/c++/lbm.hpp @@ -26,15 +26,33 @@ namespace kel { namespace lbm { template<typename T, typename Desc> -void print_lbm_meta(const converter<T>& conv, const saw::data<sch::SiKinematicViscosity<T>>& kin_vis_si){ +void print_lbm_meta( + const converter<T>& conv, + const saw::data<sch::SiKinematicViscosity<T>>& kin_vis_si, + const saw::data<sch::SiVelocity<T>>& char_vel, + const saw::data<sch::SiMeter<T>>& char_len +){ std::cout - <<"[LBM Meta]\n" - <<"==========\n" + <<"[Meta]\n" + <<"======\n" + <<"Re: "<<(char_vel * char_len / kin_vis_si)<<"\n" + <<"Ma: "<<(char_vel * saw::data<typename saw::unit_division<sch::Pure<T>, sch::SiVelocity<T>>::Schema>{std::sqrt(df_info<T,Desc>::inv_cs2)})<<"\n" <<"\n" + <<"[SI]\n" + <<"====\n" <<"Δx: "<<conv.delta_x()<<"\n" <<"Δt: "<<conv.delta_t()<<"\n" + <<"Δv: "<<conv.delta_v()<<"\n" + <<"Δa: "<<conv.delta_a()<<"\n" <<"KinVis: "<<kin_vis_si<<"\n" + <<"CharV: "<<char_vel<<"\n" + <<"CharL: "<<char_len<<"\n" + <<"\n" + <<"[LBM]\n" + <<"=====\n" + <<"KinVis: "<<conv.kinematic_viscosity_si_to_lbm(kin_vis_si)<<"\n" <<"τ: "<<(saw::data<typename saw::unit_division<sch::Pure<T>, sch::LbmKinematicViscosity<T>>::Schema >{df_info<T,Desc>::inv_cs2} * conv.kinematic_viscosity_si_to_lbm(kin_vis_si) + saw::data<sch::Pure<T>>{0.5})<<"\n" + <<std::endl ; } } |