From 937dba8c18fddce9237a2111ff441253772f7e95 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Fri, 1 Sep 2017 13:42:33 +0100 Subject: [PATCH] PairCollision: Removed unnecessary operations Resolves bug report https://bugs.openfoam.org/view.php?id=2680 --- .../PairSpringSliderDashpot/PairSpringSliderDashpot.C | 10 +++------- .../WallSpringSliderDashpot/WallSpringSliderDashpot.C | 7 ++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C index 21064f7b85..ae4c8514bb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -229,8 +229,7 @@ void Foam::PairSpringSliderDashpot::evaluatePair vector USlip_AB = U_AB - (U_AB & rHat_AB)*rHat_AB - + (pA.omega() ^ (dAEff/2*-rHat_AB)) - - (pB.omega() ^ (dBEff/2*rHat_AB)); + - ((dAEff/2*pA.omega() + dBEff/2*pB.omega()) ^ rHat_AB); scalar deltaT = this->owner().mesh().time().deltaTValue(); @@ -276,10 +275,7 @@ void Foam::PairSpringSliderDashpot::evaluatePair } else { - fT_AB = - -kT*tangentialOverlapMag - *tangentialOverlap_AB/tangentialOverlapMag - - etaT*USlip_AB; + fT_AB = - kT*tangentialOverlap_AB - etaT*USlip_AB; } pA.f() += fT_AB; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C index f41e124836..a42aeb14b8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -142,10 +142,7 @@ void Foam::WallSpringSliderDashpot::evaluateWall } else { - fT_PW = - -kT*tangentialOverlapMag - *tangentialOverlap_PW/tangentialOverlapMag - - etaT*USlip_PW; + fT_PW = - kT*tangentialOverlap_PW - etaT*USlip_PW; } p.f() += fT_PW;