Revert "skip writing default values of Cmu/Prt etc for turbulent bcs"

This reverts commit ad287d9d17.
This commit is contained in:
Mark Olesen
2009-08-03 19:59:06 +02:00
parent db8eadd66e
commit ac4ff01a74
13 changed files with 31 additions and 49 deletions

View File

@ -310,11 +310,9 @@ void alphaSgsJayatillekeWallFunctionFvPatchScalarField::evaluate
void alphaSgsJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const void alphaSgsJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fvPatchField<scalar>::write(os); fvPatchField<scalar>::write(os);
os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "Prt", 0.85, Prt_); os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -196,10 +196,8 @@ void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "U", "U", UName_); writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_); writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -178,9 +178,7 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::write
{ {
fvPatchScalarField::write(os); fvPatchScalarField::write(os);
q_.writeEntry("q", os); q_.writeEntry("q", os);
os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
gradient().writeEntry("gradient", os); gradient().writeEntry("gradient", os);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -137,9 +137,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
fvPatchField<scalar>::write(os); fvPatchField<scalar>::write(os);
os.writeKeyword("mixingLength") os.writeKeyword("mixingLength")
<< mixingLength_ << token::END_STATEMENT << nl; << mixingLength_ << token::END_STATEMENT << nl;
os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<word>(os, "k", "k", kName_);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -122,7 +122,7 @@ void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fvPatchField<scalar>::write(os); fvPatchField<scalar>::write(os);
writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
writeEntryIfDifferent<scalar>(os, "Prt", 0.85, Prt_); os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -246,11 +246,9 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_); writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -107,9 +107,9 @@ tmp<scalarField> mutkWallFunctionFvPatchScalarField::calcMut() const
void mutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const void mutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{ {
writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
} }

View File

@ -235,11 +235,9 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_); writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -188,10 +188,8 @@ void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
fvPatchField<scalar>::write(os); fvPatchField<scalar>::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_); writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -48,8 +48,8 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
) )
: :
fixedValueFvPatchField<scalar>(p, iF), fixedValueFvPatchField<scalar>(p, iF),
mixingLength_(0.001), mixingLength_(0.0),
kName_("k") kName_("undefined-k")
{} {}
turbulentMixingLengthFrequencyInletFvPatchScalarField:: turbulentMixingLengthFrequencyInletFvPatchScalarField::
@ -137,7 +137,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write
fvPatchField<scalar>::write(os); fvPatchField<scalar>::write(os);
os.writeKeyword("mixingLength") os.writeKeyword("mixingLength")
<< mixingLength_ << token::END_STATEMENT << nl; << mixingLength_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<word>(os, "k", "k", kName_); os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -234,11 +234,9 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_); writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
writeEntryIfDifferent<word>(os, "nut", "nut", nutName_); writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_);
writeEntry("value", os); writeEntry("value", os);
} }

View File

@ -106,9 +106,9 @@ tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
void nutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const void nutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{ {
writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
} }

View File

@ -224,11 +224,9 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_); writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
writeEntryIfDifferent<word>(os, "nut", "nut", nutName_); writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<scalar>(os, "E", 9.8, E_);
writeEntry("value", os); writeEntry("value", os);
} }