zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rearrange code in MeiLift to save some operations

Browse Source
This commit is contained in:
danielque
2017-08-28 12:32:11 +02:00
parent 6e23baba7f
commit 2230dcaa57
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lagrangian/cfdemParticle/subModels/forceModel/MeiLift/MeiLift.C
View File

@ -124,6 +124,7 @@ void MeiLift::setForce() const
scalar J_star(0); scalar J_star(0);
scalar Omega_eq(0); scalar Omega_eq(0);
scalar alphaStar(0); scalar alphaStar(0);
scalar epsilonSqr(0.0);
scalar epsilon(0); scalar epsilon(0);
scalar omega_star(0); scalar omega_star(0);
vector vorticity(0,0,0); vector vorticity(0,0,0);
@ -172,16 +173,16 @@ void MeiLift::setForce() const
Rep = ds*magUr/nuf; Rep = ds*magUr/nuf;
Rew = magVorticity*ds*ds/nuf; Rew = magVorticity*ds*ds/nuf;
alphaStar = magVorticity*ds/magUr/2.0; omega_star = magVorticity * ds / magUr;
epsilon = sqrt(2.0*alphaStar /Rep ); alphaStar = 0.5 * omega_star;
omega_star = 2.0*alphaStar; epsilonSqr = omega_star / Rep;
epsilon = sqrt(epsilonSqr);
//Basic model for the correction to the Saffman lift //Basic model for the correction to the Saffman lift
//Based on McLaughlin (1991) //Based on McLaughlin (1991)
if(epsilon < 0.1) if(epsilon < 0.1)
{ {
J_star = -140 *epsilon*epsilon*epsilon*epsilon*epsilon J_star = -140.0 * epsilonSqr * epsilonSqr * epsilon * log(1. / (epsilonSqr+SMALL));
*log( 1./(epsilon*epsilon+SMALL) );
} }
else if(epsilon > 20) else if(epsilon > 20)
{ {
@ -198,8 +199,9 @@ void MeiLift::setForce() const
//Second order terms given by Loth and Dorgan 2009 //Second order terms given by Loth and Dorgan 2009
if(useSecondOrderTerms_) if(useSecondOrderTerms_)
{ {
Omega_eq = omega_star/2.0*(1.0-0.0075*Rew)*(1.0-0.062*sqrt(Rep)-0.001*Rep); scalar sqrtRep = sqrt(Rep);
Cl_star=1.0-(0.675+0.15*(1.0+tanh(0.28*(omega_star/2.0-2.0))))*tanh(0.18*sqrt(Rep)); Cl_star = 1.0 - (0.675 + 0.15 * (1.0 + tanh(0.28 * (alphaStar - 2.0)))) * tanh(0.18 * sqrtRep);
Omega_eq = alphaStar * (1.0 - 0.0075 * Rew) * (1.0 - 0.062 * sqrtRep - 0.001 * Rep);
Cl += Omega_eq * Cl_star; Cl += Omega_eq * Cl_star;
} }