From 827f834a939619f53c370804e06ab139e6081988 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Aug 2009 09:53:13 +0100 Subject: [PATCH 1/6] corrected y+ calc, re-structured, better handling for walls --- .../boundaryFoam/boundaryFoam.C | 62 +++------------- .../boundaryFoam/createFields.H | 64 +--------------- .../boundaryFoam/evaluateNearWall.H | 35 +++++++++ .../boundaryFoam/interrogateWallPatches.H | 74 +++++++++++++++++++ .../incompressible/boundaryFoam/makeGraphs.H | 33 +++++++++ 5 files changed, 154 insertions(+), 114 deletions(-) create mode 100644 applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H create mode 100644 applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H create mode 100644 applications/solvers/incompressible/boundaryFoam/makeGraphs.H diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C index 2ee69c120e..62a8db992b 100644 --- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C +++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C @@ -26,8 +26,8 @@ Application boundaryFoam Description - Steady-state solver for 1D turbulent flow, typically to generate boundary - layer conditions at an inlet, for use in a simulation. + Steady-state solver for incompressible, 1D turbulent flow, typically to + generate boundary layer conditions at an inlet, for use in a simulation. Boundary layer code to calculate the U, k and epsilon distributions. Used to create inlet boundary conditions for experimental comparisons @@ -42,7 +42,6 @@ Description #include "wallFvPatch.H" #include "makeGraph.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // int main(int argc, char *argv[]) @@ -52,6 +51,7 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createMesh.H" #include "createFields.H" + #include "interrogateWallPatches.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -74,66 +74,24 @@ int main(int argc, char *argv[]) UEqn.solve(); - // Correct driving force for a constant mass flow rate - + // Correct driving force for a constant volume flow rate dimensionedVector UbarStar = flowMask & U.weightedAverage(mesh.V()); U += (Ubar - UbarStar); gradP += (Ubar - UbarStar)/(1.0/UEqn.A())().weightedAverage(mesh.V()); - label id = y.size() - 1; - - scalar wallShearStress = - flowDirection & turbulence->R()()[id] & wallNormal; - - scalar yplusWall -// = ::sqrt(mag(wallShearStress))*y[id]/laminarTransport.nu()()[id]; - = ::sqrt(mag(wallShearStress))*y[id]/turbulence->nuEff()()[id]; - - Info<< "Uncorrected Ubar = " << (flowDirection & UbarStar.value())<< tab - << "pressure gradient = " << (flowDirection & gradP.value()) << tab - << "min y+ = " << yplusWall << endl; - turbulence->correct(); + Info<< "Uncorrected Ubar = " << (flowDirection & UbarStar.value()) + << ", pressure gradient = " << (flowDirection & gradP.value()) + << endl; + + #include "evaluateNearWall.H" if (runTime.outputTime()) { - volSymmTensorField R - ( - IOobject - ( - "R", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - turbulence->R() - ); - - runTime.write(); - - const word& gFormat = runTime.graphFormat(); - - makeGraph(y, flowDirection & U, "Uf", gFormat); - - makeGraph(y, laminarTransport.nu(), gFormat); - - makeGraph(y, turbulence->k(), gFormat); - makeGraph(y, turbulence->epsilon(), gFormat); - - //makeGraph(y, flowDirection & R & flowDirection, "Rff", gFormat); - //makeGraph(y, wallNormal & R & wallNormal, "Rww", gFormat); - //makeGraph(y, flowDirection & R & wallNormal, "Rfw", gFormat); - - //makeGraph(y, sqrt(R.component(tensor::XX)), "u", gFormat); - //makeGraph(y, sqrt(R.component(tensor::YY)), "v", gFormat); - //makeGraph(y, sqrt(R.component(tensor::ZZ)), "w", gFormat); - makeGraph(y, R.component(tensor::XY), "uv", gFormat); - - makeGraph(y, mag(fvc::grad(U)), "gammaDot", gFormat); + #include "makeGraphs.H" } Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H index b7b8b32229..e99a990013 100644 --- a/applications/solvers/incompressible/boundaryFoam/createFields.H +++ b/applications/solvers/incompressible/boundaryFoam/createFields.H @@ -49,74 +49,14 @@ ) ); - dimensionedVector Ubar - ( - transportProperties.lookup("Ubar") - ); + dimensionedVector Ubar(transportProperties.lookup("Ubar")); vector flowDirection = (Ubar/mag(Ubar)).value(); tensor flowMask = sqr(flowDirection); - - // Search for wall patches faces and store normals - - scalar nWallFaces(0); - vector wallNormal(vector::zero); - - const fvPatchList& patches = mesh.boundary(); - - forAll(patches, patchi) - { - const fvPatch& currPatch = patches[patchi]; - - if (isType(currPatch)) - { - forAll(currPatch, facei) - { - nWallFaces++; - - if (nWallFaces == 1) - { - wallNormal = - - mesh.Sf().boundaryField()[patchi][facei] - /mesh.magSf().boundaryField()[patchi][facei]; - } - else if (nWallFaces == 2) - { - vector wallNormal2 = - mesh.Sf().boundaryField()[patchi][facei] - /mesh.magSf().boundaryField()[patchi][facei]; - - //- Check that wall faces are parallel - if - ( - mag(wallNormal & wallNormal2) > 1.01 - ||mag(wallNormal & wallNormal2) < 0.99 - ) - { - Info<< "boundaryFoam: wall faces are not parallel" - << endl - << abort(FatalError); - } - } - else - { - Info<< "boundaryFoam: number of wall faces > 2" - << endl - << abort(FatalError); - } - } - } - } - - - //- create position array for graph generation - scalarField y = wallNormal & mesh.C().internalField(); - - dimensionedVector gradP ( "gradP", dimensionSet(0, 1, -2, 0, 0), - vector(0, 0, 0) + vector::zero ); diff --git a/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H b/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H new file mode 100644 index 0000000000..b9683b9e68 --- /dev/null +++ b/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H @@ -0,0 +1,35 @@ +{ + // Evaluate near-wall behaviour + + scalar nu = turbulence->nu().boundaryField()[patchId][faceId]; + scalar nut = turbulence->nut()().boundaryField()[patchId][faceId]; + symmTensor R = turbulence->devReff()().boundaryField()[patchId][faceId]; + scalar epsilon = turbulence->epsilon()()[cellId]; +// scalar omega = turbulence->omega()()[cellId]; + scalar k = turbulence->k()()[cellId]; + scalar Up = + flowDirection & (U[cellId] - U.boundaryField()[patchId][faceId]); + + scalar tauw = flowDirection & R & wallNormal; + + scalar uTau = ::sqrt(mag(tauw)); + + scalar yPlus = uTau*y[cellId]/(nu + ROOTVSMALL); + + scalar uPlus = Up/(uTau + ROOTVSMALL); + + scalar nutPlus = nut/nu; + + scalar kPlus = k/(sqr(uTau) + ROOTVSMALL); + + scalar epsilonPlus = epsilon*nu/(pow4(uTau) + ROOTVSMALL); + +// scalar omegaPlus = omega*nu/(sqr(uTau) + ROOTVSMALL); + + scalar Rey = Up*y[cellId]/nu; + + Info<< "Rey = " << Rey << ", uTau = " << uTau << ", nut+ = " << nutPlus + << ", y+ = " << yPlus << ", u+ = " << uPlus + << ", k+ = " << kPlus << ", epsilon+ = " << epsilonPlus + << endl; +} \ No newline at end of file diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H new file mode 100644 index 0000000000..27ddd24544 --- /dev/null +++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H @@ -0,0 +1,74 @@ +// Search for wall patches faces and store normals + +label faceId(-1); +label patchId(-1); +label nWallFaces(0); +vector wallNormal(vector::zero); + +const fvPatchList& patches = mesh.boundary(); + +forAll(patches, patchi) +{ + const fvPatch& currPatch = patches[patchi]; + + if (isType(currPatch)) + { + const vectorField nf = currPatch.nf(); + + forAll(nf, facei) + { + nWallFaces++; + + if (nWallFaces == 1) + { + wallNormal = -nf[facei]; + faceId = facei; + patchId = patchi; + } + else if (nWallFaces == 2) + { + const vector wallNormal2 = -nf[facei]; + + //- Check that wall faces are parallel + if + ( + mag(wallNormal & wallNormal2) > 1.01 + || mag(wallNormal & wallNormal2) < 0.99 + ) + { + FatalErrorIn(args.executable()) + << "wall faces are not parallel for patches " + << patches[patchId].name() << " and " + << currPatch.name() << nl + << exit(FatalError); + } + } + else + { + FatalErrorIn(args.executable()) << "number of wall faces > 2" + << nl << exit(FatalError); + } + } + } +} + +if (nWallFaces == 0) +{ + FatalErrorIn(args.executable()) << "No wall patches identified" + << exit(FatalError); +} +else +{ + Info<< "Generating wall data for patch: " << patches[patchId].name() << endl; +} + +// store local id of near-walll cell to process +label cellId = patches[patchId].faceCells()[faceId]; + +// create position array for graph generation +scalarField y = + wallNormal + & (mesh.C().internalField() - mesh.C().boundaryField()[patchId][faceId]); + +Info<< " Height to first cell centre y0 = " << y[cellId] << endl; + diff --git a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H new file mode 100644 index 0000000000..7367dc7c7d --- /dev/null +++ b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H @@ -0,0 +1,33 @@ +volSymmTensorField R +( + IOobject + ( + "R", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + turbulence->R() +); + +runTime.write(); + +const word& gFormat = runTime.graphFormat(); + +makeGraph(y, flowDirection & U, "Uf", gFormat); + +makeGraph(y, turbulence->nu(), gFormat); +makeGraph(y, turbulence->k(), gFormat); +makeGraph(y, turbulence->epsilon(), gFormat); + +makeGraph(y, flowDirection & R & flowDirection, "Rff", gFormat); +makeGraph(y, wallNormal & R & wallNormal, "Rww", gFormat); +makeGraph(y, flowDirection & R & wallNormal, "Rfw", gFormat); + +makeGraph(y, sqrt(mag(R.component(tensor::XX))), "u", gFormat); +makeGraph(y, sqrt(mag(R.component(tensor::YY))), "v", gFormat); +makeGraph(y, sqrt(mag(R.component(tensor::ZZ))), "w", gFormat); +makeGraph(y, R.component(tensor::XY), "uv", gFormat); + +makeGraph(y, mag(fvc::grad(U)), "gammaDot", gFormat); From d320fab4ab8ebbae8b354c61e4ac008d3ccb2d9d Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Aug 2009 11:10:13 +0100 Subject: [PATCH 2/6] Refactoring of nut wall function BCs - names updated to reflect what they are based on, e.g. either k or U --- .../incompressible/RAS/Make/files | 10 +-- .../backwardsCompatibilityWallFunctions.C | 4 +- ...nutURoughWallFunctionFvPatchScalarField.C} | 67 ++++++++----------- ...nutURoughWallFunctionFvPatchScalarField.H} | 58 +++++++--------- ...USpaldingWallFunctionFvPatchScalarField.C} | 53 +++++++-------- ...USpaldingWallFunctionFvPatchScalarField.H} | 44 ++++++------ .../nutUWallFunctionFvPatchScalarField.C} | 49 ++++++-------- .../nutUWallFunctionFvPatchScalarField.H} | 50 ++++++-------- ...nutkRoughWallFunctionFvPatchScalarField.C} | 52 +++++++------- ...nutkRoughWallFunctionFvPatchScalarField.H} | 42 ++++++------ .../nutkWallFunctionFvPatchScalarField.C} | 36 +++++----- .../nutkWallFunctionFvPatchScalarField.H} | 38 +++++------ 12 files changed, 232 insertions(+), 271 deletions(-) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C => nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C} (79%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H => nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H} (73%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C => nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C} (77%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H => nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H} (74%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C => nutUWallFunction/nutUWallFunctionFvPatchScalarField.C} (74%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H => nutUWallFunction/nutUWallFunctionFvPatchScalarField.H} (70%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C => nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C} (76%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H => nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H} (79%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutWallFunction/nutWallFunctionFvPatchScalarField.C => nutkWallFunction/nutkWallFunctionFvPatchScalarField.C} (82%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutWallFunction/nutWallFunctionFvPatchScalarField.H => nutkWallFunction/nutkWallFunctionFvPatchScalarField.H} (82%) diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files index e7ac20e59e..d81b1735b8 100644 --- a/src/turbulenceModels/incompressible/RAS/Make/files +++ b/src/turbulenceModels/incompressible/RAS/Make/files @@ -21,11 +21,11 @@ LamBremhorstKE/LamBremhorstKE.C wallFunctions = derivedFvPatchFields/wallFunctions nutWallFunctions = $(wallFunctions)/nutWallFunctions -$(nutWallFunctions)/nutWallFunction/nutWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C index bfa6bb78a1..f71feb939d 100644 --- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C @@ -27,7 +27,7 @@ License #include "backwardsCompatibilityWallFunctions.H" #include "calculatedFvPatchField.H" -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" #include "epsilonWallFunctionFvPatchScalarField.H" #include "kqRWallFunctionFvPatchField.H" #include "omegaWallFunctionFvPatchScalarField.H" @@ -75,7 +75,7 @@ tmp autoCreateNut if (isType(bm[patchI])) { nutBoundaryTypes[patchI] = - RASModels::nutWallFunctionFvPatchScalarField::typeName; + RASModels::nutkWallFunctionFvPatchScalarField::typeName; } else { diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C similarity index 79% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C index 760559f679..a85c647467 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H" +#include "nutURoughWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const +tmp nutURoughWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -73,8 +72,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const } -tmp -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus +tmp nutURoughWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -120,8 +118,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus dKsPlusdYPlus = 1; } - // Additional tuning parameter (fudge factor) - nominally = 1 - dKsPlusdYPlus *= roughnessFudgeFactor_; + // Additional tuning parameter - nominally = 1 + dKsPlusdYPlus *= roughnessFactor_; do { @@ -200,82 +198,76 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF), + nutkWallFunctionFvPatchScalarField(p, iF), roughnessHeight_(pTraits::zero), roughnessConstant_(pTraits::zero), - roughnessFudgeFactor_(pTraits::zero) + roughnessFactor_(pTraits::zero) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf, + const nutURoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), roughnessHeight_(ptf.roughnessHeight_), roughnessConstant_(ptf.roughnessConstant_), - roughnessFudgeFactor_(ptf.roughnessFudgeFactor_) + roughnessFactor_(ptf.roughnessFactor_) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict), + nutkWallFunctionFvPatchScalarField(p, iF, dict), roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))), roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))), - roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor"))) + roughnessFactor_(readScalar(dict.lookup("roughnessFactor"))) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf + const nutURoughWallFunctionFvPatchScalarField& rwfpsf ) : - nutWallFunctionFvPatchScalarField(rwfpsf), + nutkWallFunctionFvPatchScalarField(rwfpsf), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf, + const nutURoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(rwfpsf, iF), + nutkWallFunctionFvPatchScalarField(rwfpsf, iF), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const +tmp nutURoughWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -287,10 +279,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const } -void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void nutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -298,8 +287,8 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write << roughnessHeight_ << token::END_STATEMENT << nl; os.writeKeyword("roughnessConstant") << roughnessConstant_ << token::END_STATEMENT << nl; - os.writeKeyword("roughnessFudgeFactor") - << roughnessFudgeFactor_ << token::END_STATEMENT << nl; + os.writeKeyword("roughnessFactor") + << roughnessFactor_ << token::END_STATEMENT << nl; writeEntry("value", os); } @@ -309,7 +298,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H similarity index 73% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H index 8d72e5ad13..1fbb24f9c5 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels:: - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutURoughWallFunctionFvPatchScalarField Description - Wall function boundary condition for rough walls + Wall function boundary condition for rough walls, based on velocity. SourceFiles nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H -#define nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H +#ifndef nutURoughWallFunctionFvPatchScalarField_H +#define nutURoughWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ -Class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration + Class nutURoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +class nutURoughWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { // Private data @@ -67,7 +66,7 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField scalar roughnessConstant_; //- Scale factor - scalar roughnessFudgeFactor_; + scalar roughnessFactor_; // Protected member functions @@ -82,20 +81,20 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField public: //- Runtime type information - TypeName("nutSpalartAllmarasStandardRoughWallFunction"); + TypeName("nutURoughWallFunction"); // Constructors //- Construct from patch and internal field - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -103,20 +102,20 @@ public: ); //- Construct by mapping given - // nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + // nutURoughWallFunctionFvPatchScalarField // onto a new patch - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const nutURoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& + const nutURoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -124,17 +123,14 @@ public: { return tmp ( - new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this - ) + new nutURoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const nutURoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -146,11 +142,7 @@ public: { return tmp ( - new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new nutURoughWallFunctionFvPatchScalarField(*this, iF) ); } @@ -185,16 +177,16 @@ public: } //- Return the roughness scale factor - const scalar& roughnessFudgeFactor() const + const scalar& roughnessFactor() const { - return roughnessFudgeFactor_; + return roughnessFactor_; } //- Return reference to the roughness scale factor to allow // adjustment - scalar& roughnessFudgeFactor() + scalar& roughnessFactor() { - return roughnessFudgeFactor_; + return roughnessFactor_; } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C similarity index 77% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C index 8b968a4fa2..f24001bc6e 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutSpalartAllmarasWallFunctionFvPatchScalarField.H" +#include "nutUSpaldingWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const +tmp nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -55,7 +54,7 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const } -tmp nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau +tmp nutUSpaldingWallFunctionFvPatchScalarField::calcUTau ( const scalarField& magGradU ) const @@ -114,67 +113,66 @@ tmp nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF) + nutkWallFunctionFvPatchScalarField(p, iF) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& ptf, + const nutUSpaldingWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict) + nutkWallFunctionFvPatchScalarField(p, iF, dict) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf + const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf ) : - nutWallFunctionFvPatchScalarField(wfpsf) + nutkWallFunctionFvPatchScalarField(wfpsf) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf, + const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(wfpsf, iF) + nutkWallFunctionFvPatchScalarField(wfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const +tmp nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -187,10 +185,7 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const } -void nutSpalartAllmarasWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void nutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -203,7 +198,7 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H similarity index 74% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H index 36f2aadb15..de663d32a9 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H @@ -23,21 +23,21 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels:: - nutSpalartAllmarasWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutUSpaldingWallFunctionFvPatchScalarField Description - Wall function boundary condition for walls + Wall function boundary condition for walls, based on velocity, using + Spaldings law to give a continuous nut profile to the wall (y+ = 0) SourceFiles - nutSpalartAllmarasWallFunctionFvPatchScalarField.C + nutUSpaldingWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutSpalartAllmarasWallFunctionFvPatchScalarField_H -#define nutSpalartAllmarasWallFunctionFvPatchScalarField_H +#ifndef nutUSpaldingWallFunctionFvPatchScalarField_H +#define nutUSpaldingWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +49,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutSpalartAllmarasWallFunctionFvPatch Declaration + Class nutUSpaldingWallFunctionFvPatch Declaration \*---------------------------------------------------------------------------*/ -class nutSpalartAllmarasWallFunctionFvPatchScalarField +class nutUSpaldingWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +70,20 @@ protected: public: //- Runtime type information - TypeName("nutSpalartAllmarasWallFunction"); + TypeName("nutUSpaldingWallFunction"); // Constructors //- Construct from patch and internal field - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +91,20 @@ public: ); //- Construct by mapping given - // nutSpalartAllmarasWallFunctionFvPatchScalarField + // nutUSpaldingWallFunctionFvPatchScalarField // onto a new patch - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField&, + const nutUSpaldingWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& + const nutUSpaldingWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,14 +112,14 @@ public: { return tmp ( - new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this) + new nutUSpaldingWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField&, + const nutUSpaldingWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -131,7 +131,7 @@ public: { return tmp ( - new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF) + new nutUSpaldingWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C similarity index 74% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index e3c3e55671..bccc07672f 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H" +#include "nutUWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const +tmp nutUWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -70,8 +69,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const } -tmp -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus +tmp nutUWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -111,67 +109,61 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF) + nutkWallFunctionFvPatchScalarField(p, iF) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf, + const nutUWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict) + nutkWallFunctionFvPatchScalarField(p, iF, dict) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf + const nutUWallFunctionFvPatchScalarField& sawfpsf ) : - nutWallFunctionFvPatchScalarField(sawfpsf) + nutkWallFunctionFvPatchScalarField(sawfpsf) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf, + const nutUWallFunctionFvPatchScalarField& sawfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(sawfpsf, iF) + nutkWallFunctionFvPatchScalarField(sawfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const +tmp nutUWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); const RASModel& rasModel = db().lookupObject("RASProperties"); @@ -182,10 +174,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const } -void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void nutUWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -198,7 +187,7 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H similarity index 70% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H index f54bb57c8a..32bd0aad51 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels:: - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutUWallFunctionFvPatchScalarField Description - Wall function boundary condition for walls + Wall function boundary condition for walls, based on velocity. SourceFiles - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C + nutUWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H -#define nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H +#ifndef nutUWallFunctionFvPatchScalarField_H +#define nutUWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration + Class nutUWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +class nutUWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +69,20 @@ protected: public: //- Runtime type information - TypeName("nutSpalartAllmarasStandardWallFunction"); + TypeName("nutUWallFunction"); // Constructors //- Construct from patch and internal field - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +90,20 @@ public: ); //- Construct by mapping given - // nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + // nutUWallFunctionFvPatchScalarField // onto a new patch - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const nutUWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& + const nutUWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,17 +111,14 @@ public: { return tmp ( - new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this - ) + new nutUWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const nutUWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -134,11 +130,7 @@ public: { return tmp ( - new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new nutUWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C similarity index 76% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C index 48d9ba1dde..f81cb76c5c 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutRoughWallFunctionFvPatchScalarField.H" +#include "nutkRoughWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,7 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -scalar nutRoughWallFunctionFvPatchScalarField::fnRough +scalar nutkRoughWallFunctionFvPatchScalarField::fnRough ( const scalar KsPlus, const scalar Cs @@ -64,7 +64,7 @@ scalar nutRoughWallFunctionFvPatchScalarField::fnRough } -tmp nutRoughWallFunctionFvPatchScalarField::calcNut() const +tmp nutkRoughWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -128,63 +128,63 @@ tmp nutRoughWallFunctionFvPatchScalarField::calcNut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF), + nutkWallFunctionFvPatchScalarField(p, iF), Ks_(p.size(), 0.0), Cs_(p.size(), 0.0) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& ptf, + const nutkRoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), Ks_(ptf.Ks_, mapper), Cs_(ptf.Cs_, mapper) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict), + nutkWallFunctionFvPatchScalarField(p, iF, dict), Ks_("Ks", dict, p.size()), Cs_("Cs", dict, p.size()) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& rwfpsf + const nutkRoughWallFunctionFvPatchScalarField& rwfpsf ) : - nutWallFunctionFvPatchScalarField(rwfpsf), + nutkWallFunctionFvPatchScalarField(rwfpsf), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& rwfpsf, + const nutkRoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(rwfpsf, iF), + nutkWallFunctionFvPatchScalarField(rwfpsf, iF), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} @@ -192,34 +192,34 @@ nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void nutRoughWallFunctionFvPatchScalarField::autoMap +void nutkRoughWallFunctionFvPatchScalarField::autoMap ( const fvPatchFieldMapper& m ) { - nutWallFunctionFvPatchScalarField::autoMap(m); + nutkWallFunctionFvPatchScalarField::autoMap(m); Ks_.autoMap(m); Cs_.autoMap(m); } -void nutRoughWallFunctionFvPatchScalarField::rmap +void nutkRoughWallFunctionFvPatchScalarField::rmap ( const fvPatchScalarField& ptf, const labelList& addr ) { - nutWallFunctionFvPatchScalarField::rmap(ptf, addr); + nutkWallFunctionFvPatchScalarField::rmap(ptf, addr); - const nutRoughWallFunctionFvPatchScalarField& nrwfpsf = - refCast(ptf); + const nutkRoughWallFunctionFvPatchScalarField& nrwfpsf = + refCast(ptf); Ks_.rmap(nrwfpsf.Ks_, addr); Cs_.rmap(nrwfpsf.Cs_, addr); } -void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const +void nutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -231,7 +231,11 @@ void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, nutRoughWallFunctionFvPatchScalarField); +makePatchTypeField +( + fvPatchScalarField, + nutkRoughWallFunctionFvPatchScalarField +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H similarity index 79% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H index 488bf39145..c45bedc516 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H @@ -23,11 +23,11 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels::nutRoughWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutkRoughWallFunctionFvPatchScalarField Description Boundary condition for turbulent (kinematic) viscosity when using wall - functions for rough walls. + functions for rough walls, based on turbulence kinetic energy. Manipulates the E parameter to account for roughness effects, based on KsPlus. @@ -36,14 +36,14 @@ Description - roughness constant = 0.5-1.0 (0.5 default) SourceFiles - nutRoughWallFunctionFvPatchScalarField.C + nutkRoughWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutRoughWallFunctionFvPatchScalarField_H -#define nutRoughWallFunctionFvPatchScalarField_H +#ifndef nutkRoughWallFunctionFvPatchScalarField_H +#define nutkRoughWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,12 +55,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutRoughWallFunctionFvPatchScalarField Declaration + Class nutkRoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutRoughWallFunctionFvPatchScalarField +class nutkRoughWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { protected: @@ -85,20 +85,20 @@ protected: public: //- Runtime type information - TypeName("nutRoughWallFunction"); + TypeName("nutkRoughWallFunction"); // Constructors //- Construct from patch and internal field - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -106,20 +106,20 @@ public: ); //- Construct by mapping given - // nutRoughWallFunctionFvPatchScalarField + // nutkRoughWallFunctionFvPatchScalarField // onto a new patch - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField&, + const nutkRoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& + const nutkRoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -127,14 +127,14 @@ public: { return tmp ( - new nutRoughWallFunctionFvPatchScalarField(*this) + new nutkRoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField&, + const nutkRoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -146,7 +146,7 @@ public: { return tmp ( - new nutRoughWallFunctionFvPatchScalarField(*this, iF) + new nutkRoughWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C similarity index 82% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index aef4df68b3..722016a2e7 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -42,11 +42,11 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void nutWallFunctionFvPatchScalarField::checkType() +void nutkWallFunctionFvPatchScalarField::checkType() { if (!isA(patch())) { - FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()") + FatalErrorIn("nutkWallFunctionFvPatchScalarField::checkType()") << "Invalid wall function specification" << nl << " Patch type for patch " << patch().name() << " must be wall" << nl @@ -56,7 +56,7 @@ void nutWallFunctionFvPatchScalarField::checkType() } -scalar nutWallFunctionFvPatchScalarField::calcYPlusLam +scalar nutkWallFunctionFvPatchScalarField::calcYPlusLam ( const scalar kappa, const scalar E @@ -73,7 +73,7 @@ scalar nutWallFunctionFvPatchScalarField::calcYPlusLam } -tmp nutWallFunctionFvPatchScalarField::calcNut() const +tmp nutkWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -104,7 +104,7 @@ tmp nutWallFunctionFvPatchScalarField::calcNut() const } -void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const +void nutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const { os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl; os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl; @@ -114,7 +114,7 @@ void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -130,9 +130,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& ptf, + const nutkWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper @@ -148,7 +148,7 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -165,9 +165,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& wfpsf + const nutkWallFunctionFvPatchScalarField& wfpsf ) : fixedValueFvPatchScalarField(wfpsf), @@ -180,9 +180,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& wfpsf, + const nutkWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : @@ -198,7 +198,7 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void nutWallFunctionFvPatchScalarField::updateCoeffs() +void nutkWallFunctionFvPatchScalarField::updateCoeffs() { operator==(calcNut()); @@ -206,7 +206,7 @@ void nutWallFunctionFvPatchScalarField::updateCoeffs() } -tmp nutWallFunctionFvPatchScalarField::yPlus() const +tmp nutkWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -222,7 +222,7 @@ tmp nutWallFunctionFvPatchScalarField::yPlus() const } -void nutWallFunctionFvPatchScalarField::write(Ostream& os) const +void nutkWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -232,7 +232,7 @@ void nutWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField); +makePatchTypeField(fvPatchScalarField, nutkWallFunctionFvPatchScalarField); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H similarity index 82% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H index 369d718b0a..5b781a934a 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H @@ -23,20 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels::nutWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutkWallFunctionFvPatchScalarField Description Boundary condition for turbulent (kinematic) viscosity when using wall - functions + functions, based on turbulence kinetic energy. - replicates OpenFOAM v1.5 (and earlier) behaviour SourceFiles - nutWallFunctionFvPatchScalarField.C + nutkWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutWallFunctionFvPatchScalarField_H -#define nutWallFunctionFvPatchScalarField_H +#ifndef nutkWallFunctionFvPatchScalarField_H +#define nutkWallFunctionFvPatchScalarField_H #include "fixedValueFvPatchFields.H" @@ -50,10 +50,10 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutWallFunctionFvPatchScalarField Declaration + Class nutkWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutWallFunctionFvPatchScalarField +class nutkWallFunctionFvPatchScalarField : public fixedValueFvPatchScalarField { @@ -92,20 +92,20 @@ protected: public: //- Runtime type information - TypeName("nutWallFunction"); + TypeName("nutkWallFunction"); // Constructors //- Construct from patch and internal field - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -113,20 +113,20 @@ public: ); //- Construct by mapping given - // nutWallFunctionFvPatchScalarField + // nutkWallFunctionFvPatchScalarField // onto a new patch - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField&, + const nutkWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& + const nutkWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -134,14 +134,14 @@ public: { return tmp ( - new nutWallFunctionFvPatchScalarField(*this) + new nutkWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField&, + const nutkWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -153,7 +153,7 @@ public: { return tmp ( - new nutWallFunctionFvPatchScalarField(*this, iF) + new nutkWallFunctionFvPatchScalarField(*this, iF) ); } From 87d36bf3db47d3ad2e762a7ffc30bf3d4f2ae3b4 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Aug 2009 11:38:45 +0100 Subject: [PATCH 3/6] Refactoring mut wall functions to mirror incompressible form --- .../compressible/RAS/Make/files | 10 +-- .../backwardsCompatibilityWallFunctions.C | 4 +- ...mutURoughWallFunctionFvPatchScalarField.C} | 65 ++++++++----------- ...mutURoughWallFunctionFvPatchScalarField.H} | 58 +++++++---------- ...USpaldingWallFunctionFvPatchScalarField.C} | 57 ++++++++-------- ...USpaldingWallFunctionFvPatchScalarField.H} | 41 ++++++------ .../mutUWallFunctionFvPatchScalarField.C} | 49 ++++++-------- .../mutUWallFunctionFvPatchScalarField.H} | 50 ++++++-------- ...mutkRoughWallFunctionFvPatchScalarField.C} | 53 ++++++++------- ...mutkRoughWallFunctionFvPatchScalarField.H} | 45 ++++++------- .../mutkWallFunctionFvPatchScalarField.C} | 36 +++++----- .../mutkWallFunctionFvPatchScalarField.H} | 34 +++++----- 12 files changed, 231 insertions(+), 271 deletions(-) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C => mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C} (80%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H => mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H} (72%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C => mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C} (78%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H => mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H} (75%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C => mutUWallFunction/mutUWallFunctionFvPatchScalarField.C} (74%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H => mutUWallFunction/mutUWallFunctionFvPatchScalarField.H} (70%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C => mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C} (76%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H => mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H} (79%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutWallFunction/mutWallFunctionFvPatchScalarField.C => mutkWallFunction/mutkWallFunctionFvPatchScalarField.C} (82%) rename src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/{mutWallFunction/mutWallFunctionFvPatchScalarField.H => mutkWallFunction/mutkWallFunctionFvPatchScalarField.H} (84%) diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files index da455db87f..1329745581 100644 --- a/src/turbulenceModels/compressible/RAS/Make/files +++ b/src/turbulenceModels/compressible/RAS/Make/files @@ -17,11 +17,11 @@ alphatWallFunctions = $(wallFunctions)/alphatWallFunctions $(alphatWallFunctions)/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C mutWallFunctions = $(wallFunctions)/mutWallFunctions -$(mutWallFunctions)/mutWallFunction/mutWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C index 7096314fe3..700cfed818 100644 --- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C @@ -28,7 +28,7 @@ License #include "calculatedFvPatchField.H" #include "alphatWallFunctionFvPatchScalarField.H" -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" #include "epsilonWallFunctionFvPatchScalarField.H" #include "kqRWallFunctionFvPatchField.H" #include "omegaWallFunctionFvPatchScalarField.H" @@ -146,7 +146,7 @@ tmp autoCreateMut if (isType(bm[patchI])) { mutBoundaryTypes[patchI] = - RASModels::mutWallFunctionFvPatchScalarField::typeName; + RASModels::mutkWallFunctionFvPatchScalarField::typeName; } else { diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C similarity index 80% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C index 3a1d0b7ab0..7bc772eead 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H" +#include "mutURoughWallFunctionFvPatchScalarField.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "RASModel.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus +tmp mutURoughWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -90,7 +89,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus } // Additional tuning parameter (fudge factor) - nominally = 1 - dKsPlusdYPlus *= roughnessFudgeFactor_; + dKsPlusdYPlus *= roughnessFactor_; do { @@ -172,8 +171,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus } -tmp -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const +tmp mutURoughWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -206,82 +204,76 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF), + mutkWallFunctionFvPatchScalarField(p, iF), roughnessHeight_(pTraits::zero), roughnessConstant_(pTraits::zero), - roughnessFudgeFactor_(pTraits::zero) + roughnessFactor_(pTraits::zero) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf, + const mutURoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), roughnessHeight_(ptf.roughnessHeight_), roughnessConstant_(ptf.roughnessConstant_), - roughnessFudgeFactor_(ptf.roughnessFudgeFactor_) + roughnessFactor_(ptf.roughnessFactor_) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict), + mutkWallFunctionFvPatchScalarField(p, iF, dict), roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))), roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))), - roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor"))) + roughnessFactor_(readScalar(dict.lookup("roughnessFactor"))) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf + const mutURoughWallFunctionFvPatchScalarField& rwfpsf ) : - mutWallFunctionFvPatchScalarField(rwfpsf), + mutkWallFunctionFvPatchScalarField(rwfpsf), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf, + const mutURoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(rwfpsf, iF), + mutkWallFunctionFvPatchScalarField(rwfpsf, iF), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const +tmp mutURoughWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -293,10 +285,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const } -void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void mutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fixedValueFvPatchScalarField::write(os); writeLocalEntries(os); @@ -304,8 +293,8 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write << roughnessHeight_ << token::END_STATEMENT << nl; os.writeKeyword("roughnessConstant") << roughnessConstant_ << token::END_STATEMENT << nl; - os.writeKeyword("roughnessFudgeFactor") - << roughnessFudgeFactor_ << token::END_STATEMENT << nl; + os.writeKeyword("roughnessFactor") + << roughnessFactor_ << token::END_STATEMENT << nl; } @@ -314,7 +303,7 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H similarity index 72% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H index ff321bf622..67279322ee 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels:: - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutURoughWallFunctionFvPatchScalarField Description - Wall function boundary condition for rough walls + Wall function boundary condition for rough walls, based on velocity. SourceFiles mutSpalartAllamarasStandardWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H -#define compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H +#ifndef compressibleMutURoughWallFunctionFvPatchScalarField_H +#define compressibleMutURoughWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ -Class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration + Class mutURoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +class mutURoughWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -69,7 +68,7 @@ protected: scalar roughnessConstant_; //- Scale factor - scalar roughnessFudgeFactor_; + scalar roughnessFactor_; // Protected member functions @@ -84,20 +83,20 @@ protected: public: //- Runtime type information - TypeName("mutSpalartAllmarasStandardRoughWallFunction"); + TypeName("mutURoughWallFunction"); // Constructors //- Construct from patch and internal field - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -105,20 +104,20 @@ public: ); //- Construct by mapping given - // mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + // mutURoughWallFunctionFvPatchScalarField // onto a new patch - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const mutURoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& + const mutURoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -126,17 +125,14 @@ public: { return tmp ( - new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this - ) + new mutURoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const mutURoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -148,11 +144,7 @@ public: { return tmp ( - new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new mutURoughWallFunctionFvPatchScalarField(*this, iF) ); } @@ -186,16 +178,16 @@ public: } //- Return the roughness scale factor - const scalar& roughnessFudgeFactor() const + const scalar& roughnessFactor() const { - return roughnessFudgeFactor_; + return roughnessFactor_; } //- Return reference to the roughness scale factor to allow // adjustment - scalar& roughnessFudgeFactor() + scalar& roughnessFactor() { - return roughnessFudgeFactor_; + return roughnessFactor_; } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C similarity index 78% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C index dfe1e88cab..0fcfe72c4c 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutSpalartAllmarasWallFunctionFvPatchScalarField.H" +#include "mutUSpaldingWallFunctionFvPatchScalarField.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "RASModel.H" @@ -41,7 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau +tmp mutUSpaldingWallFunctionFvPatchScalarField::calcUTau ( const scalarField& magGradU ) const @@ -105,8 +105,7 @@ tmp mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau } -tmp -mutSpalartAllmarasWallFunctionFvPatchScalarField::calcMut() const +tmp mutUSpaldingWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -122,67 +121,66 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF) + mutkWallFunctionFvPatchScalarField(p, iF) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& ptf, + const mutUSpaldingWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict) + mutkWallFunctionFvPatchScalarField(p, iF, dict) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf + const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf ) : - mutWallFunctionFvPatchScalarField(wfpsf) + mutkWallFunctionFvPatchScalarField(wfpsf) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf, + const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(wfpsf, iF) + mutkWallFunctionFvPatchScalarField(wfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -mutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const +tmp mutUSpaldingWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -196,10 +194,7 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const } -void mutSpalartAllmarasWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void mutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -209,7 +204,11 @@ void mutSpalartAllmarasWallFunctionFvPatchScalarField::write // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mutSpalartAllmarasWallFunctionFvPatchScalarField); +makePatchTypeField +( + fvPatchScalarField, + mutUSpaldingWallFunctionFvPatchScalarField +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H similarity index 75% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H index fc37af6d82..c1ac830de6 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels:: - mutSpalartAllmarasWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutUSpaldingWallFunctionFvPatchScalarField Description Wall function boundary condition for walls SourceFiles - mutSpalartAllmarasWallFunctionFvPatchScalarField.C + mutUSpaldingWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H -#define compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H +#ifndef compressibleMutUSpaldingWallFunctionFvPatchScalarField_H +#define compressibleMutUSpaldingWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutSpalartAllmarasWallFunctionFvPatchScalarField Declaration + Class mutUSpaldingWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutSpalartAllmarasWallFunctionFvPatchScalarField +class mutUSpaldingWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +69,20 @@ protected: public: //- Runtime type information - TypeName("mutSpalartAllmarasWallFunction"); + TypeName("mutUSpaldingWallFunction"); // Constructors //- Construct from patch and internal field - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +90,20 @@ public: ); //- Construct by mapping given - // mutSpalartAllmarasWallFunctionFvPatchScalarField + // mutUSpaldingWallFunctionFvPatchScalarField // onto a new patch - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField&, + const mutUSpaldingWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& + const mutUSpaldingWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,14 +111,14 @@ public: { return tmp ( - new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this) + new mutUSpaldingWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField&, + const mutUSpaldingWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -131,7 +130,7 @@ public: { return tmp ( - new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF) + new mutUSpaldingWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C similarity index 74% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C index c2a49ac751..62c8386bbb 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H" +#include "mutUWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus +tmp mutUWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -81,8 +80,7 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus } -tmp -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcMut() const +tmp mutUWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -112,67 +110,61 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF) + mutkWallFunctionFvPatchScalarField(p, iF) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf, + const mutUWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict) + mutkWallFunctionFvPatchScalarField(p, iF, dict) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf + const mutUWallFunctionFvPatchScalarField& sawfpsf ) : - mutWallFunctionFvPatchScalarField(sawfpsf) + mutkWallFunctionFvPatchScalarField(sawfpsf) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf, + const mutUWallFunctionFvPatchScalarField& sawfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(sawfpsf, iF) + mutkWallFunctionFvPatchScalarField(sawfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const +tmp mutUWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); const RASModel& rasModel = db().lookupObject("RASProperties"); @@ -183,10 +175,7 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const } -void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void mutUWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -199,7 +188,7 @@ void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H similarity index 70% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H index 409bc0b9eb..5c70b81c44 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels:: - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutUWallFunctionFvPatchScalarField Description - Wall function boundary condition for walls + Wall function boundary condition for walls, based on velocity. SourceFiles - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C + mutUWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H -#define compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H +#ifndef compressibleMutUWallFunctionFvPatchScalarField_H +#define compressibleMutUWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration + Class mutUWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +class mutUWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +69,20 @@ protected: public: //- Runtime type information - TypeName("mutSpalartAllmarasStandardWallFunction"); + TypeName("mutUWallFunction"); // Constructors //- Construct from patch and internal field - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +90,20 @@ public: ); //- Construct by mapping given - // mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + // mutUWallFunctionFvPatchScalarField // onto a new patch - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const mutUWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& + const mutUWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,17 +111,14 @@ public: { return tmp ( - new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this - ) + new mutUWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const mutUWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -134,11 +130,7 @@ public: { return tmp ( - new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new mutUWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C similarity index 76% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C index 0eaf6d0e00..6af9687f7b 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutRoughWallFunctionFvPatchScalarField.H" +#include "mutkRoughWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -39,10 +39,9 @@ namespace compressible namespace RASModels { - // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -scalar mutRoughWallFunctionFvPatchScalarField::fnRough +scalar mutkRoughWallFunctionFvPatchScalarField::fnRough ( const scalar KsPlus, const scalar Cs @@ -65,7 +64,7 @@ scalar mutRoughWallFunctionFvPatchScalarField::fnRough } -tmp mutRoughWallFunctionFvPatchScalarField::calcMut() const +tmp mutkRoughWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -121,63 +120,63 @@ tmp mutRoughWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF), + mutkWallFunctionFvPatchScalarField(p, iF), Ks_(p.size(), 0.0), Cs_(p.size(), 0.0) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& ptf, + const mutkRoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), Ks_(ptf.Ks_, mapper), Cs_(ptf.Cs_, mapper) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict), + mutkWallFunctionFvPatchScalarField(p, iF, dict), Ks_("Ks", dict, p.size()), Cs_("Cs", dict, p.size()) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& rwfpsf + const mutkRoughWallFunctionFvPatchScalarField& rwfpsf ) : - mutWallFunctionFvPatchScalarField(rwfpsf), + mutkWallFunctionFvPatchScalarField(rwfpsf), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& rwfpsf, + const mutkRoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(rwfpsf, iF), + mutkWallFunctionFvPatchScalarField(rwfpsf, iF), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} @@ -185,34 +184,34 @@ mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void mutRoughWallFunctionFvPatchScalarField::autoMap +void mutkRoughWallFunctionFvPatchScalarField::autoMap ( const fvPatchFieldMapper& m ) { - mutWallFunctionFvPatchScalarField::autoMap(m); + mutkWallFunctionFvPatchScalarField::autoMap(m); Ks_.autoMap(m); Cs_.autoMap(m); } -void mutRoughWallFunctionFvPatchScalarField::rmap +void mutkRoughWallFunctionFvPatchScalarField::rmap ( const fvPatchScalarField& ptf, const labelList& addr ) { - mutWallFunctionFvPatchScalarField::rmap(ptf, addr); + mutkWallFunctionFvPatchScalarField::rmap(ptf, addr); - const mutRoughWallFunctionFvPatchScalarField& nrwfpsf = - refCast(ptf); + const mutkRoughWallFunctionFvPatchScalarField& nrwfpsf = + refCast(ptf); Cs_.rmap(nrwfpsf.Cs_, addr); Ks_.rmap(nrwfpsf.Ks_, addr); } -void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const +void mutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -224,7 +223,11 @@ void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mutRoughWallFunctionFvPatchScalarField); +makePatchTypeField +( + fvPatchScalarField, + mutkRoughWallFunctionFvPatchScalarField +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H similarity index 79% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H index 935ab29582..479fd7b9ab 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H @@ -27,7 +27,7 @@ Class Description Boundary condition for turbulent (kinematic) viscosity when using wall - functions for rough walls. + functions for rough walls, based on turbulence kinetic energy. Manipulates the E parameter to account for roughness effects, based on KsPlus. @@ -36,14 +36,14 @@ Description - roughness constant = 0.5-1.0 (0.5 default) SourceFiles - mutRoughWallFunctionFvPatchScalarField.C + mutkRoughWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutRoughWallFunctionFvPatchScalarField_H -#define compressibleMutRoughWallFunctionFvPatchScalarField_H +#ifndef compressibleMutkRoughWallFunctionFvPatchScalarField_H +#define compressibleMutkRoughWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,12 +55,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutRoughWallFunctionFvPatchScalarField Declaration + Class mutkRoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutRoughWallFunctionFvPatchScalarField +class mutkRoughWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -85,20 +85,20 @@ protected: public: //- Runtime type information - TypeName("mutRoughWallFunction"); + TypeName("mutkRoughWallFunction"); // Constructors //- Construct from patch and internal field - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -106,20 +106,20 @@ public: ); //- Construct by mapping given - // mutRoughWallFunctionFvPatchScalarField + // mutkRoughWallFunctionFvPatchScalarField // onto a new patch - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField&, + const mutkRoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& + const mutkRoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -127,14 +127,14 @@ public: { return tmp ( - new mutRoughWallFunctionFvPatchScalarField(*this) + new mutkRoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField&, + const mutkRoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -146,7 +146,7 @@ public: { return tmp ( - new mutRoughWallFunctionFvPatchScalarField(*this, iF) + new mutkRoughWallFunctionFvPatchScalarField(*this, iF) ); } @@ -156,10 +156,7 @@ public: // Mapping functions //- Map (and resize as needed) from self given a mapping object - virtual void autoMap - ( - const fvPatchFieldMapper& - ); + virtual void autoMap(const fvPatchFieldMapper&); //- Reverse map the given fvPatchField onto this fvPatchField virtual void rmap diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C similarity index 82% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C index 18ea20963c..b7580a5d7a 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -42,11 +42,11 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void mutWallFunctionFvPatchScalarField::checkType() +void mutkWallFunctionFvPatchScalarField::checkType() { if (!isA(patch())) { - FatalErrorIn("mutWallFunctionFvPatchScalarField::checkType()") + FatalErrorIn("mutkWallFunctionFvPatchScalarField::checkType()") << "Invalid wall function specification" << nl << " Patch type for patch " << patch().name() << " must be wall" << nl @@ -56,7 +56,7 @@ void mutWallFunctionFvPatchScalarField::checkType() } -scalar mutWallFunctionFvPatchScalarField::calcYPlusLam +scalar mutkWallFunctionFvPatchScalarField::calcYPlusLam ( const scalar kappa, const scalar E @@ -73,7 +73,7 @@ scalar mutWallFunctionFvPatchScalarField::calcYPlusLam } -tmp mutWallFunctionFvPatchScalarField::calcMut() const +tmp mutkWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); const RASModel& rasModel = db().lookupObject("RASProperties"); @@ -105,7 +105,7 @@ tmp mutWallFunctionFvPatchScalarField::calcMut() const } -void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const +void mutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const { os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl; os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl; @@ -115,7 +115,7 @@ void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -129,9 +129,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& ptf, + const mutkWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper @@ -145,7 +145,7 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -160,9 +160,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& wfpsf + const mutkWallFunctionFvPatchScalarField& wfpsf ) : fixedValueFvPatchScalarField(wfpsf), @@ -173,9 +173,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& wfpsf, + const mutkWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : @@ -189,7 +189,7 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void mutWallFunctionFvPatchScalarField::updateCoeffs() +void mutkWallFunctionFvPatchScalarField::updateCoeffs() { operator==(calcMut()); @@ -197,7 +197,7 @@ void mutWallFunctionFvPatchScalarField::updateCoeffs() } -tmp mutWallFunctionFvPatchScalarField::yPlus() const +tmp mutkWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -214,7 +214,7 @@ tmp mutWallFunctionFvPatchScalarField::yPlus() const } -void mutWallFunctionFvPatchScalarField::write(Ostream& os) const +void mutkWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -224,7 +224,7 @@ void mutWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mutWallFunctionFvPatchScalarField); +makePatchTypeField(fvPatchScalarField, mutkWallFunctionFvPatchScalarField); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H similarity index 84% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H index d90bf01e6e..91b930a344 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H @@ -23,15 +23,15 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels::mutWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutkWallFunctionFvPatchScalarField Description Boundary condition for turbulent (kinematic) viscosity when using wall - functions + functions, based on turbulence kinetic energy. - replicates OpenFOAM v1.5 (and earlier) behaviour SourceFiles - mutWallFunctionFvPatchScalarField.C + mutkWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ @@ -50,10 +50,10 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutWallFunctionFvPatchScalarField Declaration + Class mutkWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutWallFunctionFvPatchScalarField +class mutkWallFunctionFvPatchScalarField : public fixedValueFvPatchScalarField { @@ -92,20 +92,20 @@ protected: public: //- Runtime type information - TypeName("mutWallFunction"); + TypeName("mutkWallFunction"); // Constructors //- Construct from patch and internal field - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -113,20 +113,20 @@ public: ); //- Construct by mapping given - // mutWallFunctionFvPatchScalarField + // mutkWallFunctionFvPatchScalarField // onto a new patch - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField&, + const mutkWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& + const mutkWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -134,14 +134,14 @@ public: { return tmp ( - new mutWallFunctionFvPatchScalarField(*this) + new mutkWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField&, + const mutkWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -153,7 +153,7 @@ public: { return tmp ( - new mutWallFunctionFvPatchScalarField(*this, iF) + new mutkWallFunctionFvPatchScalarField(*this, iF) ); } From 96f23c27964185ca00ca2155ec5bbe29ee7b67bb Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Aug 2009 11:44:14 +0100 Subject: [PATCH 4/6] Updated wall function boundary types for utils --- .../utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C | 8 ++++---- .../applyWallFunctionBoundaryConditions.C | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C index 91197141ef..a11404646c 100644 --- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C +++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C @@ -38,11 +38,11 @@ Description #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/RAS/RASModel/RASModel.H" -#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunction/nutkWallFunctionFvPatchScalarField.H" #include "basicPsiThermo.H" #include "compressible/RAS/RASModel/RASModel.H" -#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunction/mutkWallFunctionFvPatchScalarField.H" #include "wallDist.H" @@ -56,7 +56,7 @@ void calcIncompressibleYPlus volScalarField& yPlus ) { - typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField + typedef incompressible::RASModels::nutkWallFunctionFvPatchScalarField wallFunctionPatchField; #include "createPhi.H" @@ -108,7 +108,7 @@ void calcCompressibleYPlus volScalarField& yPlus ) { - typedef compressible::RASModels::mutWallFunctionFvPatchScalarField + typedef compressible::RASModels::mutkWallFunctionFvPatchScalarField wallFunctionPatchField; IOobject rhoHeader diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C index 166386c8e3..e44e2910b7 100644 --- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C +++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C @@ -43,12 +43,12 @@ Description #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H" #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H" -#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H" +#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H" #include "incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H" #include "compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H" #include "compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H" -#include "compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H" +#include "compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H" #include "compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H" using namespace Foam; @@ -234,7 +234,7 @@ void updateCompressibleCase(const fvMesh& mesh) ( mesh, "mut", - compressible::RASModels::mutWallFunctionFvPatchScalarField::typeName, + compressible::RASModels::mutkWallFunctionFvPatchScalarField::typeName, "0" ); replaceBoundaryType @@ -286,7 +286,7 @@ void updateIncompressibleCase(const fvMesh& mesh) ( mesh, "nut", - incompressible::RASModels::nutWallFunctionFvPatchScalarField::typeName, + incompressible::RASModels::nutkWallFunctionFvPatchScalarField::typeName, "0" ); replaceBoundaryType From ab4c4840b49b553ba492cb2695b4f9f30e5ead94 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Aug 2009 11:57:03 +0100 Subject: [PATCH 5/6] Adding warning msgs to RAS S-A models if requesting k or eps - not defined --- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 48 +++++++++++++++++++ .../RAS/SpalartAllmaras/SpalartAllmaras.H | 36 +------------- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 9 ++++ 3 files changed, 59 insertions(+), 34 deletions(-) diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C index 603ed83962..af32894d27 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -249,6 +249,54 @@ SpalartAllmaras::SpalartAllmaras // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +tmp SpalartAllmaras::k() const +{ + WarningIn("tmp SpalartAllmaras::k() const") + << "Turbulence kinetic energy not defined for Spalart-Allmaras model. " + << "Returning zero field" + << endl; + + return tmp + ( + new volScalarField + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_ + ), + mesh_, + dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0) + ) + ); +} + + +tmp SpalartAllmaras::epsilon() const +{ + WarningIn("tmp SpalartAllmaras::epsilon() const") + << "Turbulence kinetic energy dissipation rate not defined for " + << "Spalart-Allmaras model. Returning zero field" + << endl; + + return tmp + ( + new volScalarField + ( + IOobject + ( + "epslion", + runTime_.timeName(), + mesh_ + ), + mesh_, + dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0) + ) + ); +} + + tmp SpalartAllmaras::R() const { return tmp diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H index 39e70c4922..94e736b9f8 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -188,42 +188,10 @@ public: } //- Return the turbulence kinetic energy - virtual tmp k() const - { - return tmp - ( - new volScalarField - ( - IOobject - ( - "k", - runTime_.timeName(), - mesh_ - ), - mesh_, - dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0) - ) - ); - } + virtual tmp k() const; //- Return the turbulence kinetic energy dissipation rate - virtual tmp epsilon() const - { - return tmp - ( - new volScalarField - ( - IOobject - ( - "epslion", - runTime_.timeName(), - mesh_ - ), - mesh_, - dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0) - ) - ); - } + virtual tmp epsilon() const; //- Return the Reynolds stress tensor virtual tmp R() const; diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C index ed37eca064..009d87b295 100644 --- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -233,6 +233,10 @@ tmp SpalartAllmaras::DnuTildaEff() const tmp SpalartAllmaras::k() const { + WarningIn("tmp SpalartAllmaras::k() const") + << "Turbulence kinetic energy not defined for Spalart-Allmaras model. " + << "Returning zero field" << endl; + return tmp ( new volScalarField @@ -252,6 +256,11 @@ tmp SpalartAllmaras::k() const tmp SpalartAllmaras::epsilon() const { + WarningIn("tmp SpalartAllmaras::epsilon() const") + << "Turbulence kinetic energy dissipation rate not defined for " + << "Spalart-Allmaras model. Returning zero field" + << endl; + return tmp ( new volScalarField From 6dbb672b014bd2389db9df7160ac50c71b8e07c9 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Aug 2009 12:04:40 +0100 Subject: [PATCH 6/6] updating tutorial cases to use new nut/mut wall function names --- tutorials/combustion/dieselFoam/aachenBomb/0/mut | 2 +- tutorials/combustion/engineFoam/kivaTest/-180/mut | 6 +++--- tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut | 8 ++++---- tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut | 4 ++-- .../rhoPorousSimpleFoam/angledDuctImplicit/0/mut | 8 ++++---- tutorials/compressible/sonicFoam/ras/prism/0/mut | 2 +- .../heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut | 6 +++--- .../buoyantBoussinesqSimpleFoam/hotRoom/0/nut | 6 +++--- .../buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut | 8 ++++---- tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut | 6 +++--- tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut | 6 +++--- .../buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut | 8 ++++---- .../hotRadiationRoomFvDOM/0/mut | 8 ++++---- .../incompressible/MRFSimpleFoam/mixerVessel2D/0/nut | 4 ++-- .../boundaryFoam/boundaryWallFunctions/0/nut | 4 ++-- tutorials/incompressible/pimpleFoam/t-junction/0/nut | 2 +- tutorials/incompressible/pisoFoam/ras/cavity/0/nut | 4 ++-- tutorials/incompressible/simpleFoam/airFoil2D/0/nut | 2 +- tutorials/incompressible/simpleFoam/motorBike/0/nut | 4 ++-- tutorials/incompressible/simpleFoam/pitzDaily/0/nut | 4 ++-- .../incompressible/simpleFoam/pitzDailyExptInlet/0/nut | 4 ++-- tutorials/incompressible/simpleSRFFoam/mixer/0/nut | 4 ++-- .../lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut | 6 +++--- .../filter/0.org/mut | 2 +- .../porousExplicitSourceReactingParcelFoam/filter/0/mut | 2 +- .../rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut | 6 +++--- tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut | 2 +- tutorials/multiphase/interFoam/ras/damBreak/0/mut | 6 +++--- tutorials/multiphase/interFoam/ras/damBreak/0/nut | 6 +++--- 29 files changed, 70 insertions(+), 70 deletions(-) diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut index a26a484df3..747fa2e1f1 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/mut +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut @@ -23,7 +23,7 @@ boundaryField { walls { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } } diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/mut b/tutorials/combustion/engineFoam/kivaTest/-180/mut index 4aa8e4942b..741abaf73f 100644 --- a/tutorials/combustion/engineFoam/kivaTest/-180/mut +++ b/tutorials/combustion/engineFoam/kivaTest/-180/mut @@ -23,7 +23,7 @@ boundaryField { piston { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -31,7 +31,7 @@ boundaryField } liner { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -39,7 +39,7 @@ boundaryField } cylinderHead { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut index 3caf2a763d..46709ca669 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut @@ -23,22 +23,22 @@ boundaryField { front { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } back { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } wall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } porosityWall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } inlet diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut index eac0c1e9aa..40518123e7 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut @@ -23,7 +23,7 @@ boundaryField { movingWall { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -31,7 +31,7 @@ boundaryField } fixedWalls { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut index a557d62335..ed42bb0c0e 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut @@ -23,25 +23,25 @@ boundaryField { front { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } back { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } wall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } porosityWall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/mut b/tutorials/compressible/sonicFoam/ras/prism/0/mut index 2278015c7b..604af39b10 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/0/mut +++ b/tutorials/compressible/sonicFoam/ras/prism/0/mut @@ -43,7 +43,7 @@ boundaryField } prismWall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } defaultFaces diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut index 3b427915fc..57b8cfbcdd 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut +++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/nut @@ -23,17 +23,17 @@ boundaryField { floor { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } ceiling { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } fixedWalls { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut index 3b427915fc..57b8cfbcdd 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/nut @@ -23,17 +23,17 @@ boundaryField { floor { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } ceiling { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } fixedWalls { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut index 26e59c7cd3..87027f2cc2 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut @@ -23,25 +23,25 @@ boundaryField { ground { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } igloo_region0 { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } twoFridgeFreezers_seal_0 { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } twoFridgeFreezers_herring_1 { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut index 675eb6014b..32e5dfbb20 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/mut @@ -23,17 +23,17 @@ boundaryField { floor { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } ceiling { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } fixedWalls { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut index 06a40eb020..ab109864e0 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut @@ -23,7 +23,7 @@ boundaryField { floor { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -31,7 +31,7 @@ boundaryField } ceiling { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -39,7 +39,7 @@ boundaryField } fixedWalls { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut index df9665bbef..0c91ea84e9 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut @@ -23,22 +23,22 @@ boundaryField { box { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } floor { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } ceiling { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } fixedWalls { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut index 3baf1d358a..a7ba9f9007 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut @@ -23,7 +23,7 @@ boundaryField { box { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -31,7 +31,7 @@ boundaryField } floor { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -39,7 +39,7 @@ boundaryField } ceiling { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; @@ -47,7 +47,7 @@ boundaryField } fixedWalls { - type mutWallFunction; + type mutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut index 765db2eefe..a8bd969de2 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/nut @@ -23,13 +23,13 @@ boundaryField { rotor { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } stator { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut index 3a8408227f..5bcd4c4a1d 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut @@ -23,12 +23,12 @@ boundaryField { lowerWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } upperWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } frontBack diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nut b/tutorials/incompressible/pimpleFoam/t-junction/0/nut index e2834c67e4..b4a42336aa 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/0/nut +++ b/tutorials/incompressible/pimpleFoam/t-junction/0/nut @@ -41,7 +41,7 @@ boundaryField defaultFaces { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } } diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/nut b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut index 0f4ab2e87b..a6fe8c0fe7 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/0/nut +++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut @@ -23,12 +23,12 @@ boundaryField { movingWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } fixedWalls { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } frontAndBack diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut index e9e99c91ff..96e4a43d3c 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/0/nut +++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut @@ -34,7 +34,7 @@ boundaryField wall { - type nutSpalartAllmarasWallFunction; + type nutUSpaldingWallFunction; value uniform 0; } diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/nut b/tutorials/incompressible/simpleFoam/motorBike/0/nut index b4358c7589..fa90ca590f 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/0/nut +++ b/tutorials/incompressible/simpleFoam/motorBike/0/nut @@ -41,7 +41,7 @@ boundaryField lowerWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } @@ -53,7 +53,7 @@ boundaryField "motorBike_.*" { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } } diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut index e07c5bc529..9a66ad0c26 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut +++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut @@ -33,12 +33,12 @@ boundaryField } upperWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } lowerWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } frontAndBack diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut index e07c5bc529..9a66ad0c26 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut @@ -33,12 +33,12 @@ boundaryField } upperWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } lowerWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } frontAndBack diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut index d60fe7a176..82d057a58b 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut +++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut @@ -33,13 +33,13 @@ boundaryField } innerWall { - type nutWallFunction; + type nutkWallFunction; U Urel; value uniform 0; } outerWall { - type nutWallFunction; + type nutkWallFunction; U Urel; value uniform 0; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut index 3b8469c894..fa451536fc 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut @@ -23,17 +23,17 @@ boundaryField { top { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } bottom { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } walls { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } symmetry diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut index c9695f501a..9a7573f3f1 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/mut @@ -23,7 +23,7 @@ boundaryField { walls { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } inlet diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut index c9695f501a..9a7573f3f1 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/mut @@ -23,7 +23,7 @@ boundaryField { walls { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } inlet diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut index 3b8469c894..fa451536fc 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut @@ -23,17 +23,17 @@ boundaryField { top { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } bottom { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } walls { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } symmetry diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut index 793a490863..ba78652d58 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut @@ -33,7 +33,7 @@ boundaryField } walls { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } frontBack diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/mut b/tutorials/multiphase/interFoam/ras/damBreak/0/mut index 8a09c067b2..41747664d5 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/mut +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/mut @@ -23,19 +23,19 @@ boundaryField { leftWall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } rightWall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } lowerWall { - type mutWallFunction; + type mutkWallFunction; value uniform 0; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nut b/tutorials/multiphase/interFoam/ras/damBreak/0/nut index 1ee1e7242e..7924a8da87 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/nut +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/nut @@ -23,17 +23,17 @@ boundaryField { leftWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } rightWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } lowerWall { - type nutWallFunction; + type nutkWallFunction; value uniform 0; } atmosphere