mirror of
https://github.com/OpenFOAM/OpenFOAM-6.git
synced 2025-12-08 06:57:46 +00:00
twoPhaseEulerFoam JohnsonJacksonFrictionalStress: alphaDeltaMax now user input (previously hard-coded to 5e-2)
This commit is contained in:
@ -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-2014 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -61,7 +61,8 @@ JohnsonJackson
|
|||||||
Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_.lookup("Fr")),
|
Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_.lookup("Fr")),
|
||||||
eta_("eta", dimless, coeffDict_.lookup("eta")),
|
eta_("eta", dimless, coeffDict_.lookup("eta")),
|
||||||
p_("p", dimless, coeffDict_.lookup("p")),
|
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;
|
phi_ *= constant::mathematical::pi/180.0;
|
||||||
}
|
}
|
||||||
@ -88,7 +89,7 @@ frictionalPressure
|
|||||||
|
|
||||||
return
|
return
|
||||||
Fr_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_)
|
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)
|
eta_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_ - 1.0)
|
||||||
*(alphaMax-alpha1)
|
*(alphaMax-alpha1)
|
||||||
+ p_*pow(max(alpha1 - alphaMinFriction, scalar(0)), eta_)
|
+ 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_.read(coeffDict_);
|
||||||
phi_ *= constant::mathematical::pi/180.0;
|
phi_ *= constant::mathematical::pi/180.0;
|
||||||
|
|
||||||
|
alphaDeltaMax_.read(coeffDict_);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -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-2014 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -69,6 +69,9 @@ class JohnsonJackson
|
|||||||
//- Angle of internal friction
|
//- Angle of internal friction
|
||||||
dimensionedScalar phi_;
|
dimensionedScalar phi_;
|
||||||
|
|
||||||
|
//- Limit of alphaMax - alpha1 (~5e-2 or higher)
|
||||||
|
dimensionedScalar alphaDeltaMax_;
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|||||||
@ -45,6 +45,7 @@ RAS
|
|||||||
eta 2;
|
eta 2;
|
||||||
p 5;
|
p 5;
|
||||||
phi 28.5;
|
phi 28.5;
|
||||||
|
alphaDeltaMax 0.05;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -44,6 +44,7 @@ RAS
|
|||||||
eta 2;
|
eta 2;
|
||||||
p 5;
|
p 5;
|
||||||
phi 28.5;
|
phi 28.5;
|
||||||
|
alphaDeltaMax 0.05;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user