Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x
This commit is contained in:
commit
946a4f8a23
4 changed files with 8 additions and 8 deletions
|
|
@ -2,7 +2,7 @@
|
|||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
|
|
@ -110,7 +110,7 @@ Foam::forceSuSp Foam::ErgunWenYuDragForce<CloudType>::calcCoupled
|
|||
(
|
||||
vector::zero,
|
||||
(mass/p.rho())
|
||||
*(150.0*(1.0 - alphac) + 1.75*Re)*muc/(alphac*sqr(p.d()))
|
||||
*(150.0*(1.0 - alphac)/alphac + 1.75*Re)*muc/(alphac*sqr(p.d()))
|
||||
);
|
||||
}
|
||||
else
|
||||
|
|
@ -119,7 +119,7 @@ Foam::forceSuSp Foam::ErgunWenYuDragForce<CloudType>::calcCoupled
|
|||
(
|
||||
vector::zero,
|
||||
(mass/p.rho())
|
||||
*0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/sqr(p.d())
|
||||
*0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/(alphac*sqr(p.d()))
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
|
|
@ -123,7 +123,7 @@ Foam::forceSuSp Foam::PlessisMasliyahDragForce<CloudType>::calcCoupled
|
|||
(
|
||||
vector::zero,
|
||||
(mass/p.rho())
|
||||
*(A*(1.0 - alphac) + B*Re)*muc/(alphac*sqr(p.d()))
|
||||
*(A*(1.0 - alphac)/alphac + B*Re)*muc/(alphac*sqr(p.d()))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
|
|
@ -105,7 +105,7 @@ Foam::forceSuSp Foam::WenYuDragForce<CloudType>::calcCoupled
|
|||
(
|
||||
vector::zero,
|
||||
(mass/p.rho())
|
||||
*0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/sqr(p.d())
|
||||
*0.75*CdRe(alphac*Re)*muc*pow(alphac, -2.65)/(alphac*sqr(p.d()))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ solution
|
|||
active true;
|
||||
coupled true;
|
||||
transient yes;
|
||||
cellValueSourceCorrection on;
|
||||
cellValueSourceCorrection off;
|
||||
|
||||
maxCo 1.0;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue