From 939d110fdfc1ad5b075756dcd537b3635239260e Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Fri, 8 Aug 2025 22:00:04 +0200 Subject: Point where code works. Kinda --- c++/lbm.hpp | 2 +- c++/particle/particle.hpp | 11 ++++++----- c++/write_vtk.hpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'c++') diff --git a/c++/lbm.hpp b/c++/lbm.hpp index a874e95..36609bf 100644 --- a/c++/lbm.hpp +++ b/c++/lbm.hpp @@ -23,7 +23,7 @@ void print_lbm_meta(const converter& conv, const saw::data, sch::LbmKinematicViscosity>::Schema >{df_info::inv_cs2} * conv.kinematic_viscosity_si_to_lbm(kin_vis_si) + saw::data>{0.5})<<"\n" + <<"τ: "<<(saw::data, sch::LbmKinematicViscosity>::Schema >{df_info::inv_cs2} * conv.kinematic_viscosity_si_to_lbm(kin_vis_si) + saw::data>{0.5})<<"\n" ; } } diff --git a/c++/particle/particle.hpp b/c++/particle/particle.hpp index 3860966..a55b06e 100644 --- a/c++/particle/particle.hpp +++ b/c++/particle/particle.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include namespace kel { namespace lbm { @@ -9,12 +10,12 @@ using namespace saw::schema; template using ParticleRigidBody = Struct< - Member, "position">, - Member, "position_old">, + Member, "position">, + Member, "position_old">, Member, Member, - Member, "acceleration">, + Member, "acceleration">, Member >; @@ -47,10 +48,10 @@ private: auto tsd_squared = time_step_delta * time_step_delta; - saw::data> pos_new; + saw::data> pos_new; // Actual step for(uint64_t i = 0u; i < D; ++i){ - pos_new.at({i}) = saw::data{2.0} * pos.at({i}) - pos_old.at({i}) + acc.at({i}) * tsd_squared; + pos_new.at({{i}}) = saw::data{2.0} * pos.at({{i}}) - pos_old.at({{i}}) + acc.at({{i}}) * tsd_squared; } pos_old = pos; diff --git a/c++/write_vtk.hpp b/c++/write_vtk.hpp index f81136a..55d4401 100644 --- a/c++/write_vtk.hpp +++ b/c++/write_vtk.hpp @@ -101,7 +101,7 @@ struct lbm_vtk_writer...> , template static saw::error_or iterate_i(std::ostream& vtk_file, const saw::data...>, Dim>>& field){ - constexpr auto Lit = saw::parameter_key_pack_type::literal; + // constexpr auto Lit = saw::parameter_key_pack_type::literal; { auto eov = write_i(vtk_file, field); if(eov.is_error()){ -- cgit v1.2.3