zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SchaefferFrictionalStress: Updated with alphaMinFriction

Browse Source 
Resolved bug-report http://openfoam.org/mantisbt/view.php?id=1831
This commit is contained in:
Henry Weller
2015-08-19 16:30:51 +01:00
parent 545d00eb59
commit 30ef574d25
12 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
View File

@ -115,6 +115,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

1
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
View File

@ -108,6 +108,7 @@ public:
virtual tmp<volScalarField> nu virtual tmp<volScalarField> nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

5
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
View File

@ -104,6 +104,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D
@ -133,9 +134,9 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
volScalarField& nuf = tnu(); volScalarField& nuf = tnu();
forAll (D, celli) forAll(D, celli)
{ {
if (alpha1[celli] > alphaMax.value() - 5e-2) if (alpha1[celli] > alphaMinFriction.value())
{ {
nuf[celli] = nuf[celli] =
0.5*pf[celli]*sin(phi_.value()) 0.5*pf[celli]*sin(phi_.value())

1
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
View File

@ -96,6 +96,7 @@ public:
virtual tmp<volScalarField> nu virtual tmp<volScalarField> nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

1
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
View File

@ -122,6 +122,7 @@ public:
virtual tmp<volScalarField> nu virtual tmp<volScalarField> nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

1
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -519,6 +519,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
nut_ += frictionalStressModel_->nu nut_ += frictionalStressModel_->nu
( (
alpha, alpha,
alphaMinFriction_,
alphaMax_, alphaMax_,
pf/rho, pf/rho,
D D

1
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
View File

@ -115,6 +115,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

1
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
View File

@ -108,6 +108,7 @@ public:
virtual tmp<volScalarField> nu virtual tmp<volScalarField> nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

5
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
View File

@ -104,6 +104,7 @@ Foam::tmp<Foam::volScalarField>
Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D
@ -133,9 +134,9 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
volScalarField& nuf = tnu(); volScalarField& nuf = tnu();
forAll (D, celli) forAll(D, celli)
{ {
if (alpha1[celli] > alphaMax.value() - 5e-2) if (alpha1[celli] > alphaMinFriction.value())
{ {
nuf[celli] = nuf[celli] =
0.5*pf[celli]*sin(phi_.value()) 0.5*pf[celli]*sin(phi_.value())

3
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
View File

@ -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
@ -96,6 +96,7 @@ public:
virtual tmp<volScalarField> nu virtual tmp<volScalarField> nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

3
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
View File

@ -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
@ -122,6 +122,7 @@ public:
virtual tmp<volScalarField> nu virtual tmp<volScalarField> nu
( (
const volScalarField& alpha1, const volScalarField& alpha1,
const dimensionedScalar& alphaMinFriction,
const dimensionedScalar& alphaMax, const dimensionedScalar& alphaMax,
const volScalarField& pf, const volScalarField& pf,
const volSymmTensorField& D const volSymmTensorField& D

1
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -515,6 +515,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
nut_ += frictionalStressModel_->nu nut_ += frictionalStressModel_->nu
( (
alpha, alpha,
alphaMinFriction_,
alphaMax_, alphaMax_,
pf/rho, pf/rho,
D D