JohnsonJacksonFrictionalStress: alphaDeltaMax -> alphaDeltaMin (it is the lower limit)
This commit is contained in:
@ -62,7 +62,7 @@ JohnsonJackson
|
|||||||
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"))
|
alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_.lookup("alphaDeltaMin"))
|
||||||
{
|
{
|
||||||
phi_ *= constant::mathematical::pi/180.0;
|
phi_ *= constant::mathematical::pi/180.0;
|
||||||
}
|
}
|
||||||
@ -89,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, alphaDeltaMax_), p_);
|
/pow(max(alphaMax - alpha1, alphaDeltaMin_), p_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -107,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, alphaDeltaMax_), p_ + 1.0);
|
)/pow(max(alphaMax - alpha1, alphaDeltaMin_), p_ + 1.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ 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_);
|
alphaDeltaMin_.read(coeffDict_);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -69,8 +69,8 @@ class JohnsonJackson
|
|||||||
//- Angle of internal friction
|
//- Angle of internal friction
|
||||||
dimensionedScalar phi_;
|
dimensionedScalar phi_;
|
||||||
|
|
||||||
//- Limit of alphaMax - alpha1 (~5e-2 or higher)
|
//- Lower limit for (alphaMax - alpha1)
|
||||||
dimensionedScalar alphaDeltaMax_;
|
dimensionedScalar alphaDeltaMin_;
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|||||||
@ -45,7 +45,7 @@ RAS
|
|||||||
eta 2;
|
eta 2;
|
||||||
p 5;
|
p 5;
|
||||||
phi 28.5;
|
phi 28.5;
|
||||||
alphaDeltaMax 0.05;
|
alphaDeltaMin 0.05;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -44,7 +44,7 @@ RAS
|
|||||||
eta 2;
|
eta 2;
|
||||||
p 5;
|
p 5;
|
||||||
phi 28.5;
|
phi 28.5;
|
||||||
alphaDeltaMax 0.05;
|
alphaDeltaMin 0.05;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user