Merge branch 'dev'HEADmaster

3 files changed, 5 insertions, 3 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);