Commit 3ebfa15a authored by Christoph Rettinger's avatar Christoph Rettinger

Merge branch 'fix_force_scaling' into 'master'

Fixed force scaling in first time step of some test cases See merge request !126
parents b6e20d58 d4ea3c82
Pipeline #10315 passed with stage
in 118 minutes 54 seconds
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment