zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Andrew Heather
2017-08-07 11:54:44 +01:00
parent 8682e04765 20267c68b4
commit e0ebc8e973
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
View File

@ -63,7 +63,7 @@ Foam::dragModels::Ergun::~Ergun()
Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::CdRe() const Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::CdRe() const
{ {
return return
(4/3) (4.0/3.0)
*( *(
150 150
*max *max

2
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
View File

@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Gibilaro::CdRe() const
); );
return return
(4/3) (4.0/3.0)
*(17.3/alpha2 + 0.336*pair_.Re()) *(17.3/alpha2 + 0.336*pair_.Re())
*max(pair_.continuous(), pair_.continuous().residualAlpha()) *max(pair_.continuous(), pair_.continuous().residualAlpha())
*pow(alpha2, -2.8); *pow(alpha2, -2.8);

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
View File

@ -63,7 +63,7 @@ Foam::dragModels::Ergun::~Ergun()
Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::CdRe() const Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::CdRe() const
{ {
return return
(4/3) (4.0/3.0)
*( *(
150 150
*max *max

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
View File

@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::Gibilaro::CdRe() const
); );
return return
(4/3) (4.0/3.0)
*(17.3/alpha2 + 0.336*pair_.Re()) *(17.3/alpha2 + 0.336*pair_.Re())
*max(pair_.continuous(), pair_.continuous().residualAlpha()) *max(pair_.continuous(), pair_.continuous().residualAlpha())
*pow(alpha2, -2.8); *pow(alpha2, -2.8);

2
applications/utilities/preProcessing/wallFunctionTable/tabulatedWallFunction/SpaldingsLaw/SpaldingsLaw.C
View File

@ -91,7 +91,7 @@ void Foam::tabulatedWallFunctions::SpaldingsLaw::invertFunction()
( (
2*E_*uPlus 2*E_*uPlus
+ exp(kUPlus)*(kUPlus + 1) + exp(kUPlus)*(kUPlus + 1)
- 2/3*pow3(kUPlus) - 2.0/3.0*pow3(kUPlus)
- 1.5*sqr(kUPlus) - 1.5*sqr(kUPlus)
- 2*kUPlus - 2*kUPlus
- 1 - 1

4
src/functionObjects/utilities/thermoCoupleProbes/thermoCoupleProbes.C
View File

@ -128,13 +128,13 @@ void Foam::functionObjects::thermoCoupleProbes::derivatives
scalarField Re(rhoc*Uc*d_/muc); scalarField Re(rhoc*Uc*d_/muc);
scalarField Pr(Cpc*muc/kappac); scalarField Pr(Cpc*muc/kappac);
Pr = max(ROOTVSMALL, Pr); Pr = max(ROOTVSMALL, Pr);
scalarField Nu(2.0 + (0.4*sqrt(Re) + 0.06*pow(Re, 2/3))*pow(Pr, 0.4)); scalarField Nu(2.0 + (0.4*sqrt(Re) + 0.06*pow(Re, 2.0/3.0))*pow(Pr, 0.4));
scalarField htc(Nu*kappac/d_); scalarField htc(Nu*kappac/d_);
const scalar sigma = physicoChemical::sigma.value(); const scalar sigma = physicoChemical::sigma.value();
scalar area = 4*constant::mathematical::pi*sqr(0.5*d_); scalar area = 4*constant::mathematical::pi*sqr(0.5*d_);
scalar volume = (4/3)*constant::mathematical::pi*pow3(0.5*d_); scalar volume = (4.0/3.0)*constant::mathematical::pi*pow3(0.5*d_);
dydx = dydx =
(epsilon_*(G/4 - sigma*pow4(y))*area + htc*(Tc - y)*area) (epsilon_*(G/4 - sigma*pow4(y))*area + htc*(Tc - y)*area)

2
src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
View File

@ -315,7 +315,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::wetSplashInteraction
const scalar epsilon = 0.993 - theta*(1.76 - theta*(1.56 - theta*0.49)); const scalar epsilon = 0.993 - theta*(1.76 - theta*(1.56 - theta*0.49));
// Update parcel velocity // Update parcel velocity
U = -epsilon*(Un) + 5/7*(Ut); U = -epsilon*(Un) + 5.0/7.0*(Ut);
keepParticle = true; keepParticle = true;
return; return;