Merge remote-tracking branch 'origin/nr/HenrikRusche' into nextRelease
This commit is contained in:
commit
4fb2706fe8
6 changed files with 12 additions and 12 deletions
|
@ -140,10 +140,10 @@ updateCoeffs()
|
||||||
}
|
}
|
||||||
|
|
||||||
const fvPatchVectorField& Up =
|
const fvPatchVectorField& Up =
|
||||||
patch().lookupPatchField<volVectorField, vector>(UName_);
|
lookupPatchField<volVectorField, vector>(UName_);
|
||||||
|
|
||||||
const fvsPatchScalarField& phip =
|
const fvsPatchScalarField& phip =
|
||||||
patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
||||||
|
|
||||||
this->refValue() = SMALL + 1.5*sqr(intensity_)*magSqr(Up);
|
this->refValue() = SMALL + 1.5*sqr(intensity_)*magSqr(Up);
|
||||||
this->valueFraction() = neg(phip);
|
this->valueFraction() = neg(phip);
|
||||||
|
|
|
@ -136,10 +136,10 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
|
||||||
const scalar Cmu75 = pow(Cmu, 0.75);
|
const scalar Cmu75 = pow(Cmu, 0.75);
|
||||||
|
|
||||||
const fvPatchScalarField& kp =
|
const fvPatchScalarField& kp =
|
||||||
patch().lookupPatchField<volScalarField, scalar>(kName_);
|
lookupPatchField<volScalarField, scalar>(kName_);
|
||||||
|
|
||||||
const fvsPatchScalarField& phip =
|
const fvsPatchScalarField& phip =
|
||||||
patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
||||||
|
|
||||||
this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
|
this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
|
||||||
this->valueFraction() = neg(phip);
|
this->valueFraction() = neg(phip);
|
||||||
|
|
|
@ -136,10 +136,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
|
||||||
const scalar Cmu25 = pow(Cmu, 0.25);
|
const scalar Cmu25 = pow(Cmu, 0.25);
|
||||||
|
|
||||||
const fvPatchScalarField& kp =
|
const fvPatchScalarField& kp =
|
||||||
patch().lookupPatchField<volScalarField, scalar>(kName_);
|
lookupPatchField<volScalarField, scalar>(kName_);
|
||||||
|
|
||||||
const fvsPatchScalarField& phip =
|
const fvsPatchScalarField& phip =
|
||||||
patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
||||||
|
|
||||||
this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
|
this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
|
||||||
this->valueFraction() = neg(phip);
|
this->valueFraction() = neg(phip);
|
||||||
|
|
|
@ -136,10 +136,10 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
|
||||||
const scalar Cmu75 = pow(Cmu, 0.75);
|
const scalar Cmu75 = pow(Cmu, 0.75);
|
||||||
|
|
||||||
const fvPatchScalarField& kp =
|
const fvPatchScalarField& kp =
|
||||||
patch().lookupPatchField<volScalarField, scalar>(kName_);
|
lookupPatchField<volScalarField, scalar>(kName_);
|
||||||
|
|
||||||
const fvsPatchScalarField& phip =
|
const fvsPatchScalarField& phip =
|
||||||
patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
||||||
|
|
||||||
this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
|
this->refValue() = Cmu75*kp*sqrt(kp)/mixingLength_;
|
||||||
this->valueFraction() = neg(phip);
|
this->valueFraction() = neg(phip);
|
||||||
|
|
|
@ -136,10 +136,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
|
||||||
const scalar Cmu25 = pow(Cmu, 0.25);
|
const scalar Cmu25 = pow(Cmu, 0.25);
|
||||||
|
|
||||||
const fvPatchScalarField& kp =
|
const fvPatchScalarField& kp =
|
||||||
patch().lookupPatchField<volScalarField, scalar>(kName_);
|
lookupPatchField<volScalarField, scalar>(kName_);
|
||||||
|
|
||||||
const fvsPatchScalarField& phip =
|
const fvsPatchScalarField& phip =
|
||||||
patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
lookupPatchField<surfaceScalarField, scalar>(phiName_);
|
||||||
|
|
||||||
this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
|
this->refValue() = sqrt(kp)/(Cmu25*mixingLength_);
|
||||||
this->valueFraction() = neg(phip);
|
this->valueFraction() = neg(phip);
|
||||||
|
|
|
@ -158,10 +158,10 @@ void RWallFunctionFvPatchSymmTensorField::evaluate
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
const scalarField& nutw =
|
const scalarField& nutw =
|
||||||
patch().lookupPatchField<volScalarField, scalar>(nutName_);
|
lookupPatchField<volScalarField, scalar>(nutName_);
|
||||||
|
|
||||||
const fvPatchVectorField& Uw =
|
const fvPatchVectorField& Uw =
|
||||||
patch().lookupPatchField<volVectorField, vector>(UName_);
|
lookupPatchField<volVectorField, vector>(UName_);
|
||||||
|
|
||||||
// Old treatment: anisotropy not enforced
|
// Old treatment: anisotropy not enforced
|
||||||
vectorField snGradU = Uw.snGrad();
|
vectorField snGradU = Uw.snGrad();
|
||||||
|
|
Reference in a new issue