Commit dbfb7cf2 authored by Henry Weller's avatar Henry Weller
Browse files

SchaefferFrictionalStress: Updated with alphaMinFriction

Resolved bug-report http://openfoam.org/mantisbt/view.php?id=1831
parent 24c7a739
......@@ -115,6 +115,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -108,6 +108,7 @@ public:
virtual tmp<volScalarField> nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -104,6 +104,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......@@ -133,9 +134,9 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
volScalarField& nuf = tnu();
forAll (D, celli)
forAll(D, celli)
{
if (alpha1[celli] > alphaMax.value() - 5e-2)
if (alpha1[celli] > alphaMinFriction.value())
{
nuf[celli] =
0.5*pf[celli]*sin(phi_.value())
......
......@@ -96,6 +96,7 @@ public:
virtual tmp<volScalarField> nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -122,6 +122,7 @@ public:
virtual tmp<volScalarField> nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -519,6 +519,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
nut_ += frictionalStressModel_->nu
(
alpha,
alphaMinFriction_,
alphaMax_,
pf/rho,
D
......
......@@ -115,6 +115,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -108,6 +108,7 @@ public:
virtual tmp<volScalarField> nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -104,6 +104,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......@@ -133,9 +134,9 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
volScalarField& nuf = tnu();
forAll (D, celli)
forAll(D, celli)
{
if (alpha1[celli] > alphaMax.value() - 5e-2)
if (alpha1[celli] > alphaMinFriction.value())
{
nuf[celli] =
0.5*pf[celli]*sin(phi_.value())
......
......@@ -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
......@@ -96,6 +96,7 @@ public:
virtual tmp<volScalarField> nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -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
......@@ -122,6 +122,7 @@ public:
virtual tmp<volScalarField> nu
(
const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax,
const volScalarField& pf,
const volSymmTensorField& D
......
......@@ -515,6 +515,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
nut_ += frictionalStressModel_->nu
(
alpha,
alphaMinFriction_,
alphaMax_,
pf/rho,
D
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment