Skip to content
Snippets Groups Projects
Commit 4160491f authored by henry's avatar henry
Browse files

Added better clipping and removed x-permissions.

parent adb7d5fb
Branches
Tags
No related merge requests found
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
...@@ -51,9 +51,23 @@ namespace viscosityModels ...@@ -51,9 +51,23 @@ namespace viscosityModels
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::viscosityModels::powerLaw::calcNu() const Foam::viscosityModels::powerLaw::calcNu() const
{ {
dimensionedScalar tone("tone", dimTime, 1.0); return max
return (max(numin_, min(numax_, k_ (
* pow(tone * strainRate(), n_.value()- scalar(1.0))))); nuMin_,
min
(
nuMax_,
k_*pow
(
max
(
dimensionedScalar("one", dimTime, 1.0)*strainRate(),
dimensionedScalar("VSMALL", dimless, VSMALL)
),
n_.value() - scalar(1.0)
)
)
);
} }
...@@ -71,8 +85,8 @@ Foam::viscosityModels::powerLaw::powerLaw ...@@ -71,8 +85,8 @@ Foam::viscosityModels::powerLaw::powerLaw
powerLawCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")), powerLawCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
k_(powerLawCoeffs_.lookup("k")), k_(powerLawCoeffs_.lookup("k")),
n_(powerLawCoeffs_.lookup("n")), n_(powerLawCoeffs_.lookup("n")),
numin_(powerLawCoeffs_.lookup("numin")), nuMin_(powerLawCoeffs_.lookup("nuMin")),
numax_(powerLawCoeffs_.lookup("numax")), nuMax_(powerLawCoeffs_.lookup("nuMax")),
nu_ nu_
( (
IOobject IOobject
...@@ -101,8 +115,8 @@ bool Foam::viscosityModels::powerLaw::read ...@@ -101,8 +115,8 @@ bool Foam::viscosityModels::powerLaw::read
powerLawCoeffs_.lookup("k") >> k_; powerLawCoeffs_.lookup("k") >> k_;
powerLawCoeffs_.lookup("n") >> n_; powerLawCoeffs_.lookup("n") >> n_;
powerLawCoeffs_.lookup("numin") >> numin_; powerLawCoeffs_.lookup("nuMin") >> nuMin_;
powerLawCoeffs_.lookup("numax") >> numax_; powerLawCoeffs_.lookup("nuMax") >> nuMax_;
return true; return true;
} }
......
...@@ -61,8 +61,8 @@ class powerLaw ...@@ -61,8 +61,8 @@ class powerLaw
dimensionedScalar k_; dimensionedScalar k_;
dimensionedScalar n_; dimensionedScalar n_;
dimensionedScalar numin_; dimensionedScalar nuMin_;
dimensionedScalar numax_; dimensionedScalar nuMax_;
volScalarField nu_; volScalarField nu_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment