twoPhaseEulerFoam JohnsonJacksonFrictionalStress: alphaDeltaMax now user input (previously hard-coded to 5e-2)

This commit is contained in:
Henry 2015-03-18 15:03:10 +00:00
parent fb84761ef8
commit 2e35cc76e8
4 changed files with 13 additions and 5 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -61,7 +61,8 @@ JohnsonJackson
Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_.lookup("Fr")),
eta_("eta", dimless, coeffDict_.lookup("eta")),
p_("p", dimless, coeffDict_.lookup("p")),
phi_("phi", dimless, coeffDict_.lookup("phi"))
phi_("phi", dimless, coeffDict_.lookup("phi")),
alphaDeltaMax_("alphaDeltaMax", dimless, coeffDict_.lookup("alphaDeltaMax"))
{
phi_ *= constant::mathematical::pi/180.0;
}
@ -88,7 +89,7 @@ frictionalPressure
return
Fr_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_)
/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p_);
/pow(max(alphaMax - alpha1, alphaDeltaMax_), p_);
}
@ -106,7 +107,7 @@ frictionalPressurePrime
eta_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_ - 1.0)
*(alphaMax-alpha1)
+ p_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_)
)/pow(max(alphaMax - alpha1, scalar(5.0e-2)), p_ + 1.0);
)/pow(max(alphaMax - alpha1, alphaDeltaMax_), p_ + 1.0);
}
@ -134,6 +135,8 @@ bool Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::read()
phi_.read(coeffDict_);
phi_ *= constant::mathematical::pi/180.0;
alphaDeltaMax_.read(coeffDict_);
return true;
}

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,6 +69,9 @@ class JohnsonJackson
//- Angle of internal friction
dimensionedScalar phi_;
//- Limit of alphaMax - alpha1 (~5e-2 or higher)
dimensionedScalar alphaDeltaMax_;
public:

View File

@ -45,6 +45,7 @@ RAS
eta 2;
p 5;
phi 28.5;
alphaDeltaMax 0.05;
}
}

View File

@ -44,6 +44,7 @@ RAS
eta 2;
p 5;
phi 28.5;
alphaDeltaMax 0.05;
}
}