Skip to content
Snippets Groups Projects
Commit b9678a83 authored by Henry Weller's avatar Henry Weller
Browse files

alphatFixedDmdtWallBoilingWallFunction: Added relaxation

Patch provided by Juho Peltola
parent d5f8d691
Branches
Tags
1 merge request!25Merge foundation
...@@ -27,12 +27,11 @@ License ...@@ -27,12 +27,11 @@ License
#include "compressibleTurbulenceModel.H" #include "compressibleTurbulenceModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H"
#include "twoPhaseSystem.H" #include "twoPhaseSystem.H"
#include "phaseSystem.H"
#include "ThermalPhaseChangePhaseSystem.H" #include "ThermalPhaseChangePhaseSystem.H"
#include "MomentumTransferPhaseSystem.H" #include "MomentumTransferPhaseSystem.H"
#include "wallFvPatch.H" #include "wallFvPatch.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -131,6 +130,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField ...@@ -131,6 +130,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
Cmu_(0.09), Cmu_(0.09),
kappa_(0.41), kappa_(0.41),
E_(9.8), E_(9.8),
dmdtRelax_(1.0),
fixedDmdt_(0.0) fixedDmdt_(0.0)
{ {
checkType(); checkType();
...@@ -150,6 +150,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField ...@@ -150,6 +150,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)), Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
E_(dict.lookupOrDefault<scalar>("E", 9.8)), E_(dict.lookupOrDefault<scalar>("E", 9.8)),
dmdtRelax_(dict.lookupOrDefault<scalar>("dmdtRelax", 1.0)),
fixedDmdt_(dict.lookupOrDefault<scalar>("fixedDmdt", 0.0)) fixedDmdt_(dict.lookupOrDefault<scalar>("fixedDmdt", 0.0))
{} {}
...@@ -168,6 +169,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField ...@@ -168,6 +169,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
Cmu_(ptf.Cmu_), Cmu_(ptf.Cmu_),
kappa_(ptf.kappa_), kappa_(ptf.kappa_),
E_(ptf.E_), E_(ptf.E_),
dmdtRelax_(ptf.dmdtRelax_),
fixedDmdt_(ptf.fixedDmdt_) fixedDmdt_(ptf.fixedDmdt_)
{} {}
...@@ -183,6 +185,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField ...@@ -183,6 +185,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
Cmu_(awfpsf.Cmu_), Cmu_(awfpsf.Cmu_),
kappa_(awfpsf.kappa_), kappa_(awfpsf.kappa_),
E_(awfpsf.E_), E_(awfpsf.E_),
dmdtRelax_(awfpsf.dmdtRelax_),
fixedDmdt_(awfpsf.fixedDmdt_) fixedDmdt_(awfpsf.fixedDmdt_)
{} {}
...@@ -199,6 +202,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField ...@@ -199,6 +202,7 @@ alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
Cmu_(awfpsf.Cmu_), Cmu_(awfpsf.Cmu_),
kappa_(awfpsf.kappa_), kappa_(awfpsf.kappa_),
E_(awfpsf.E_), E_(awfpsf.E_),
dmdtRelax_(awfpsf.dmdtRelax_),
fixedDmdt_(awfpsf.fixedDmdt_) fixedDmdt_(awfpsf.fixedDmdt_)
{} {}
...@@ -328,7 +332,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() ...@@ -328,7 +332,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
alphatConv[faceI] = max(0.0, alphaEff - alphaw[faceI]); alphatConv[faceI] = max(0.0, alphaEff - alphaw[faceI]);
} }
dmdt_ = fixedDmdt_; dmdt_ = (1 - dmdtRelax_)*dmdt_ + dmdtRelax_*fixedDmdt_;
operator==(alphatConv); operator==(alphatConv);
...@@ -346,6 +350,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write ...@@ -346,6 +350,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl; os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl; os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl; os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
os.writeKeyword("dmdtRelax") << dmdtRelax_ << token::END_STATEMENT << nl;
os.writeKeyword("fixedDmdt") << fixedDmdt_ << token::END_STATEMENT << nl; os.writeKeyword("fixedDmdt") << fixedDmdt_ << token::END_STATEMENT << nl;
dmdt_.writeEntry("dmdt", os); dmdt_.writeEntry("dmdt", os);
writeEntry("value", os); writeEntry("value", os);
......
...@@ -73,7 +73,10 @@ class alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField ...@@ -73,7 +73,10 @@ class alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
//- E coefficient //- E coefficient
scalar E_; scalar E_;
//- E coefficient //- dmdt relaxationFactor
scalar dmdtRelax_;
//- Reference dmdt
scalar fixedDmdt_; scalar fixedDmdt_;
......
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