zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2017-09-01 16:42:56 +01:00
parent abbb897a41 937dba8c18
commit 9825b4889d
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -229,8 +229,7 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
vector USlip_AB = vector USlip_AB =
U_AB - (U_AB & rHat_AB)*rHat_AB U_AB - (U_AB & rHat_AB)*rHat_AB
+ (pA.omega() ^ (dAEff/2*-rHat_AB)) - ((dAEff/2*pA.omega() + dBEff/2*pB.omega()) ^ rHat_AB);
- (pB.omega() ^ (dBEff/2*rHat_AB));
scalar deltaT = this->owner().mesh().time().deltaTValue(); scalar deltaT = this->owner().mesh().time().deltaTValue();
@ -276,10 +275,7 @@ void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
} }
else else
{ {
fT_AB = fT_AB = - kT*tangentialOverlap_AB - etaT*USlip_AB;
-kT*tangentialOverlapMag
*tangentialOverlap_AB/tangentialOverlapMag
- etaT*USlip_AB;
} }
pA.f() += fT_AB; pA.f() += fT_AB;

7
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -142,10 +142,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
} }
else else
{ {
fT_PW = fT_PW = - kT*tangentialOverlap_PW - etaT*USlip_PW;
-kT*tangentialOverlapMag
*tangentialOverlap_PW/tangentialOverlapMag
- etaT*USlip_PW;
} }
p.f() += fT_PW; p.f() += fT_PW;