From d4ea3c82eb905837d8080b858a8c9fa405be6ce2 Mon Sep 17 00:00:00 2001
From: Christoph Rettinger <christoph.rettinger@fau.de>
Date: Fri, 6 Jul 2018 16:26:16 +0200
Subject: [PATCH] Fixed force scaling in first time step of some test cases
---
.../pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp | 2 +-
.../SettlingSphereMEMStaticRefinement.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp
index ed9c8da8c..9a8f53528 100644
--- a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp
@@ -561,7 +561,7 @@ int main( int argc, char **argv )
timeloop.addFuncAfterTimeStep(setForceTorqueOnBodiesFromCont2, "Force setting");
// average the force/torque by scaling it with factor 1/2 (except in first timestep, there it is 1, which it is initially)
- timeloop.addFuncAfterTimeStep( pe_coupling::ForceTorqueOnBodiesScaler(blocks, bodyStorageID, real_t(0.5)), "Force averaging");
+ timeloop.addFuncAfterTimeStep( SharedFunctor<pe_coupling::ForceTorqueOnBodiesScaler>(forceScaler), "Force averaging");
timeloop.addFuncAfterTimeStep( setForceScalingFactorToHalf, "Force scaling adjustment" );
// swap containers
diff --git a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
index b8cbd96b2..aa9ef62e7 100644
--- a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
@@ -634,7 +634,7 @@ int main( int argc, char **argv )
refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(setForceTorqueOnBodiesFromCont2), "Force setting", finestLevel);
// average the force/torque by scaling it with factor 1/2 (except in first timestep, there it is 1, which it is initially)
- refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(pe_coupling::ForceTorqueOnBodiesScaler(blocks, bodyStorageID, real_t(0.5))), "Force averaging", finestLevel);
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(SharedFunctor<pe_coupling::ForceTorqueOnBodiesScaler>(forceScaler)), "Force averaging", finestLevel);
refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(setForceScalingFactorToHalf), "Force scaling adjustment", finestLevel);
// swap containers
--
GitLab