Merge branch 'master' of ssh://graham@hunt//home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
graham
2010-06-17 11:37:01 +01:00
4 changed files with 20 additions and 62 deletions

View File

@ -221,24 +221,13 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
{ {
label faceCellI = patch().faceCells()[faceI]; label faceCellI = patch().faceCells()[faceI];
scalar yPlus =
Cmu25*y[faceI]*sqrt(k[faceCellI])
/(muw[faceI]/rhow[faceI]);
epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]); epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
if (yPlus > yPlusLam_) G[faceCellI] =
{ (mutw[faceI] + muw[faceI])
G[faceCellI] = *magGradUw[faceI]
(mutw[faceI] + muw[faceI]) *Cmu25*sqrt(k[faceCellI])
*magGradUw[faceI] /(kappa_*y[faceI]);
*Cmu25*sqrt(k[faceCellI])
/(kappa_*y[faceI]);
}
else
{
G[faceCellI] = 0.0;
}
} }
fixedInternalValueFvPatchField<scalar>::updateCoeffs(); fixedInternalValueFvPatchField<scalar>::updateCoeffs();

View File

@ -223,28 +223,15 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
{ {
label faceCellI = patch().faceCells()[faceI]; label faceCellI = patch().faceCells()[faceI];
scalar yPlus =
Cmu25*y[faceI]*sqrt(k[faceCellI])
/(muw[faceI]/rhow[faceI]);
scalar omegaVis = 6.0*muw[faceI]/(rhow[faceI]*beta1_*sqr(y[faceI])); scalar omegaVis = 6.0*muw[faceI]/(rhow[faceI]*beta1_*sqr(y[faceI]));
scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]); scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog)); omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog));
if (yPlus > yPlusLam_) G[faceCellI] =
{ (mutw[faceI] + muw[faceI])
G[faceCellI] = *magGradUw[faceI]
(mutw[faceI] + muw[faceI]) *Cmu25*sqrt(k[faceCellI])
*magGradUw[faceI] /(kappa_*y[faceI]);
*Cmu25*sqrt(k[faceCellI])
/(kappa_*y[faceI]);
}
else
{
G[faceCellI] = 0.0;
}
} }
fixedInternalValueFvPatchField<scalar>::updateCoeffs(); fixedInternalValueFvPatchField<scalar>::updateCoeffs();

View File

@ -214,22 +214,13 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
{ {
label faceCellI = patch().faceCells()[faceI]; label faceCellI = patch().faceCells()[faceI];
scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]); epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
if (yPlus > yPlusLam_) G[faceCellI] =
{ (nutw[faceI] + nuw[faceI])
G[faceCellI] = *magGradUw[faceI]
(nutw[faceI] + nuw[faceI]) *Cmu25*sqrt(k[faceCellI])
*magGradUw[faceI] /(kappa_*y[faceI]);
*Cmu25*sqrt(k[faceCellI])
/(kappa_*y[faceI]);
}
else
{
G[faceCellI] = 0.0;
}
} }
fixedInternalValueFvPatchField<scalar>::updateCoeffs(); fixedInternalValueFvPatchField<scalar>::updateCoeffs();

View File

@ -219,26 +219,17 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
{ {
label faceCellI = patch().faceCells()[faceI]; label faceCellI = patch().faceCells()[faceI];
scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
scalar omegaVis = 6.0*nuw[faceI]/(beta1_*sqr(y[faceI])); scalar omegaVis = 6.0*nuw[faceI]/(beta1_*sqr(y[faceI]));
scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]); scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog)); omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog));
if (yPlus > yPlusLam_) G[faceCellI] =
{ (nutw[faceI] + nuw[faceI])
G[faceCellI] = *magGradUw[faceI]
(nutw[faceI] + nuw[faceI]) *Cmu25*sqrt(k[faceCellI])
*magGradUw[faceI] /(kappa_*y[faceI]);
*Cmu25*sqrt(k[faceCellI])
/(kappa_*y[faceI]);
}
else
{
G[faceCellI] = 0.0;
}
} }
fixedInternalValueFvPatchField<scalar>::updateCoeffs(); fixedInternalValueFvPatchField<scalar>::updateCoeffs();