diff options
| author | Claudius "keldu" Holeksa <mail@keldu.de> | 2026-07-20 16:40:17 +0200 |
|---|---|---|
| committer | Claudius "keldu" Holeksa <mail@keldu.de> | 2026-07-20 16:40:17 +0200 |
| commit | 7f3e504e27c4cef0fb290dce5c046dd299d73046 (patch) | |
| tree | 4c86d4b2a45879c2cc0f33d7a9e971b447366c14 | |
| parent | ed50ed014fd426566a7d7348d0197892d8f76361 (diff) | |
| parent | 5940a86f4c5ff39e6a1dbd5a33bf0782e30d58c0 (diff) | |
| download | libs-lbm-master.tar.gz | |
| -rw-r--r-- | modules/core/c++/hlbm.hpp | 4 | ||||
| -rw-r--r-- | modules/core/c++/particle.hpp | 2 | ||||
| -rw-r--r-- | modules/core/c++/particle/particle.hpp | 2 | ||||
| -rw-r--r-- | modules/core/tests/particles.cpp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/modules/core/c++/hlbm.hpp b/modules/core/c++/hlbm.hpp index 25b6bf0..6fce4ca 100644 --- a/modules/core/c++/hlbm.hpp +++ b/modules/core/c++/hlbm.hpp @@ -182,7 +182,9 @@ public: auto& pirb_acc = pirb.template get<"acceleration">(); pirb_acc = force_p; - verlet_step_lambda(part_spheroid_group,{{0u}},{{1u}}); + saw::data<sch::Scalar<T>> ts; + ts.at({}) = 1u; + verlet_step_lambda<T,Desc::D,1u,coll::Spheroid<T>>(part_spheroid_group,{{{0u}}},ts); // Check } diff --git a/modules/core/c++/particle.hpp b/modules/core/c++/particle.hpp index 691a74b..2c60884 100644 --- a/modules/core/c++/particle.hpp +++ b/modules/core/c++/particle.hpp @@ -26,7 +26,7 @@ public: // Compute forces // Update particle velocity - verlet_step_lambda<T,Descriptor::D>(p,{1.0}); + verlet_step_lambda_old<T,Descriptor::D>(p,{1.0}); // Update porosity over lattice nodes diff --git a/modules/core/c++/particle/particle.hpp b/modules/core/c++/particle/particle.hpp index 6d57930..29b08e6 100644 --- a/modules/core/c++/particle/particle.hpp +++ b/modules/core/c++/particle/particle.hpp @@ -171,7 +171,7 @@ constexpr auto verlet_step_lambda_old = [](saw::data<sch::Particle<T,D>>& partic }; template<typename T,uint64_t D,uint64_t PC, typename Coll> -constexpr auto verlet_step_lambda = [](saw::data<sch::ParticleGroup<T,D,PC,Coll>>& pgrp, saw::data<sch::FixedArray<T,1u>> index, saw::data<sch::Scalar<T>> time_step_delta){ +constexpr auto verlet_step_lambda = [](saw::data<sch::ParticleGroup<T,D,PC,Coll>>& pgrp, saw::data<sch::FixedArray<sch::UInt64,1u>> index, saw::data<sch::Scalar<T>> time_step_delta){ auto& parts = pgrp.template get<"particles">(); auto& particle = parts.at(index); diff --git a/modules/core/tests/particles.cpp b/modules/core/tests/particles.cpp index e060097..592c367 100644 --- a/modules/core/tests/particles.cpp +++ b/modules/core/tests/particles.cpp @@ -24,7 +24,7 @@ SAW_TEST("Verlet step 2D - Planar"){ saw::data<sch::Scalar<sch::T>> dt; dt.at({}).set(0.5); - lbm::verlet_step_lambda<sch::T,2u>(particle,dt); + lbm::verlet_step_lambda_old<sch::T,2u>(particle,dt); SAW_EXPECT(pos.at({{0}}).get() == 0.25, std::string{"Incorrect Pos X: "} + std::to_string(pos.at({{0}}).get())); SAW_EXPECT(pos.at({{1}}).get() == 0.0, std::string{"Incorrect Pos Y: "} + std::to_string(pos.at({{1}}).get())); |