diff options
Diffstat (limited to 'examples/stdkr_2d_bgk')
| -rw-r--r-- | examples/stdkr_2d_bgk/common.hpp | 2 | ||||
| -rw-r--r-- | examples/stdkr_2d_bgk/init.hpp | 8 | ||||
| -rw-r--r-- | examples/stdkr_2d_bgk/sim.cpp | 4 | ||||
| -rw-r--r-- | examples/stdkr_2d_bgk/step.hpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/stdkr_2d_bgk/common.hpp b/examples/stdkr_2d_bgk/common.hpp index cac01fd..64fe124 100644 --- a/examples/stdkr_2d_bgk/common.hpp +++ b/examples/stdkr_2d_bgk/common.hpp @@ -57,7 +57,7 @@ using RhoChunk = Chunk<Scalar<T>, 0u, dim_x, dim_y>; template<typename T, typename Desc> using MacroStruct = Struct< - Member<VelChunk<T,Desc>, "momentum">, + Member<VelChunk<T,Desc>, "velocity">, Member<RhoChunk<T>, "density"> >; diff --git a/examples/stdkr_2d_bgk/init.hpp b/examples/stdkr_2d_bgk/init.hpp index 10edd9c..d37c8de 100644 --- a/examples/stdkr_2d_bgk/init.hpp +++ b/examples/stdkr_2d_bgk/init.hpp @@ -55,7 +55,7 @@ kel::lbm::error_or<void> init( // auto& df_f = fields.template get<"dfs_old">(); auto& rho_f = macros.template get<"density">(); - auto& vel_f = macros.template get<"momentum">(); + auto& vel_f = macros.template get<"velocity">(); iterator<Desc::D>::apply( [&](auto& index){ @@ -93,13 +93,13 @@ kel::lbm::error_or<void> init( [&](const auto& index){ auto& info = info_f.at(index); kel::lbm::data<sch::Scalar<T>> radius_p; - radius_p.at({}).set(conv.meter_si_to_lbm({{0.05}}).handle().get()); + radius_p.at({}).set(conv.meter_si_to_lbm({0.05}).handle().get()); kel::lbm::data<sch::Scalar<T>> dense_p; dense_p.at({}).set(1); kel::lbm::data<sch::Vector<T,Desc::D>> middle,ind_vec; - middle.at({{0u}}) = conv.meter_si_to_lbm({{0.16}}).handle(); - middle.at({{1u}}) = conv.meter_si_to_lbm({{0.2}}).handle(); + middle.at({{0u}}) = conv.meter_si_to_lbm({0.16}).handle(); + middle.at({{1u}}) = conv.meter_si_to_lbm({0.2}).handle(); for(uint64_t i{0u}; i < Desc::D; ++i){ ind_vec.at({{i}}) = index.at({i}).template cast_to<T>(); diff --git a/examples/stdkr_2d_bgk/sim.cpp b/examples/stdkr_2d_bgk/sim.cpp index 9b9b5a7..b388e3c 100644 --- a/examples/stdkr_2d_bgk/sim.cpp +++ b/examples/stdkr_2d_bgk/sim.cpp @@ -45,9 +45,9 @@ kel::lbm::error_or<void> lbm_main(const kel::lbm::data<args::LbmArgs>& args){ converter<T> conv { // delta_x - {{0.41 / dim_y}}, + {0.41 / dim_y}, // delta_t - {{1.067e-4}} + {1.067e-4} }; print_lbm_meta<T,Desc>(conv,{1e-3},{1e-4},{0.5 * dim_y}); diff --git a/examples/stdkr_2d_bgk/step.hpp b/examples/stdkr_2d_bgk/step.hpp index 67f8486..d7d4fd4 100644 --- a/examples/stdkr_2d_bgk/step.hpp +++ b/examples/stdkr_2d_bgk/step.hpp @@ -48,7 +48,7 @@ kel::lbm::error_or<void> step( kel::lbm::data<sch::Vector<T,Desc::D>> vel; { auto y_si = conv.meter_lbm_to_si(index.at({{1u}}).template cast_to<T>()).handle(); - vel.at({{0u}}) = conv.velocity_si_to_lbm({{static_cast<typename kel::lbm::native_data_type<T>::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}}).handle(); + vel.at({{0u}}) = conv.velocity_si_to_lbm({static_cast<typename kel::lbm::native_data_type<T>::type>((1.2 / 0.41) * y_si.get() - (1.2 / (0.41*0.41)) * y_si.get() * y_si.get())}).handle(); vel.at({{1u}}) = 0.0f; } return vel; |
