diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/core/c++/boundary.hpp | 8 | ||||
| -rw-r--r-- | lib/core/c++/particle/particle.hpp | 29 |
2 files changed, 22 insertions, 15 deletions
diff --git a/lib/core/c++/boundary.hpp b/lib/core/c++/boundary.hpp index 4dbbdf8..01ae7b5 100644 --- a/lib/core/c++/boundary.hpp +++ b/lib/core/c++/boundary.hpp @@ -211,12 +211,12 @@ public: if constexpr (Dir) { dfs_old.at({2u}) = dfs_old.at({1u}) + saw::data<FP>{2.0 / 3.0} * rho_vel_x; - dfs_old.at({6u}) = dfs_old.at({5u}) + saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({4u}) - dfs_old.at({3u})); - dfs_old.at({8u}) = dfs_old.at({7u}) + saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({3u}) - dfs_old.at({4u})); + dfs_old.at({6u}) = dfs_old.at({5u}) + saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({3u}) - dfs_old.at({4u})); + dfs_old.at({8u}) = dfs_old.at({7u}) + saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({4u}) - dfs_old.at({3u})); }else if constexpr (not Dir){ dfs_old.at({1u}) = dfs_old.at({2u}) - saw::data<FP>{2.0 / 3.0} * rho_vel_x; - dfs_old.at({5u}) = dfs_old.at({6u}) - saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({3u}) - dfs_old.at({4u})); - dfs_old.at({7u}) = dfs_old.at({8u}) - saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({4u}) - dfs_old.at({3u})); + dfs_old.at({5u}) = dfs_old.at({6u}) - saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({4u}) - dfs_old.at({3u})); + dfs_old.at({7u}) = dfs_old.at({8u}) - saw::data<FP>{1.0 / 6.0} * rho_vel_x + saw::data<FP>{0.5} * (dfs_old.at({3u}) - dfs_old.at({4u})); } } }; diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp index a95a173..c0d115f 100644 --- a/lib/core/c++/particle/particle.hpp +++ b/lib/core/c++/particle/particle.hpp @@ -1,8 +1,10 @@ #pragma once -#include <forstio/codec/data.hpp> -#include <forstio/codec/data_math.hpp> #include <forstio/codec/math.hpp> +#include <forstio/codec/data_math.hpp> +#include <forstio/codec/data.hpp> + +#include "../iterator.hpp" namespace kel { namespace lbm { @@ -52,25 +54,20 @@ using Particle = Struct< template<typename T, uint64_t D, typename CollisionType = ParticleCollisionSpheroid<T>> using ParticleGroup = Struct< - Member<Array<Float64,D>, "mask">, + Member<Array<T,D>, "mask">, Member<CollisionType, "collision">, Member<Scalar<T>, "mass">, Member<Array<Particle<T,D>>, "particles"> >; - -template<typename... PartGroups> -using ParticleGroupTuple = Tuple< - PartGroups... ->; - } template<typename T, uint64_t D> saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T>>> create_spheroid_particle_group( saw::data<sch::Scalar<T>> rad_p, - saw::data<sch::Scalar<T>> density_p + saw::data<sch::Scalar<T>> density_p, + const saw::data<sch::UInt64>& mask_resolution ){ - saw::data<sch::ParticleGroup<T,D>,sch::ParticleCollisionSpheroid<T>> part; + saw::data<sch::ParticleGroup<T,D,sch::ParticleCollisionSpheroid<T>>> part; auto& mask = part.template get<"mask">(); auto& collision = part.template get<"collision">(); @@ -92,6 +89,16 @@ saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T>>> create_sph static_assert(D == 0u or D > 3u, "Dimensions only supported for Dim 1,2 & 3."); } + saw::data<sch::FixedArray<sch::UInt64,D>> mask_dims; + for(uint64_t i = 0u; i < D; ++i){ + mask_dims.at({i}) = mask_resolution; + } + + mask = {mask_dims}; + iterator<D>::apply([&](const auto& index){ + + },{},mask_dims); + return part; } |