From 9bd141f10c1d0d7f61fd1b57fa177dca6222a59e Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 9 Sep 2009 16:40:20 +0100 Subject: [PATCH] using new pow025 function --- src/turbulenceModels/compressible/RAS/RASModel/RASModel.C | 2 +- .../turbulentMixingLengthFrequencyInletFvPatchScalarField.C | 2 +- .../alphatJayatillekeWallFunctionFvPatchScalarField.C | 2 +- .../epsilonWallFunctionFvPatchScalarField.C | 2 +- .../mutkRoughWallFunctionFvPatchScalarField.C | 2 +- .../mutkWallFunction/mutkWallFunctionFvPatchScalarField.C | 4 ++-- .../omegaWallFunction/omegaWallFunctionFvPatchScalarField.C | 2 +- .../incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C | 2 +- src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C | 2 +- .../turbulentMixingLengthFrequencyInletFvPatchScalarField.C | 2 +- .../epsilonWallFunctionFvPatchScalarField.C | 2 +- .../nutkRoughWallFunctionFvPatchScalarField.C | 2 +- .../nutkWallFunction/nutkWallFunctionFvPatchScalarField.C | 4 ++-- .../omegaWallFunction/omegaWallFunctionFvPatchScalarField.C | 2 +- .../incompressible/RAS/include/nonLinearWallFunctionsI.H | 2 +- .../incompressible/RAS/include/wallNonlinearViscosityI.H | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 1d4054fb04..f0b77bb1f2 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -176,7 +176,7 @@ tmp RASModel::yPlus(const label patchNo, const scalar Cmu) const if (isType(curPatch)) { - Yp = pow(Cmu, 0.25) + Yp = pow025(Cmu) *y_[patchNo] *sqrt(k()().boundaryField()[patchNo].patchInternalField()) /( diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index 5893f2072e..bacfe9615e 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -118,7 +118,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() const scalar Cmu = rasModel.coeffDict().lookupOrDefault("Cmu", 0.09); - const scalar Cmu25 = pow(Cmu, 0.25); + const scalar Cmu25 = pow025(Cmu); const fvPatchField& kp = patch().lookupPatchField(kName_); diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index e8fdf3edd5..b5022e2756 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -204,7 +204,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() const RASModel& rasModel = db().lookupObject("RASProperties"); - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); const scalarField& y = rasModel.y()[patchI]; diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index 07382bad52..a129ec8bff 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -188,7 +188,7 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs() const RASModel& rasModel = db().lookupObject("RASProperties"); - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); const scalar Cmu75 = pow(Cmu_, 0.75); const scalarField& y = rasModel.y()[patchI]; diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C index 6af9687f7b..67353e4319 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C @@ -75,7 +75,7 @@ tmp mutkRoughWallFunctionFvPatchScalarField::calcMut() const const volScalarField& k = tk(); const scalarField& muw = rasModel.mu().boundaryField()[patchI]; - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); tmp tmutw(new scalarField(patch().size(), 0.0)); scalarField& mutw = tmutw(); diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C index 5ab8324cda..674097af09 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C @@ -83,7 +83,7 @@ tmp mutkWallFunctionFvPatchScalarField::calcMut() const const volScalarField& k = tk(); const scalarField& muw = rasModel.mu().boundaryField()[patchI]; - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); tmp tmutw(new scalarField(patch().size(), 0.0)); scalarField& mutw = tmutw(); @@ -215,7 +215,7 @@ tmp mutkWallFunctionFvPatchScalarField::yPlus() const const scalarField& muw = rasModel.mu().boundaryField()[patchI]; const scalarField& rhow = rasModel.rho().boundaryField()[patchI]; - return pow(Cmu_, 0.25)*y*sqrt(kwc)/(muw/rhow); + return pow025(Cmu_)*y*sqrt(kwc)/(muw/rhow); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index 6e475094ec..c60d6628e5 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -187,7 +187,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs() const RASModel& rasModel = db().lookupObject("RASProperties"); const scalarField& y = rasModel.y()[patch().index()]; - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); volScalarField& G = const_cast (db().lookupObject(GName_)); diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C index b8c1f48ee4..a755d4e56e 100644 --- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -346,7 +346,7 @@ void kOmegaSSTSAS::correct(const tmp& gradU) volVectorField gradK = fvc::grad(k_); volVectorField gradOmega = fvc::grad(omega_); - volScalarField L = sqrt(k_)/(pow(Cmu_, 0.25)*(omega_ + omegaSmall_)); + volScalarField L = sqrt(k_)/(pow025(Cmu_)*(omega_ + omegaSmall_)); volScalarField CDkOmega = (2.0*alphaOmega2_)*(gradK & gradOmega)/(omega_ + omegaSmall_); volScalarField F1 = this->F1(CDkOmega); diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index c2546e659e..3e8412689b 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -171,7 +171,7 @@ tmp RASModel::yPlus(const label patchNo, const scalar Cmu) const if (isType(curPatch)) { - Yp = pow(Cmu, 0.25) + Yp = pow025(Cmu) *y_[patchNo] *sqrt(k()().boundaryField()[patchNo].patchInternalField()) /nu().boundaryField()[patchNo]; diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index dac5ccb0f1..179ea640c5 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -118,7 +118,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() const scalar Cmu = rasModel.coeffDict().lookupOrDefault("Cmu", 0.09); - const scalar Cmu25 = pow(Cmu, 0.25); + const scalar Cmu25 = pow025(Cmu); const fvPatchField& kp = patch().lookupPatchField(kName_); diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index 5f771ec663..cdd6582d7a 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -185,7 +185,7 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs() const RASModel& rasModel = db().lookupObject("RASProperties"); const scalarField& y = rasModel.y()[patchI]; - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); const scalar Cmu75 = pow(Cmu_, 0.75); volScalarField& G = diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C index f81cb76c5c..fdd5428a71 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C @@ -74,7 +74,7 @@ tmp nutkRoughWallFunctionFvPatchScalarField::calcNut() const const volScalarField& k = tk(); const scalarField& nuw = rasModel.nu().boundaryField()[patchI]; - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); tmp tnutw(new scalarField(patch().size(), 0.0)); scalarField& nutw = tnutw(); diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index dbb07712d8..6f786d8f5c 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -83,7 +83,7 @@ tmp nutkWallFunctionFvPatchScalarField::calcNut() const const volScalarField& k = tk(); const scalarField& nuw = rasModel.nu().boundaryField()[patchI]; - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); tmp tnutw(new scalarField(patch().size(), 0.0)); scalarField& nutw = tnutw(); @@ -223,7 +223,7 @@ tmp nutkWallFunctionFvPatchScalarField::yPlus() const const scalarField kwc = k.boundaryField()[patchI].patchInternalField(); const scalarField& nuw = rasModel.nu().boundaryField()[patchI]; - return pow(Cmu_, 0.25)*y*sqrt(kwc)/nuw; + return pow025(Cmu_)*y*sqrt(kwc)/nuw; } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index c39b20bf0c..b494541846 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -186,7 +186,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs() const RASModel& rasModel = db().lookupObject("RASProperties"); const scalarField& y = rasModel.y()[patchI]; - const scalar Cmu25 = pow(Cmu_, 0.25); + const scalar Cmu25 = pow025(Cmu_); volScalarField& G = const_cast(db().lookupObject(GName_)); diff --git a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H index e88e0f8ee3..8b10335481 100644 --- a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H +++ b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H @@ -75,7 +75,7 @@ Description label faceCelli = curPatch.faceCells()[facei]; //- using local Cmu ! - scalar Cmu25 = pow(Cmu_[faceCelli], 0.25); + scalar Cmu25 = pow025(Cmu_[faceCelli]); scalar Cmu75 = pow(Cmu_[faceCelli], 0.75); scalar yPlus = diff --git a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H index b24b23c282..5ff4e58a00 100644 --- a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H +++ b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H @@ -49,7 +49,7 @@ Description label faceCelli = curPatch.faceCells()[facei]; //- Using local Cmu - scalar Cmu25 = pow(Cmu_[faceCelli], 0.25); + scalar Cmu25 = pow025(Cmu_[faceCelli]); scalar yPlus = Cmu25*y_[patchi][facei]*sqrt(k_[faceCelli])/nuw[facei];