From b3d455de8047bac24d5c5fe1d1b4867f1f7d740d Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 21 Jul 2009 19:05:30 +0100 Subject: [PATCH] Removed turbulence model coefficients from the dictionaries to allow them to default. --- ReleaseNotes-1.6 | 2 +- .../bubbleFoam/createRASTurbulence.H | 79 ++++++-- .../solvers/multiphase/bubbleFoam/kEpsilon.H | 12 +- .../multiphase/bubbleFoam/wallFunctions.H | 9 +- .../multiphase/bubbleFoam/wallViscosity.H | 13 +- .../multiphase/settlingFoam/createFields.H | 88 ++++++--- .../multiphase/settlingFoam/kEpsilon.H | 8 +- .../multiphase/settlingFoam/wallFunctions.H | 9 +- .../multiphase/settlingFoam/wallViscosity.H | 6 +- .../multiphase/twoPhaseEulerFoam/Make/options | 3 +- .../twoPhaseEulerFoam/createFields.H | 137 +------------- .../turbulenceModel/kEpsilon.H | 61 ------ .../turbulenceModel/wallDissipation.H | 51 ----- .../turbulenceModel/wallFunctions.H | 86 --------- .../turbulenceModel/wallViscosity.H | 38 ---- .../applyWallFunctionBounaryConditions.C | 6 +- .../backwardsCompatibilityWallFunctions.C | 8 +- ...thDissipationRateInletFvPatchScalarField.C | 4 +- .../backwardsCompatibilityWallFunctions.C | 8 +- ...thDissipationRateInletFvPatchScalarField.C | 4 +- ...ngLengthFrequencyInletFvPatchScalarField.C | 4 +- .../les/pitzDaily/constant/LESProperties | 44 ----- .../XiFoam/les/pitzDaily/system/setFieldsDict | 38 ++++ .../combustion/XiFoam/les/pitzDaily3D/0/U | 1 + .../les/pitzDaily3D/constant/LESProperties | 46 +---- .../XiFoam/les/pitzDaily3D/system/fvSchemes | 6 +- .../constant/RASProperties | 75 -------- .../combustion/dieselFoam/aachenBomb/0/k | 2 +- .../aachenBomb/constant/RASProperties | 75 -------- .../combustion/engineFoam/kivaTest/-180/k | 6 +- .../kivaTest/constant/RASProperties | 75 -------- .../compressible/rhoPimpleFoam/angledDuct/0/k | 8 +- .../angledDuct/constant/RASProperties | 75 -------- .../les/pitzDaily/constant/LESProperties | 43 ----- .../compressible/rhoPisoFoam/ras/cavity/0/R | 4 +- .../compressible/rhoPisoFoam/ras/cavity/0/k | 4 +- .../ras/cavity/constant/RASProperties | 92 --------- .../angledDuctImplicit/0/k | 8 +- .../angledDuctImplicit/constant/RASProperties | 75 -------- .../ras/nacaAirfoil/constant/RASProperties | 75 -------- .../compressible/sonicFoam/ras/prism/0/k | 2 +- .../ras/prism/constant/RASProperties | 75 -------- .../buoyantBoussinesqPisoFoam/hotRoom/0/k | 6 +- .../hotRoom/constant/RASProperties | 75 -------- .../buoyantBoussinesqSimpleFoam/hotRoom/0/k | 6 +- .../hotRoom/constant/RASProperties | 75 -------- .../iglooWithFridges/0/k | 8 +- .../iglooWithFridges/constant/RASProperties | 75 -------- .../heatTransfer/buoyantPisoFoam/hotRoom/0/k | 6 +- .../hotRoom/constant/RASProperties | 75 -------- .../buoyantSimpleFoam/hotRoom/0/k | 6 +- .../hotRoom/constant/RASProperties | 75 -------- .../hotRadiationRoom/0/k | 8 +- .../hotRadiationRoom/constant/RASProperties | 75 -------- .../hotRadiationRoomFvDOM/0/k | 8 +- .../constant/RASProperties | 75 -------- .../chtMultiRegionFoam/multiRegionHeater/0/k | 8 +- .../constant/bottomAir/RASProperties | 74 +------- .../constant/topAir/RASProperties | 75 +------- .../constant/bottomAir/RASProperties | 74 +------- .../constant/topAir/RASProperties | 75 +------- .../MRFSimpleFoam/mixerVessel2D/0/k | 4 +- .../mixerVessel2D/constant/RASProperties | 167 ----------------- .../constant/RASProperties | 167 ----------------- .../boundaryFoam/boundaryWallFunctions/0/k | 4 +- .../constant/RASProperties | 167 ----------------- .../channel395/constant/LESProperties | 99 ---------- .../incompressible/pimpleFoam/t-junction/0/k | 2 +- .../t-junction/constant/RASProperties | 176 ------------------ .../les/pitzDaily/constant/LESProperties | 99 ---------- .../constant/LESProperties | 99 ---------- .../constant/polyMesh/boundary | 2 +- .../incompressible/pisoFoam/ras/cavity/0/R | 4 +- .../incompressible/pisoFoam/ras/cavity/0/k | 4 +- .../ras/cavity/constant/RASProperties | 176 ------------------ .../airFoil2D/constant/RASProperties | 151 +-------------- .../motorBike/0/turbulentBoundaryField | 4 +- .../motorBike/constant/RASProperties | 176 ------------------ .../incompressible/simpleFoam/pitzDaily/0/R | 4 +- .../incompressible/simpleFoam/pitzDaily/0/k | 4 +- .../pitzDaily/constant/RASProperties | 176 ------------------ .../simpleFoam/pitzDailyExptInlet/0/R | 4 +- .../simpleFoam/pitzDailyExptInlet/0/k | 4 +- .../pitzDailyExptInlet/constant/RASProperties | 176 ------------------ .../incompressible/simpleSRFFoam/mixer/0/k | 4 +- .../mixer/constant/RASProperties | 167 ----------------- .../coalChemistryFoam/simplifiedSiwek/0/k | 6 +- .../filter/0.org/k | 2 +- .../filter/0/k | 2 +- .../filter/constant/RASProperties | 145 --------------- .../rhoPisoTwinParcelFoam/simplifiedSiwek/0/k | 6 +- .../simplifiedSiwek/constant/RASProperties | 76 -------- .../bubbleColumn/constant/RASProperties | 19 -- .../les/throttle/constant/LESProperties | 105 ----------- .../les/throttle3D/constant/LESProperties | 105 ----------- .../cavitatingFoam/ras/throttle/0/k | 2 +- .../ras/throttle/constant/RASProperties | 176 +----------------- .../ras/throttle/constant/polyMesh/boundary | 2 +- .../les/depthCharge2D/constant/LESProperties | 98 ---------- .../les/depthCharge3D/constant/LESProperties | 98 ---------- .../constant/RASProperties | 151 --------------- .../ras/sloshingTank2D/constant/RASProperties | 151 +-------------- .../sloshingTank2D3DoF/constant/RASProperties | 151 +-------------- .../ras/sloshingTank3D/constant/RASProperties | 151 +-------------- .../sloshingTank3D3DoF/constant/RASProperties | 151 --------------- .../sloshingTank3D6DoF/constant/RASProperties | 151 +-------------- .../les/nozzleFlow2D/constant/LESProperties | 99 ---------- .../multiphase/interFoam/ras/damBreak/0/R | 6 +- .../multiphase/interFoam/ras/damBreak/0/k | 6 +- .../ras/damBreak/constant/RASProperties | 160 ---------------- .../ras/dahl/constant/RASProperties | 20 -- .../ras/tank3D/constant/RASProperties | 20 -- .../bed/constant/RASProperties | 16 -- .../twoPhaseEulerFoam/bed/system/fvSchemes | 4 +- .../bed2/constant/RASProperties | 16 -- .../twoPhaseEulerFoam/bed2/system/fvSchemes | 4 +- .../bubbleColumn/constant/RASProperties | 15 -- 117 files changed, 331 insertions(+), 6167 deletions(-) delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallDissipation.H delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H delete mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H create mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 index 7227dac4fe..e80c00d3b7 100644 --- a/ReleaseNotes-1.6 +++ b/ReleaseNotes-1.6 @@ -178,7 +178,7 @@ - =mut=: =muWallFunction= - =epsilon=: =epsilonWallFunction= - =omega=: =omegaWallFunction= - - =k=, =Q=, =R=: =kQRWallFunction= + - =k=, =q=, =R=: =kqRWallFunction= - for temperature: - =alphat=: =alphatWallFunction= - New =alphaSgsJayatillekeWallFunction= thermal wall function for diff --git a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H index 9eb468f916..f9794a914f 100644 --- a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H +++ b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H @@ -16,52 +16,93 @@ RASProperties.lookup("turbulence") ); - dictionary kEpsilonCoeffs + dictionary kEpsilonDict ( - RASProperties.subDict("kEpsilonCoeffs") + RASProperties.subDictPtr("kEpsilonCoeffs") ); - - scalar Cmu + dimensionedScalar Cmu ( - readScalar(kEpsilonCoeffs.lookup("Cmu")) + dimensionedScalar::lookupOrAddToDict + ( + "Cmu", + kEpsilonDict, + 0.09 + ) ); - scalar C1 + dimensionedScalar C1 ( - readScalar(kEpsilonCoeffs.lookup("C1")) + dimensionedScalar::lookupOrAddToDict + ( + "C1", + kEpsilonDict, + 1.44 + ) ); - scalar C2 + dimensionedScalar C2 ( - readScalar(kEpsilonCoeffs.lookup("C2")) + dimensionedScalar::lookupOrAddToDict + ( + "C2", + kEpsilonDict, + 1.92 + ) ); - scalar alphak + dimensionedScalar alphak ( - readScalar(kEpsilonCoeffs.lookup("alphak")) + dimensionedScalar::lookupOrAddToDict + ( + "alphaEps", + kEpsilonDict, + 1.0 + ) ); - scalar alphaEps + dimensionedScalar alphaEps ( - readScalar(kEpsilonCoeffs.lookup("alphaEps")) + dimensionedScalar::lookupOrAddToDict + ( + "alphaEps", + kEpsilonDict, + 0.76923 + ) ); - dictionary wallFunctionCoeffs + dictionary wallFunctionDict ( - RASProperties.subDict("wallFunctionCoeffs") + RASProperties.subDictPtr("wallFunctionCoeffs") ); - scalar kappa + dimensionedScalar kappa ( - readScalar(wallFunctionCoeffs.lookup("kappa")) + dimensionedScalar::lookupOrAddToDict + ( + "kappa", + wallFunctionDict, + 0.4187 + ) ); - scalar E + dimensionedScalar E ( - readScalar(wallFunctionCoeffs.lookup("E")) + dimensionedScalar::lookupOrAddToDict + ( + "E", + wallFunctionDict, + 9.0 + ) ); + if (RASProperties.lookupOrDefault("printCoeffs", false)) + { + Info<< "kEpsilonCoeffs" << kEpsilonDict << nl + << "wallFunctionCoeffs" << wallFunctionDict << endl; + } + + nearWallDist y(mesh); diff --git a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H index b1c8951b04..576e3253ab 100644 --- a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H +++ b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H @@ -16,7 +16,11 @@ if(turbulence) ( fvm::ddt(beta, epsilon) + fvm::div(phib, epsilon) - - fvm::laplacian(alphaEps*nuEffb, epsilon) + - fvm::laplacian + ( + alphaEps*nuEffb, epsilon, + "laplacian(DepsilonEff,epsilon)" + ) == C1*beta*G*epsilon/k - fvm::Sp(C2*beta*epsilon/k, epsilon) @@ -35,7 +39,11 @@ if(turbulence) ( fvm::ddt(beta, k) + fvm::div(phib, k) - - fvm::laplacian(alphak*nuEffb, k) + - fvm::laplacian + ( + alphak*nuEffb, k, + "laplacian(DkEff,k)" + ) == beta*G - fvm::Sp(beta*epsilon/k, k) diff --git a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H index 8650460bc1..38b7297b10 100644 --- a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H +++ b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H @@ -1,8 +1,9 @@ { labelList cellBoundaryFaceCount(epsilon.size(), 0); - scalar Cmu25 = ::pow(Cmu, 0.25); - scalar Cmu75 = ::pow(Cmu, 0.75); + scalar Cmu25 = ::pow(Cmu.value(), 0.25); + scalar Cmu75 = ::pow(Cmu.value(), 0.75); + scalar kappa_ = kappa.value(); const fvPatchList& patches = mesh.boundary(); @@ -53,14 +54,14 @@ epsilon[faceCelli] += Cmu75*::pow(k[faceCelli], 1.5) - /(kappa*y[patchi][facei]); + /(kappa_*y[patchi][facei]); if (yPlus > 11.6) { G[faceCelli] += nuw[facei]*magFaceGradU[facei] *Cmu25*::sqrt(k[faceCelli]) - /(kappa*y[patchi][facei]); + /(kappa_*y[patchi][facei]); } } } diff --git a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H index cd9c005302..21ea94d8d7 100644 --- a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H +++ b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H @@ -1,5 +1,8 @@ { - scalar Cmu25 = ::pow(Cmu, 0.25); + scalar Cmu25 = ::pow(Cmu.value(), 0.25); + scalar kappa_ = kappa.value(); + scalar E_ = E.value(); + scalar nub_ = nub.value(); const fvPatchList& patches = mesh.boundary(); @@ -19,14 +22,14 @@ scalar yPlus = Cmu25*y[patchi][facei] *::sqrt(k[faceCelli]) - /nub.value(); + /nub_; if (yPlus > 11.6) { nutw[facei] = - yPlus*nub.value()*kappa - /::log(E*yPlus) - - nub.value(); + yPlus*nub_*kappa_ + /::log(E_*yPlus) + - nub_; } else { diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H index 916acde39e..9f0ca00596 100644 --- a/applications/solvers/multiphase/settlingFoam/createFields.H +++ b/applications/solvers/multiphase/settlingFoam/createFields.H @@ -228,57 +228,103 @@ RASProperties.lookup("turbulence") ); - const dictionary& kEpsilonCoeffs + dictionary kEpsilonDict ( - RASProperties.subDict("kEpsilonCoeffs") + RASProperties.subDictPtr("kEpsilonCoeffs") ); - - scalar Cmu + dimensionedScalar Cmu ( - readScalar(kEpsilonCoeffs.lookup("Cmu")) + dimensionedScalar::lookupOrAddToDict + ( + "Cmu", + kEpsilonDict, + 0.09 + ) ); - scalar C1 + dimensionedScalar C1 ( - readScalar(kEpsilonCoeffs.lookup("C1")) + dimensionedScalar::lookupOrAddToDict + ( + "C1", + kEpsilonDict, + 1.44 + ) ); - scalar C2 + dimensionedScalar C2 ( - readScalar(kEpsilonCoeffs.lookup("C2")) + dimensionedScalar::lookupOrAddToDict + ( + "C2", + kEpsilonDict, + 1.92 + ) ); - scalar C3 + dimensionedScalar C3 ( - readScalar(kEpsilonCoeffs.lookup("C3")) + dimensionedScalar::lookupOrAddToDict + ( + "C3", + kEpsilonDict, + 0.85 + ) ); - scalar alphak + dimensionedScalar alphak ( - readScalar(kEpsilonCoeffs.lookup("alphak")) + dimensionedScalar::lookupOrAddToDict + ( + "alphaEps", + kEpsilonDict, + 1.0 + ) ); - scalar alphaEps + dimensionedScalar alphaEps ( - readScalar(kEpsilonCoeffs.lookup("alphaEps")) + dimensionedScalar::lookupOrAddToDict + ( + "alphaEps", + kEpsilonDict, + 0.76923 + ) ); - const dictionary& wallFunctionCoeffs + dictionary wallFunctionDict ( - RASProperties.subDict("wallFunctionCoeffs") + RASProperties.subDictPtr("wallFunctionCoeffs") ); - scalar kappa + dimensionedScalar kappa ( - readScalar(wallFunctionCoeffs.lookup("kappa")) + dimensionedScalar::lookupOrAddToDict + ( + "kappa", + wallFunctionDict, + 0.4187 + ) ); - scalar E + dimensionedScalar E ( - readScalar(wallFunctionCoeffs.lookup("E")) + dimensionedScalar::lookupOrAddToDict + ( + "E", + wallFunctionDict, + 9.0 + ) ); + if (RASProperties.lookupOrDefault("printCoeffs", false)) + { + Info<< "kEpsilonCoeffs" << kEpsilonDict << nl + << "wallFunctionCoeffs" << wallFunctionDict << endl; + } + + nearWallDist y(mesh); Info<< "Reading field k\n" << endl; diff --git a/applications/solvers/multiphase/settlingFoam/kEpsilon.H b/applications/solvers/multiphase/settlingFoam/kEpsilon.H index 0c0930dd10..742fcde708 100644 --- a/applications/solvers/multiphase/settlingFoam/kEpsilon.H +++ b/applications/solvers/multiphase/settlingFoam/kEpsilon.H @@ -26,7 +26,7 @@ if(turbulence) + fvm::div(phi, epsilon) - fvm::laplacian ( - alphaEps*mut + mul, epsilon, + alphaEps*mut + mul, epsilon, "laplacian(DepsilonEff,epsilon)" ) == @@ -49,7 +49,11 @@ if(turbulence) ( fvm::ddt(rho, k) + fvm::div(phi, k) - - fvm::laplacian(alphak*mut + mul, k, "laplacian(DkEff,k)") + - fvm::laplacian + ( + alphak*mut + mul, k, + "laplacian(DkEff,k)" + ) == G - fvm::SuSp(Gcoef + 2.0/3.0*rho*divU, k) diff --git a/applications/solvers/multiphase/settlingFoam/wallFunctions.H b/applications/solvers/multiphase/settlingFoam/wallFunctions.H index 411a897499..ae323691e3 100644 --- a/applications/solvers/multiphase/settlingFoam/wallFunctions.H +++ b/applications/solvers/multiphase/settlingFoam/wallFunctions.H @@ -1,8 +1,9 @@ { labelList cellBoundaryFaceCount(epsilon.size(), 0); - scalar Cmu25 = ::pow(Cmu, 0.25); - scalar Cmu75 = ::pow(Cmu, 0.75); + scalar Cmu25 = ::pow(Cmu.value(), 0.25); + scalar Cmu75 = ::pow(Cmu.value(), 0.75); + scalar kappa_ = kappa.value(); const fvPatchList& patches = mesh.boundary(); @@ -55,14 +56,14 @@ epsilon[faceCelli] += Cmu75*rho[faceCelli]*::pow(k[faceCelli], 1.5) - /(kappa*y[patchi][facei]); + /(kappa_*y[patchi][facei]); if (yPlus > 11.6) { G[faceCelli] += mutw[facei]*magFaceGradU[facei] *Cmu25*::sqrt(k[faceCelli]) - /(kappa*y[patchi][facei]); + /(kappa_*y[patchi][facei]); } } } diff --git a/applications/solvers/multiphase/settlingFoam/wallViscosity.H b/applications/solvers/multiphase/settlingFoam/wallViscosity.H index 665d4bbf74..35d6f9ba8b 100644 --- a/applications/solvers/multiphase/settlingFoam/wallViscosity.H +++ b/applications/solvers/multiphase/settlingFoam/wallViscosity.H @@ -1,5 +1,7 @@ { - scalar Cmu25 = ::pow(Cmu, 0.25); + scalar Cmu25 = ::pow(Cmu.value(), 0.25); + scalar kappa_ = kappa.value(); + scalar E_ = E.value(); const fvPatchList& patches = mesh.boundary(); @@ -26,7 +28,7 @@ { mutw[facei] = muw[facei] - *(yPlus*kappa/::log(E*yPlus) - 1); + *(yPlus*kappa_/::log(E_*yPlus) - 1); } else { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options index 3e7b346fe2..1bf97d106c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I../bubbleFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -IturbulenceModel \ @@ -6,7 +7,7 @@ EXE_INC = \ -IinterfacialModels/lnInclude \ -IphaseModel/lnInclude \ -Iaveraging - + EXE_LIBS = \ -lEulerianInterfacialModels \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H index 8a17615715..e422fe845b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H @@ -91,34 +91,6 @@ alpha*Ua + beta*Ub ); - Info<< "Reading field k\n" << endl; - volScalarField k - ( - IOobject - ( - "k", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - Info<< "Reading field epsilon\n" << endl; - volScalarField epsilon - ( - IOobject - ( - "epsilon", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - dimensionedScalar Cvm ( transportProperties.lookup("Cvm") @@ -156,114 +128,7 @@ alpha*rhoa + beta*rhob ); - IOdictionary RASProperties - ( - IOobject - ( - "RASProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - - Switch turbulence - ( - RASProperties.lookup("turbulence") - ); - - dictionary kEpsilonCoeffs - ( - RASProperties.subDict("kEpsilonCoeffs") - ); - - - scalar Cmu - ( - readScalar(kEpsilonCoeffs.lookup("Cmu")) - ); - - scalar C1 - ( - readScalar(kEpsilonCoeffs.lookup("C1")) - ); - - scalar C2 - ( - readScalar(kEpsilonCoeffs.lookup("C2")) - ); - - scalar alphak - ( - readScalar(kEpsilonCoeffs.lookup("alphak")) - ); - - scalar alphaEps - ( - readScalar(kEpsilonCoeffs.lookup("alphaEps")) - ); - - dictionary wallFunctionCoeffs - ( - RASProperties.subDict("wallFunctionCoeffs") - ); - - scalar kappa - ( - readScalar(wallFunctionCoeffs.lookup("kappa")) - ); - - scalar E - ( - readScalar(wallFunctionCoeffs.lookup("E")) - ); - - nearWallDist y(mesh); - - Info<< "Calculating field nutb\n" << endl; - volScalarField nutb - ( - IOobject - ( - "nutb", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - Cmu*sqr(k)/epsilon - ); - - Info<< "Calculating field nuEffa\n" << endl; - volScalarField nuEffa - ( - IOobject - ( - "nuEffa", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - sqr(Ct)*nutb + nua - ); - - Info<< "Calculating field nuEffb\n" << endl; - volScalarField nuEffb - ( - IOobject - ( - "nuEffb", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - nutb + nub - ); - + #include "createRASTurbulence.H" Info<< "Calculating field DDtUa and DDtUb\n" << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H deleted file mode 100644 index 9479d6a47f..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/kEpsilon.H +++ /dev/null @@ -1,61 +0,0 @@ -if(turbulence) -{ - if (mesh.changing()) - { - y.correct(); - } - - tmp tgradUb = fvc::grad(Ub); - volScalarField G = 2*nutb*(tgradUb() && dev(symm(tgradUb()))); - tgradUb.clear(); - -# include "wallFunctions.H" - - // Dissipation equation - fvScalarMatrix epsEqn - ( - fvm::ddt(beta, epsilon) - + fvm::div(phib, epsilon) - - fvm::laplacian - ( - alphaEps*nuEffb, - epsilon, - "laplacian((alphaEps*nuEffb),epsilon)" - ) - == - C1*beta*G*epsilon/k - - fvm::Sp(C2*beta*epsilon/k, epsilon) - ); - -# include "wallDissipation.H" - - epsEqn.relax(); - epsEqn.solve(); - - epsilon.max(dimensionedScalar("zero", epsilon.dimensions(), 1.0e-15)); - - - // Turbulent kinetic energy equation - fvScalarMatrix kEqn - ( - fvm::ddt(beta, k) - + fvm::div(phib, k) - - fvm::laplacian(alphak*nuEffb, k, "laplacian((alphak*nuEffb),k)") - == - beta*G - - fvm::Sp(beta*epsilon/k, k) - ); - kEqn.relax(); - kEqn.solve(); - - k.max(dimensionedScalar("zero", k.dimensions(), 1.0e-8)); - - //- Re-calculate turbulence viscosity - nutb = Cmu*sqr(k)/epsilon; - -# include "wallViscosity.H" - -} - -nuEffa = sqr(Ct)*nutb + nua; -nuEffb = nutb + nub; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallDissipation.H b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallDissipation.H deleted file mode 100644 index 5c84c9e7ac..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallDissipation.H +++ /dev/null @@ -1,51 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Global - wallDissipation - -Description - Set wall dissipation in the epsilon matrix - -\*---------------------------------------------------------------------------*/ - -{ - const fvPatchList& patches = mesh.boundary(); - - forAll(patches, patchi) - { - const fvPatch& p = patches[patchi]; - - if (isType(p)) - { - epsEqn.setValues - ( - p.faceCells(), - epsilon.boundaryField()[patchi].patchInternalField() - ); - } - } -} - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H deleted file mode 100644 index ea7d1a9b14..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H +++ /dev/null @@ -1,86 +0,0 @@ -{ - labelList cellBoundaryFaceCount(epsilon.size(), 0); - - scalar Cmu25 = ::pow(Cmu, 0.25); - scalar Cmu75 = ::pow(Cmu, 0.75); - - const fvPatchList& patches = mesh.boundary(); - - //- Initialise the near-wall P field to zero - forAll(patches, patchi) - { - const fvPatch& currPatch = patches[patchi]; - - if (isType(currPatch)) - { - forAll(currPatch, facei) - { - label faceCelli = currPatch.faceCells()[facei]; - - epsilon[faceCelli] = 0.0; - G[faceCelli] = 0.0; - } - } - } - - //- Accumulate the wall face contributions to epsilon and G - // Increment cellBoundaryFaceCount for each face for averaging - forAll(patches, patchi) - { - const fvPatch& currPatch = patches[patchi]; - - if (isType(currPatch)) - { - const scalarField& nuw = nutb.boundaryField()[patchi]; - - scalarField magFaceGradU = mag(U.boundaryField()[patchi].snGrad()); - - forAll(currPatch, facei) - { - label faceCelli = currPatch.faceCells()[facei]; - - scalar yPlus = - Cmu25*y[patchi][facei] - *::sqrt(k[faceCelli]) - /nub.value(); - - // For corner cells (with two boundary or more faces), - // epsilon and G in the near-wall cell are calculated - // as an average - - cellBoundaryFaceCount[faceCelli]++; - - epsilon[faceCelli] += - Cmu75*::pow(k[faceCelli], 1.5) - /(kappa*y[patchi][facei]); - - if (yPlus > 11.6) - { - G[faceCelli] += - nuw[facei]*magFaceGradU[facei] - *Cmu25*::sqrt(k[faceCelli]) - /(kappa*y[patchi][facei]); - } - } - } - } - - - // perform the averaging - - forAll(patches, patchi) - { - const fvPatch& curPatch = patches[patchi]; - - if (isType(curPatch)) - { - forAll(curPatch, facei) - { - label faceCelli = curPatch.faceCells()[facei]; - - epsilon[faceCelli] /= cellBoundaryFaceCount[faceCelli]; - G[faceCelli] /= cellBoundaryFaceCount[faceCelli]; - } - } - } -} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H deleted file mode 100644 index cd9c005302..0000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H +++ /dev/null @@ -1,38 +0,0 @@ -{ - scalar Cmu25 = ::pow(Cmu, 0.25); - - const fvPatchList& patches = mesh.boundary(); - - forAll(patches, patchi) - { - const fvPatch& currPatch = patches[patchi]; - - if (isType(currPatch)) - { - scalarField& nutw = nutb.boundaryField()[patchi]; - - forAll(currPatch, facei) - { - label faceCelli = currPatch.faceCells()[facei]; - - // calculate yPlus - scalar yPlus = - Cmu25*y[patchi][facei] - *::sqrt(k[faceCelli]) - /nub.value(); - - if (yPlus > 11.6) - { - nutw[facei] = - yPlus*nub.value()*kappa - /::log(E*yPlus) - - nub.value(); - } - else - { - nutw[facei] = 0.0; - } - } - } - } -} diff --git a/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C index 1cdc3f28ab..b26c7154fc 100644 --- a/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C +++ b/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C @@ -266,9 +266,9 @@ int main(int argc, char *argv[]) replaceBoundaryType(mesh, "epsilon", "epsilonWallFunction", "0"); replaceBoundaryType(mesh, "omega", "omegaWallFunction", "0"); - replaceBoundaryType(mesh, "k", "kQRWallFunction", "0"); - replaceBoundaryType(mesh, "q", "kQRWallFunction", "0"); - replaceBoundaryType(mesh, "R", "kQRWallFunction", "(0 0 0 0 0 0)"); + replaceBoundaryType(mesh, "k", "kqRWallFunction", "0"); + replaceBoundaryType(mesh, "q", "kqRWallFunction", "0"); + replaceBoundaryType(mesh, "R", "kqRWallFunction", "(0 0 0 0 0 0)"); Info<< "End\n" << endl; diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C index 657dfbb48e..4749b46c07 100644 --- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C @@ -30,7 +30,7 @@ License #include "alphatWallFunctionFvPatchScalarField.H" #include "mutWallFunctionFvPatchScalarField.H" #include "epsilonWallFunctionFvPatchScalarField.H" -#include "kQRWallFunctionFvPatchField.H" +#include "kqRWallFunctionFvPatchField.H" #include "omegaWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -230,7 +230,7 @@ tmp autoCreateK autoCreateWallFunctionField < scalar, - RASModels::kQRWallFunctionFvPatchField + RASModels::kqRWallFunctionFvPatchField > ( fieldName, @@ -249,7 +249,7 @@ tmp autoCreateQ autoCreateWallFunctionField < scalar, - RASModels::kQRWallFunctionFvPatchField + RASModels::kqRWallFunctionFvPatchField > ( fieldName, @@ -268,7 +268,7 @@ tmp autoCreateR autoCreateWallFunctionField < symmTensor, - RASModels::kQRWallFunctionFvPatchField + RASModels::kqRWallFunctionFvPatchField > ( fieldName, diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C index 2e44d03c73..d83cd7bfc2 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C @@ -110,7 +110,9 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs() // Lookup Cmu corresponding to the turbulence model selected const RASModel& rasModel = db().lookupObject("RASProperties"); - const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu")); + const scalar Cmu = + rasModel.coeffDict().lookupOrDefault("Cmu", 0.09); + const scalar Cmu75 = pow(Cmu, 0.75); const fvPatchField& kp = diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C index f7b144a03b..900cd1a24e 100644 --- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C @@ -29,7 +29,7 @@ License #include "calculatedFvPatchField.H" #include "nutWallFunctionFvPatchScalarField.H" #include "epsilonWallFunctionFvPatchScalarField.H" -#include "kQRWallFunctionFvPatchField.H" +#include "kqRWallFunctionFvPatchField.H" #include "omegaWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -159,7 +159,7 @@ tmp autoCreateK autoCreateWallFunctionField < scalar, - RASModels::kQRWallFunctionFvPatchField + RASModels::kqRWallFunctionFvPatchField > ( fieldName, @@ -178,7 +178,7 @@ tmp autoCreateQ autoCreateWallFunctionField < scalar, - RASModels::kQRWallFunctionFvPatchField + RASModels::kqRWallFunctionFvPatchField > ( fieldName, @@ -197,7 +197,7 @@ tmp autoCreateR autoCreateWallFunctionField < symmTensor, - RASModels::kQRWallFunctionFvPatchField + RASModels::kqRWallFunctionFvPatchField > ( fieldName, diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C index 3c880b108f..cab3484017 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C @@ -110,7 +110,9 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs() // Lookup Cmu corresponding to the turbulence model selected const RASModel& rasModel = db().lookupObject("RASProperties"); - const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu")); + const scalar Cmu = + rasModel.coeffDict().lookupOrDefault("Cmu", 0.09); + const scalar Cmu75 = pow(Cmu, 0.75); const fvPatchField& kp = diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index acff657d95..dac5ccb0f1 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -115,7 +115,9 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() // Lookup Cmu corresponding to the turbulence model selected const RASModel& rasModel = db().lookupObject("RASProperties"); - const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu")); + const scalar Cmu = + rasModel.coeffDict().lookupOrDefault("Cmu", 0.09); + const scalar Cmu25 = pow(Cmu, 0.25); const fvPatchField& kp = diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties index 9beb4b8687..43f63e2551 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties @@ -23,42 +23,6 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ce 1.048; - ck 0.094; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -lowReOneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; - beta 0.01; -} - -SmagorinskyCoeffs -{ - ck 0.02; - ce 0.202; -} - -DeardorffDiffStressCoeffs -{ - ce 1.048; - ck 0.094; - cm 4.13; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -120,13 +84,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; - Prt 0.85; -} - // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict new file mode 100644 index 0000000000..9821378899 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict @@ -0,0 +1,38 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object setFieldsDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +defaultFieldValues +( + volScalarFieldValue b 1 + volScalarFieldValue T 293 +); + +regions +( + boxToCell + { + box (-1 -1 -1) (1 0 1); + fieldValues + ( + volScalarFieldValue b 0 + volScalarFieldValue T 1650 + ); + } +); + + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U index c2ff1ef691..b1b98a1871 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U @@ -25,6 +25,7 @@ boundaryField type turbulentInlet; referenceField uniform (13.3 0 0); fluctuationScale (0.04 0.02 0.02); + alpha 0.1; } outlet diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties index 9beb4b8687..c0b9ec7e0b 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties @@ -17,48 +17,12 @@ FoamFile LESModel oneEqEddy; -delta cubeRootVol; +delta vanDriest; turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ce 1.048; - ck 0.094; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -lowReOneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; - beta 0.01; -} - -SmagorinskyCoeffs -{ - ck 0.02; - ce 0.202; -} - -DeardorffDiffStressCoeffs -{ - ce 1.048; - ck 0.094; - cm 4.13; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -120,13 +84,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; - Prt 0.85; -} - // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes index d4a2457583..2f2d8e9ebb 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes @@ -34,7 +34,11 @@ divSchemes div(phiXi,Xi) Gauss limitedLinear01 0.1; div(phiXi,Su) Gauss limitedLinear01 0.1; div(phiSt,b) Gauss limitedLinear01 0.1; - div(phi,ft_b_h_hu) Gauss multivariateSelection + div(phi,ft) Gauss limitedLinear01 0.1; + div(phi,b) Gauss limitedLinear01 0.1; + div(phi,h) Gauss limitedLinear 0.1; + div(phi,hu) Gauss limitedLinear 0.1; + div(phi,ft_b_h_hu)_0 Gauss multivariateSelection { ft limitedLinear01 0.1; b limitedLinear01 0.1; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties index 564a9fbe23..2c10ab8a57 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0; - alphah 1.111; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 0; - alphah 1.111; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0; - alphah 1.111; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/k b/tutorials/combustion/dieselFoam/aachenBomb/0/k index b037171c72..6650fed2ab 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/k +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/k @@ -23,7 +23,7 @@ boundaryField { walls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties index 991a2915d9..d5a0479c35 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; - muLimiter on; - Lsgs 0.0002; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - Cs 0.25; - Ceps 0.15; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/engineFoam/kivaTest/-180/k index b97d4da7fd..3b0e378049 100644 --- a/tutorials/combustion/engineFoam/kivaTest/-180/k +++ b/tutorials/combustion/engineFoam/kivaTest/-180/k @@ -23,17 +23,17 @@ boundaryField { piston { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 4; } liner { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 4; } cylinderHead { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 4; } } diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties index 62bcf8bb71..7241516130 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties +++ b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0; - alphah 1.111; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k index 36be49f2ea..655a91bb45 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k @@ -23,22 +23,22 @@ boundaryField { front { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } back { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } wall { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } porosityWall { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } inlet diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties index 26216fcde0..7241516130 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties index 251fe1ae80..a09776e023 100644 --- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties @@ -23,42 +23,6 @@ printCoeffs on; delta cubeRootVol; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ce 1.048; - ck 0.094; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -lowReOneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; - beta 0.01; -} - -SmagorinskyCoeffs -{ - ck 0.02; - ce 0.202; -} - -DeardorffDiffStressCoeffs -{ - ce 1.048; - ck 0.094; - cm 4.13; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -120,12 +84,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R index 6d7f9a3db1..be21f26a9e 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R @@ -23,13 +23,13 @@ boundaryField { movingWall { - type kQRWallFunction; + type kqRWallFunction; value uniform ( 0 0 0 0 0 0 ); } fixedWalls { - type kQRWallFunction; + type kqRWallFunction; value uniform ( 0 0 0 0 0 0 ); } diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k index 8f645b088c..01415635a2 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k @@ -23,12 +23,12 @@ boundaryField { movingWall { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0; } fixedWalls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0; } frontAndBack diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties index 15184ba185..480abbfe0e 100644 --- a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties +++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties @@ -21,97 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; - alphah 1; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k index 1243952ec2..2252063de2 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k @@ -23,25 +23,25 @@ boundaryField { front { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } back { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } wall { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } porosityWall { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1; } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties index 48bd2ba117..d5a0479c35 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties index 226b420b22..34805a0b26 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/k b/tutorials/compressible/sonicFoam/ras/prism/0/k index 77ca6b529a..2917c4e849 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/0/k +++ b/tutorials/compressible/sonicFoam/ras/prism/0/k @@ -46,7 +46,7 @@ boundaryField } prismWall { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 1000; } defaultFaces diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties index 26216fcde0..7241516130 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k index 38c2a542ef..8e5e6563ee 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k +++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k @@ -23,17 +23,17 @@ boundaryField { floor { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } ceiling { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } fixedWalls { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/RASProperties index 35b5a409f2..7241516130 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k index 38c2a542ef..8e5e6563ee 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k @@ -23,17 +23,17 @@ boundaryField { floor { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } ceiling { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } fixedWalls { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties index 35b5a409f2..7241516130 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k index bd0cf46f0d..a6ee8bf7dd 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k @@ -23,25 +23,25 @@ boundaryField { ground { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } igloo_region0 { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } twoFridgeFreezers_seal_0 { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } twoFridgeFreezers_herring_1 { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties index 35b5a409f2..7241516130 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k index 4ec7f08960..62dd722078 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/k @@ -23,17 +23,17 @@ boundaryField { floor { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } ceiling { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } fixedWalls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } } diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties index 35b5a409f2..7241516130 100644 --- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k index 4ec7f08960..62dd722078 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k @@ -23,17 +23,17 @@ boundaryField { floor { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } ceiling { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } fixedWalls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/RASProperties index 35b5a409f2..7241516130 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k index daee975209..2b618db2f3 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k @@ -23,22 +23,22 @@ boundaryField { box { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } floor { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } ceiling { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } fixedWalls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.1; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties index 35b5a409f2..7241516130 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k index 5b206f8e4e..e545d6fb8e 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k @@ -23,25 +23,25 @@ boundaryField { floor { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0; } ceiling { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0; } fixedWalls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0; } box { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/RASProperties index 35b5a409f2..7241516130 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/RASProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/RASProperties @@ -21,80 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k index 49df1e0d2b..0ce36fa084 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k @@ -23,12 +23,12 @@ boundaryField { minY { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } maxY { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } minX @@ -42,12 +42,12 @@ boundaryField } minZ { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } maxZ { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } topAir_to_leftSolid diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties index 6b4cc41e7a..f0056ac038 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties @@ -18,79 +18,7 @@ RASModel kEpsilon; turbulence off; -laminarCoeffs -{ -} +printCoeffs on; -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties index 9037f27905..f0056ac038 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties @@ -16,82 +16,9 @@ FoamFile RASModel kEpsilon; -//turbulence on; turbulence off; -laminarCoeffs -{ -} +printCoeffs on; -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties index 6b4cc41e7a..f0056ac038 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties @@ -18,79 +18,7 @@ RASModel kEpsilon; turbulence off; -laminarCoeffs -{ -} +printCoeffs on; -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties index 9037f27905..f0056ac038 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties @@ -16,82 +16,9 @@ FoamFile RASModel kEpsilon; -//turbulence on; turbulence off; -laminarCoeffs -{ -} +printCoeffs on; -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - alphah 1; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaR 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k index e78fcca795..60208ba131 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k @@ -23,13 +23,13 @@ boundaryField { rotor { - type kQRWallFunction; + type kqRWallFunction; value uniform 0; } stator { - type kQRWallFunction; + type kqRWallFunction; value uniform 0; } diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/RASProperties b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/RASProperties index 36c840062f..7241516130 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/RASProperties +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/RASProperties @@ -21,172 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties index 7bffdbfa6b..2c10ab8a57 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties @@ -21,172 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k index 007ca48843..be915cb2bb 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k @@ -23,12 +23,12 @@ boundaryField { lowerWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 1e-10; } upperWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 1e-10; } frontBack diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties index 36c840062f..7241516130 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties @@ -21,172 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/channelFoam/channel395/constant/LESProperties b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties index 9bcc936fc3..1a2958dabc 100644 --- a/tutorials/incompressible/channelFoam/channel395/constant/LESProperties +++ b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties @@ -21,98 +21,6 @@ printCoeffs on; delta vanDriest; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -174,12 +82,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/k b/tutorials/incompressible/pimpleFoam/t-junction/0/k index ad217bc9e4..1ca528b597 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/0/k +++ b/tutorials/incompressible/pimpleFoam/t-junction/0/k @@ -42,7 +42,7 @@ boundaryField defaultFaces { - type kQRWallFunction; + type kqRWallFunction; value uniform 0; } } diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties b/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties index 559c506d11..7241516130 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties +++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties @@ -21,181 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties index 034085751a..f2f9ebe735 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties @@ -21,98 +21,6 @@ delta cubeRootVol; printCoeffs on; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -174,12 +82,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties index 034085751a..f2f9ebe735 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties @@ -21,98 +21,6 @@ delta cubeRootVol; printCoeffs on; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -174,12 +82,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary index fb820c3f43..051b657602 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/R b/tutorials/incompressible/pisoFoam/ras/cavity/0/R index fec1a87fa5..9583f146b5 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/0/R +++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/R @@ -22,12 +22,12 @@ boundaryField { movingWall { - type kQRWallFunction; + type kqRWallFunction; } fixedWalls { - type kQRWallFunction; + type kqRWallFunction; } frontAndBack diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/0/k b/tutorials/incompressible/pisoFoam/ras/cavity/0/k index 021fce6763..e097460e45 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/0/k +++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/k @@ -23,12 +23,12 @@ boundaryField { movingWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.00325; } fixedWalls { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.00325; } frontAndBack diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties index 559c506d11..7241516130 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties +++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties @@ -21,181 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties index ec7ffbd28b..a7c70936d4 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties +++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties @@ -19,156 +19,7 @@ RASModel SpalartAllmaras; turbulence on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} +printCoeffs on; // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField b/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField index 39fd6f16c1..c55ca7f000 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField +++ b/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField @@ -19,12 +19,12 @@ boundaryField lowerWall { - type kQRWallFunction; + type kqRWallFunction; } "motorBike_.*" { - type kQRWallFunction; + type kqRWallFunction; } #include "frontBackUpperPatches" diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties index e9be8519b4..7a083b65c1 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties +++ b/tutorials/incompressible/simpleFoam/motorBike/constant/RASProperties @@ -20,181 +20,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4.0; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1.0; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.0750; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5.0; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/R b/tutorials/incompressible/simpleFoam/pitzDaily/0/R index f5e0a97820..0a7a351a52 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/0/R +++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/R @@ -33,12 +33,12 @@ boundaryField upperWall { - type kQRWallFunction; + type kqRWallFunction; } lowerWall { - type kQRWallFunction; + type kqRWallFunction; } frontAndBack diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/k b/tutorials/incompressible/simpleFoam/pitzDaily/0/k index 41e4f133aa..7de1adf4b5 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/0/k +++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/k @@ -32,12 +32,12 @@ boundaryField } upperWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.375; } lowerWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.375; } frontAndBack diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties index 559c506d11..7241516130 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties +++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties @@ -21,181 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R index f5e0a97820..0a7a351a52 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R @@ -33,12 +33,12 @@ boundaryField upperWall { - type kQRWallFunction; + type kqRWallFunction; } lowerWall { - type kQRWallFunction; + type kqRWallFunction; } frontAndBack diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k index d33d92f39f..bc8f856acc 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k @@ -67,12 +67,12 @@ boundaryField } upperWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.375; } lowerWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.375; } frontAndBack diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties index 559c506d11..7241516130 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties @@ -21,181 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/k b/tutorials/incompressible/simpleSRFFoam/mixer/0/k index 59c1b73fc3..ec118fa2df 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/0/k +++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/k @@ -32,12 +32,12 @@ boundaryField } innerWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.375; } outerWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.375; } cyclic diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties b/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties index f543226c9b..480abbfe0e 100644 --- a/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties +++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties @@ -21,172 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k index 9abb57fdb0..d5f2de2074 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/k @@ -23,17 +23,17 @@ boundaryField { top { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 37.5; } bottom { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 37.5; } walls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 37.5; } symmetry diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k index eed0dcdd36..21282254cb 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0.org/k @@ -23,7 +23,7 @@ boundaryField { walls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.0938; } inlet diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k index eed0dcdd36..21282254cb 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/0/k @@ -23,7 +23,7 @@ boundaryField { walls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 0.0938; } inlet diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties index 71270c8d7c..b412674cb4 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/RASProperties @@ -20,150 +20,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - // Cmu - Cmu 0.09; - // C1 - C1 1.44; - // C2 - C2 1.92; - // C3 - C3 -0.33; - // alphah - alphah 1; - // alphak - alphak 1; - // alphaEps - alphaEps 0.76923; -} - -// RNG k-epsilon model coefficients -RNGkEpsilonCoeffs -{ - // Cmu - Cmu 0.0845; - // C1 - C1 1.42; - // C2 - C2 1.68; - // C3 - C3 -0.33; - // alphah - alphah 1; - // alphak - alphak 1.39; - // alphaEps - alphaEps 1.39; - // eta0 - eta0 4.38; - // beta - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - // Cmu - Cmu 0.09; - // C1 - C1 1.44; - // C2 - C2 1.92; - // C3 - C3 -0.33; - // alphah - alphah 1; - // alphak - alphak 1; - // alphaEps - alphaEps 0.76923; -} - -// Launder-Reece-Rodi RSTM with wall functions model coefficients -LRRCoeffs -{ - // Cmu - Cmu 0.09; - // Clrr1 - Clrr1 1.8; - // Clrr2 - Clrr2 0.6; - // C1 - C1 1.44; - // C2 - C2 1.92; - // Cs - Cs 0.25; - // Ceps - Ceps 0.15; - // alphah - alphah 1; - // alphaEps - alphaEps 0.76923; - // alphaR - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - // Cmu - Cmu 0.09; - // Clg1 - Clg1 1.8; - // Clg2 - Clg2 0.6; - // C1 - C1 1.44; - // C2 - C2 1.92; - // C1Ref - C1Ref 0.5; - // C2Ref - C2Ref 0.3; - // Cs - Cs 0.25; - // Ceps - Ceps 0.15; - // alphah - alphah 1; - // alphaEps - alphaEps 0.76923; - // alphaR - alphaR 1.22; -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1.0; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.0750; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - - Cmu 0.09; - - alphah 1; -} - -wallFunctionCoeffs -{ - // kappa - kappa 0.4187; - // E - E 9; - // Prt - Prt 1; -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k index 9abb57fdb0..d5f2de2074 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k @@ -23,17 +23,17 @@ boundaryField { top { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 37.5; } bottom { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 37.5; } walls { - type compressible::kQRWallFunction; + type compressible::kqRWallFunction; value uniform 37.5; } symmetry diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties index 26216fcde0..44c471f517 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties @@ -21,80 +21,4 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - C3 -0.33; - alphah 1; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.33; - alphah 1; - alphak 1; - alphaEps 0.76923; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphah 1; - alphaEps 0.76923; - alphaR 1.22; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - - // ************************************************************************* // diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties index 3569e78dc3..4bd60ebb76 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties @@ -21,24 +21,5 @@ turbulence off; printCoeffs off; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties index 583bb94896..1ba57ff22e 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties @@ -19,104 +19,6 @@ LESModel oneEqEddy; delta smooth; -laminarCoeffs -{ -} - -devOneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -178,12 +80,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties index 583bb94896..1ba57ff22e 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties @@ -19,104 +19,6 @@ LESModel oneEqEddy; delta smooth; -laminarCoeffs -{ -} - -devOneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -178,12 +80,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k index 732cdd4d12..25ca30f1e1 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k @@ -33,7 +33,7 @@ boundaryField } walls { - type kQRWallFunction; + type kqRWallFunction; value uniform 10; } frontBack diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties index 461a7c61ff..480abbfe0e 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties @@ -19,181 +19,7 @@ RASModel kOmegaSST; turbulence on; -laminarCoeffs -{ -} - -kOmegaSSTCoeffs -{ - alphaK1 0.85034; - alphaK2 1; - alphaOmega1 0.5; - alphaOmega2 0.85616; - gamma1 0.5532; - gamma2 0.4403; - beta1 0.075; - beta2 0.0828; - betaStar 0.09; - a1 0.31; - c1 10; - Cmu 0.09; -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} +printCoeffs on; // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary index 03d26bcf3c..b5008d95cd 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.6 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties index 14b6ce249d..b3cfc0ba03 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties @@ -19,97 +19,6 @@ LESModel laminar; delta cubeRootVol; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -171,12 +80,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties index 14b6ce249d..b3cfc0ba03 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties @@ -19,97 +19,6 @@ LESModel laminar; delta cubeRootVol; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -171,12 +80,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties index 035a467881..e62f5f6ce4 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/RASProperties @@ -21,156 +21,5 @@ turbulence on; printCoeffs off; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties index ac647d4642..4773e27a41 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/RASProperties @@ -19,156 +19,7 @@ RASModel laminar; turbulence off; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} +printCoeffs on; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties index ac647d4642..4773e27a41 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/RASProperties @@ -19,156 +19,7 @@ RASModel laminar; turbulence off; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} +printCoeffs on; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties index ac647d4642..4773e27a41 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/RASProperties @@ -19,156 +19,7 @@ RASModel laminar; turbulence off; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} +printCoeffs on; // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties index ac647d4642..8107da2ca1 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/RASProperties @@ -19,156 +19,5 @@ RASModel laminar; turbulence off; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties index ac647d4642..4773e27a41 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/RASProperties @@ -19,156 +19,7 @@ RASModel laminar; turbulence off; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} +printCoeffs on; // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties index c4072e231d..c8ccdc8716 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties @@ -21,98 +21,6 @@ delta smooth; printCoeffs on; -laminarCoeffs -{ -} - -oneEqEddyCoeffs -{ - ck 0.07; - ce 1.05; -} - -dynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -locDynOneEqEddyCoeffs -{ - ce 1.05; - filter simple; -} - -SmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; -} - -Smagorinsky2Coeffs -{ - ce 1.05; - ck 0.07; - cD2 0.02; -} - -spectEddyViscCoeffs -{ - ce 1.05; - cB 8.22; - cK1 0.83; - cK2 1.03; - cK3 4.75; - cK4 2.55; -} - -dynSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -mixedSmagorinskyCoeffs -{ - ce 1.05; - ck 0.07; - filter simple; -} - -dynMixedSmagorinskyCoeffs -{ - ce 1.05; - filter simple; -} - -LRRDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - c1 1.8; - c2 0.6; -} - -DeardorffDiffStressCoeffs -{ - ce 1.05; - ck 0.09; - cm 4.13; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; - CDES 0.65; - ck 0.07; -} - cubeRootVolCoeffs { deltaCoeff 1; @@ -174,12 +82,5 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa 0.4187; - -wallFunctionCoeffs -{ - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/R b/tutorials/multiphase/interFoam/ras/damBreak/0/R index e62afda35f..2bc3b60612 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/R +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/R @@ -23,19 +23,19 @@ boundaryField { leftWall { - type kQRWallFunction; + type kqRWallFunction; value uniform ( 0 0 0 0 0 0 ); } rightWall { - type kQRWallFunction; + type kqRWallFunction; value uniform ( 0 0 0 0 0 0 ); } lowerWall { - type kQRWallFunction; + type kqRWallFunction; value uniform ( 0 0 0 0 0 0 ); } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/k b/tutorials/multiphase/interFoam/ras/damBreak/0/k index 897224d725..8fd8f798ff 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/k +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/k @@ -23,17 +23,17 @@ boundaryField { leftWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } rightWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } lowerWall { - type kQRWallFunction; + type kqRWallFunction; value uniform 0.1; } atmosphere diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties index ce5406cd7a..7241516130 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties +++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties @@ -21,165 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -RNGkEpsilonCoeffs -{ - Cmu 0.0845; - C1 1.42; - C2 1.68; - alphak 1.39; - alphaEps 1.39; - eta0 4.38; - beta 0.012; -} - -realizableKECoeffs -{ - Cmu 0.09; - A0 4; - C2 1.9; - alphak 1; - alphaEps 0.833333; -} - -NonlinearKEShihCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76932; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -LienCubicKECoeffs -{ - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; -} - -QZetaCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaZeta 0.76923; - anisotropic no; -} - -LaunderSharmaKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LamBremhorstKECoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphaEps 0.76923; -} - -LienCubicKELowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - A1 1.25; - A2 1000; - Ctau1 -4; - Ctau2 13; - Ctau3 -2; - alphaKsi 0.9; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LienLeschzinerLowReCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; - Am 0.016; - Aepsilon 0.263; - Amu 0.00222; -} - -LRRCoeffs -{ - Cmu 0.09; - Clrr1 1.8; - Clrr2 0.6; - C1 1.44; - C2 1.92; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; -} - -LaunderGibsonRSTMCoeffs -{ - Cmu 0.09; - Clg1 1.8; - Clg2 0.6; - C1 1.44; - C2 1.92; - C1Ref 0.5; - C2Ref 0.3; - Cs 0.25; - Ceps 0.15; - alphaEps 0.76923; - alphaR 1.22; -} - -SpalartAllmarasCoeffs -{ - alphaNut 1.5; - Cb1 0.1355; - Cb2 0.622; - Cw2 0.3; - Cw3 2; - Cv1 7.1; - Cv2 5; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/RASProperties b/tutorials/multiphase/settlingFoam/ras/dahl/constant/RASProperties index 7d55e238e4..7241516130 100644 --- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/RASProperties +++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/RASProperties @@ -21,25 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphak 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/RASProperties b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/RASProperties index a19f0292e2..a4937b503a 100644 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/RASProperties +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/RASProperties @@ -21,25 +21,5 @@ turbulence on; printCoeffs on; -laminarCoeffs -{ -} - -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 0.85; - alphak 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties index 5306594565..282dde8a41 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties @@ -19,21 +19,5 @@ turbulence on; printCoeffs on; -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.375; - alphak 1; - alphaEps 0.82142; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes index 1e881ca7e5..8e76e961b3 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes @@ -46,8 +46,8 @@ laplacianSchemes laplacian(nuEffb,Ub) Gauss linear corrected; laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaPpMag,alpha) Gauss linear corrected; - laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected; - laplacian((alphak*nuEffb),k) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; } interpolationSchemes diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties index 803255b5a0..9589aa497f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties @@ -19,21 +19,5 @@ turbulence on; printCoeffs on; -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - C3 -0.375; - alphak 1; - alphaEps 0.82142; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes index d007d55f78..e85cd3bf93 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes @@ -47,8 +47,8 @@ laplacianSchemes laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaPpMag,alpha) Gauss linear corrected; laplacian(Galphaf,alpha) Gauss linear corrected; - laplacian((alphak*nuEffb),k) Gauss linear corrected; - laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian(kappa,Theta) Gauss linear corrected; } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties index b84915eafc..fe181621ac 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties @@ -21,20 +21,5 @@ turbulence off; printCoeffs off; -kEpsilonCoeffs -{ - Cmu 0.09; - C1 1.44; - C2 1.92; - alphak 1; - alphaEps 0.76923; -} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - // ************************************************************************* //