diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e deleted file mode 100644 index 331a2aaa7e..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e +++ /dev/null @@ -1,14 +0,0 @@ - nAveragingSteps++; - - scalar nm1Coeff = scalar(nAveragingSteps - 1)/nAveragingSteps; - scalar nCoeff = 1.0/nAveragingSteps; - - R += sqr(Umean); - Umean = nm1Coeff*Umean + nCoeff*U; - R = nm1Coeff*R + nCoeff*sqr(U) - sqr(Umean); - Bmean = nm1Coeff*Bmean + nCoeff*sgsModel->B(); - epsilonMean = nm1Coeff*epsilonMean + nCoeff*sgsModel->epsilon(); - - pPrime2Mean += sqr(pMean); - pMean = nm1Coeff*pMean + nCoeff*p; - pPrime2Mean = nm1Coeff*pPrime2Mean + nCoeff*sqr(p) - sqr(pMean); diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 deleted file mode 100644 index 331a2aaa7e..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 +++ /dev/null @@ -1,14 +0,0 @@ - nAveragingSteps++; - - scalar nm1Coeff = scalar(nAveragingSteps - 1)/nAveragingSteps; - scalar nCoeff = 1.0/nAveragingSteps; - - R += sqr(Umean); - Umean = nm1Coeff*Umean + nCoeff*U; - R = nm1Coeff*R + nCoeff*sqr(U) - sqr(Umean); - Bmean = nm1Coeff*Bmean + nCoeff*sgsModel->B(); - epsilonMean = nm1Coeff*epsilonMean + nCoeff*sgsModel->epsilon(); - - pPrime2Mean += sqr(pMean); - pMean = nm1Coeff*pMean + nCoeff*p; - pPrime2Mean = nm1Coeff*pPrime2Mean + nCoeff*sqr(p) - sqr(pMean); diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 deleted file mode 100644 index 331a2aaa7e..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 +++ /dev/null @@ -1,14 +0,0 @@ - nAveragingSteps++; - - scalar nm1Coeff = scalar(nAveragingSteps - 1)/nAveragingSteps; - scalar nCoeff = 1.0/nAveragingSteps; - - R += sqr(Umean); - Umean = nm1Coeff*Umean + nCoeff*U; - R = nm1Coeff*R + nCoeff*sqr(U) - sqr(Umean); - Bmean = nm1Coeff*Bmean + nCoeff*sgsModel->B(); - epsilonMean = nm1Coeff*epsilonMean + nCoeff*sgsModel->epsilon(); - - pPrime2Mean += sqr(pMean); - pMean = nm1Coeff*pMean + nCoeff*p; - pPrime2Mean = nm1Coeff*pPrime2Mean + nCoeff*sqr(p) - sqr(pMean); diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e deleted file mode 100644 index 64e53cdc77..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e +++ /dev/null @@ -1,234 +0,0 @@ - label nAveragingSteps = 1; - - IFstream nAveragingStepsFile - ( - runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw" - ); - - - autoPtr UmeanPtr; - autoPtr RPtr; - autoPtr BmeanPtr; - autoPtr epsilonMeanPtr; - - autoPtr pMeanPtr; - autoPtr pPrime2MeanPtr; - - if (nAveragingStepsFile.good()) - { - nAveragingStepsFile >> nAveragingSteps; - - Info<< "Reading field Umean\n" << endl; - UmeanPtr.reset - ( - new volVectorField - ( - IOobject - ( - "Umean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field R\n" << endl; - RPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field Bmean\n" << endl; - BmeanPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "Bmean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field epsilonMean\n" << endl; - epsilonMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "epsilonMean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "Reading field pMean\n" << endl; - pMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pMean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "Reading field pPrime2Mean\n" << endl; - pPrime2MeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pPrime2Mean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - } - else - { - Info<< "Creating field Umean\n" << endl; - UmeanPtr.reset - ( - new volVectorField - ( - IOobject - ( - "Umean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - U - ) - ); - - Info<< "Creating field R\n" << endl; - RPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sqr(U) - sqr(UmeanPtr()) - ) - ); - - Info<< "Creating field Bmean\n" << endl; - BmeanPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "Bmean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sgsModel->B() - ) - ); - - Info<< "Creating field epsilonMean\n" << endl; - epsilonMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "epsilonMean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sgsModel->epsilon() - ) - ); - - Info<< "Creating field pMean\n" << endl; - pMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pMean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - p - ) - ); - - Info<< "Creating field pPrime2Mean\n" << endl; - pPrime2MeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pPrime2Mean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sqr(p) - sqr(pMeanPtr()) - ) - ); - } - - volVectorField& Umean = UmeanPtr(); - volSymmTensorField& R = RPtr(); - volSymmTensorField& Bmean = BmeanPtr(); - volScalarField& epsilonMean = epsilonMeanPtr(); - - volScalarField& pMean = pMeanPtr(); - volScalarField& pPrime2Mean = pPrime2MeanPtr(); diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 deleted file mode 100644 index 64e53cdc77..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 +++ /dev/null @@ -1,234 +0,0 @@ - label nAveragingSteps = 1; - - IFstream nAveragingStepsFile - ( - runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw" - ); - - - autoPtr UmeanPtr; - autoPtr RPtr; - autoPtr BmeanPtr; - autoPtr epsilonMeanPtr; - - autoPtr pMeanPtr; - autoPtr pPrime2MeanPtr; - - if (nAveragingStepsFile.good()) - { - nAveragingStepsFile >> nAveragingSteps; - - Info<< "Reading field Umean\n" << endl; - UmeanPtr.reset - ( - new volVectorField - ( - IOobject - ( - "Umean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field R\n" << endl; - RPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field Bmean\n" << endl; - BmeanPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "Bmean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field epsilonMean\n" << endl; - epsilonMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "epsilonMean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "Reading field pMean\n" << endl; - pMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pMean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "Reading field pPrime2Mean\n" << endl; - pPrime2MeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pPrime2Mean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - } - else - { - Info<< "Creating field Umean\n" << endl; - UmeanPtr.reset - ( - new volVectorField - ( - IOobject - ( - "Umean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - U - ) - ); - - Info<< "Creating field R\n" << endl; - RPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sqr(U) - sqr(UmeanPtr()) - ) - ); - - Info<< "Creating field Bmean\n" << endl; - BmeanPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "Bmean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sgsModel->B() - ) - ); - - Info<< "Creating field epsilonMean\n" << endl; - epsilonMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "epsilonMean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sgsModel->epsilon() - ) - ); - - Info<< "Creating field pMean\n" << endl; - pMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pMean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - p - ) - ); - - Info<< "Creating field pPrime2Mean\n" << endl; - pPrime2MeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pPrime2Mean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sqr(p) - sqr(pMeanPtr()) - ) - ); - } - - volVectorField& Umean = UmeanPtr(); - volSymmTensorField& R = RPtr(); - volSymmTensorField& Bmean = BmeanPtr(); - volScalarField& epsilonMean = epsilonMeanPtr(); - - volScalarField& pMean = pMeanPtr(); - volScalarField& pPrime2Mean = pPrime2MeanPtr(); diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 b/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 deleted file mode 100644 index 64e53cdc77..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/createAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 +++ /dev/null @@ -1,234 +0,0 @@ - label nAveragingSteps = 1; - - IFstream nAveragingStepsFile - ( - runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw" - ); - - - autoPtr UmeanPtr; - autoPtr RPtr; - autoPtr BmeanPtr; - autoPtr epsilonMeanPtr; - - autoPtr pMeanPtr; - autoPtr pPrime2MeanPtr; - - if (nAveragingStepsFile.good()) - { - nAveragingStepsFile >> nAveragingSteps; - - Info<< "Reading field Umean\n" << endl; - UmeanPtr.reset - ( - new volVectorField - ( - IOobject - ( - "Umean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field R\n" << endl; - RPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field Bmean\n" << endl; - BmeanPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "Bmean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "\nReading field epsilonMean\n" << endl; - epsilonMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "epsilonMean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "Reading field pMean\n" << endl; - pMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pMean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - - Info<< "Reading field pPrime2Mean\n" << endl; - pPrime2MeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pPrime2Mean", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ) - ); - } - else - { - Info<< "Creating field Umean\n" << endl; - UmeanPtr.reset - ( - new volVectorField - ( - IOobject - ( - "Umean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - U - ) - ); - - Info<< "Creating field R\n" << endl; - RPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sqr(U) - sqr(UmeanPtr()) - ) - ); - - Info<< "Creating field Bmean\n" << endl; - BmeanPtr.reset - ( - new volSymmTensorField - ( - IOobject - ( - "Bmean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sgsModel->B() - ) - ); - - Info<< "Creating field epsilonMean\n" << endl; - epsilonMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "epsilonMean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sgsModel->epsilon() - ) - ); - - Info<< "Creating field pMean\n" << endl; - pMeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pMean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - p - ) - ); - - Info<< "Creating field pPrime2Mean\n" << endl; - pPrime2MeanPtr.reset - ( - new volScalarField - ( - IOobject - ( - "pPrime2Mean", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - sqr(p) - sqr(pMeanPtr()) - ) - ); - } - - volVectorField& Umean = UmeanPtr(); - volSymmTensorField& R = RPtr(); - volSymmTensorField& Bmean = BmeanPtr(); - volScalarField& epsilonMean = epsilonMeanPtr(); - - volScalarField& pMean = pMeanPtr(); - volScalarField& pPrime2Mean = pPrime2MeanPtr(); diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e deleted file mode 100644 index f590d9ba6f..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e +++ /dev/null @@ -1,18 +0,0 @@ - if (runTime.outputTime()) - { - OFstream nAveragingStepsFile - ( - runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw" - ); - - if (nAveragingStepsFile.good()) - { - nAveragingStepsFile << nAveragingSteps << endl; - } - else - { - FatalErrorIn(args.executable()) - << "Cannot open file " << nAveragingStepsFile.name() - << abort(FatalError); - } - } diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 deleted file mode 100644 index f590d9ba6f..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_0 +++ /dev/null @@ -1,18 +0,0 @@ - if (runTime.outputTime()) - { - OFstream nAveragingStepsFile - ( - runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw" - ); - - if (nAveragingStepsFile.good()) - { - nAveragingStepsFile << nAveragingSteps << endl; - } - else - { - FatalErrorIn(args.executable()) - << "Cannot open file " << nAveragingStepsFile.name() - << abort(FatalError); - } - } diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 b/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 deleted file mode 100644 index f590d9ba6f..0000000000 --- a/applications/solvers/heatTransfer/TlesPimlpleFoam/writeNaveragingSteps.H~918dc24fd09dc58d05222b287f51b98d2599f83e_1 +++ /dev/null @@ -1,18 +0,0 @@ - if (runTime.outputTime()) - { - OFstream nAveragingStepsFile - ( - runTime.path()/runTime.timeName()/"uniform"/"nAveragingSteps.raw" - ); - - if (nAveragingStepsFile.good()) - { - nAveragingStepsFile << nAveragingSteps << endl; - } - else - { - FatalErrorIn(args.executable()) - << "Cannot open file " << nAveragingStepsFile.name() - << abort(FatalError); - } - } diff --git a/applications/solvers/multiphase/bubbleFoam/createTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createTurbulence.H index 8b60d34a29..347fa1168e 100644 --- a/applications/solvers/multiphase/bubbleFoam/createTurbulence.H +++ b/applications/solvers/multiphase/bubbleFoam/createTurbulence.H @@ -22,29 +22,29 @@ ); - dimensionedScalar Cmu + scalar Cmu ( - kEpsilonCoeffs.lookup("Cmu") + readScalar(kEpsilonCoeffs.lookup("Cmu")) ); - dimensionedScalar C1 + scalar C1 ( - kEpsilonCoeffs.lookup("C1") + readScalar(kEpsilonCoeffs.lookup("C1")) ); - dimensionedScalar C2 + scalar C2 ( - kEpsilonCoeffs.lookup("C2") + readScalar(kEpsilonCoeffs.lookup("C2")) ); - dimensionedScalar alphak + scalar alphak ( - kEpsilonCoeffs.lookup("alphak") + readScalar(kEpsilonCoeffs.lookup("alphak")) ); - dimensionedScalar alphaEps + scalar alphaEps ( - kEpsilonCoeffs.lookup("alphaEps") + readScalar(kEpsilonCoeffs.lookup("alphaEps")) ); dictionary wallFunctionCoeffs @@ -52,14 +52,14 @@ turbulenceProperties.subDict("wallFunctionCoeffs") ); - dimensionedScalar kappa + scalar kappa ( - wallFunctionCoeffs.lookup("kappa") + readScalar(wallFunctionCoeffs.lookup("kappa")) ); - dimensionedScalar E + scalar E ( - wallFunctionCoeffs.lookup("E") + readScalar(wallFunctionCoeffs.lookup("E")) ); nearWallDist y(mesh); diff --git a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H index 2921cdf4c9..8650460bc1 100644 --- a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H +++ b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H @@ -1,8 +1,8 @@ { labelList cellBoundaryFaceCount(epsilon.size(), 0); - scalar Cmu25 = ::pow(Cmu.value(), 0.25); - scalar Cmu75 = ::pow(Cmu.value(), 0.75); + scalar Cmu25 = ::pow(Cmu, 0.25); + scalar Cmu75 = ::pow(Cmu, 0.75); const fvPatchList& patches = mesh.boundary(); @@ -53,14 +53,14 @@ epsilon[faceCelli] += Cmu75*::pow(k[faceCelli], 1.5) - /(kappa.value()*y[patchi][facei]); + /(kappa*y[patchi][facei]); if (yPlus > 11.6) { G[faceCelli] += nuw[facei]*magFaceGradU[facei] *Cmu25*::sqrt(k[faceCelli]) - /(kappa.value()*y[patchi][facei]); + /(kappa*y[patchi][facei]); } } } diff --git a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H index 5915b782f9..cd9c005302 100644 --- a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H +++ b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H @@ -1,5 +1,5 @@ { - scalar Cmu25 = ::pow(Cmu.value(), 0.25); + scalar Cmu25 = ::pow(Cmu, 0.25); const fvPatchList& patches = mesh.boundary(); @@ -24,8 +24,8 @@ if (yPlus > 11.6) { nutw[facei] = - yPlus*nub.value()*kappa.value() - /::log(E.value()*yPlus) + yPlus*nub.value()*kappa + /::log(E*yPlus) - nub.value(); } else diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H index 7cf3305194..dfc560135e 100644 --- a/applications/solvers/multiphase/settlingFoam/createFields.H +++ b/applications/solvers/multiphase/settlingFoam/createFields.H @@ -234,34 +234,34 @@ ); - dimensionedScalar Cmu + scalar Cmu ( - kEpsilonCoeffs.lookup("Cmu") + readScalar(kEpsilonCoeffs.lookup("Cmu")) ); - dimensionedScalar C1 + scalar C1 ( - kEpsilonCoeffs.lookup("C1") + readScalar(kEpsilonCoeffs.lookup("C1")) ); - dimensionedScalar C2 + scalar C2 ( - kEpsilonCoeffs.lookup("C2") + readScalar(kEpsilonCoeffs.lookup("C2")) ); - dimensionedScalar C3 + scalar C3 ( - kEpsilonCoeffs.lookup("C3") + readScalar(kEpsilonCoeffs.lookup("C3")) ); - dimensionedScalar alphak + scalar alphak ( - kEpsilonCoeffs.lookup("alphak") + readScalar(kEpsilonCoeffs.lookup("alphak")) ); - dimensionedScalar alphaEps + scalar alphaEps ( - kEpsilonCoeffs.lookup("alphaEps") + readScalar(kEpsilonCoeffs.lookup("alphaEps")) ); const dictionary& wallFunctionCoeffs @@ -269,14 +269,14 @@ turbulenceProperties.subDict("wallFunctionCoeffs") ); - dimensionedScalar kappa + scalar kappa ( - wallFunctionCoeffs.lookup("kappa") + readScalar(wallFunctionCoeffs.lookup("kappa")) ); - dimensionedScalar E + scalar E ( - wallFunctionCoeffs.lookup("E") + readScalar(wallFunctionCoeffs.lookup("E")) ); nearWallDist y(mesh); diff --git a/applications/solvers/multiphase/settlingFoam/wallFunctions.H b/applications/solvers/multiphase/settlingFoam/wallFunctions.H index d6b4360c9e..411a897499 100644 --- a/applications/solvers/multiphase/settlingFoam/wallFunctions.H +++ b/applications/solvers/multiphase/settlingFoam/wallFunctions.H @@ -1,8 +1,8 @@ { labelList cellBoundaryFaceCount(epsilon.size(), 0); - scalar Cmu25 = ::pow(Cmu.value(), 0.25); - scalar Cmu75 = ::pow(Cmu.value(), 0.75); + scalar Cmu25 = ::pow(Cmu, 0.25); + scalar Cmu75 = ::pow(Cmu, 0.75); const fvPatchList& patches = mesh.boundary(); @@ -55,14 +55,14 @@ epsilon[faceCelli] += Cmu75*rho[faceCelli]*::pow(k[faceCelli], 1.5) - /(kappa.value()*y[patchi][facei]); + /(kappa*y[patchi][facei]); if (yPlus > 11.6) { G[faceCelli] += mutw[facei]*magFaceGradU[facei] *Cmu25*::sqrt(k[faceCelli]) - /(kappa.value()*y[patchi][facei]); + /(kappa*y[patchi][facei]); } } } diff --git a/applications/solvers/multiphase/settlingFoam/wallViscosity.H b/applications/solvers/multiphase/settlingFoam/wallViscosity.H index 2b2cc99339..665d4bbf74 100644 --- a/applications/solvers/multiphase/settlingFoam/wallViscosity.H +++ b/applications/solvers/multiphase/settlingFoam/wallViscosity.H @@ -1,5 +1,5 @@ { - scalar Cmu25 = ::pow(Cmu.value(), 0.25); + scalar Cmu25 = ::pow(Cmu, 0.25); const fvPatchList& patches = mesh.boundary(); @@ -26,7 +26,7 @@ { mutw[facei] = muw[facei] - *(yPlus*kappa.value()/::log(E.value()*yPlus) - 1); + *(yPlus*kappa/::log(E*yPlus) - 1); } else { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H index 13dc8b1b14..7d70f4e575 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H @@ -170,29 +170,29 @@ ); - dimensionedScalar Cmu + scalar Cmu ( - kEpsilonCoeffs.lookup("Cmu") + readScalar(kEpsilonCoeffs.lookup("Cmu")) ); - dimensionedScalar C1 + scalar C1 ( - kEpsilonCoeffs.lookup("C1") + readScalar(kEpsilonCoeffs.lookup("C1")) ); - dimensionedScalar C2 + scalar C2 ( - kEpsilonCoeffs.lookup("C2") + readScalar(kEpsilonCoeffs.lookup("C2")) ); - dimensionedScalar alphak + scalar alphak ( - kEpsilonCoeffs.lookup("alphak") + readScalar(kEpsilonCoeffs.lookup("alphak")) ); - dimensionedScalar alphaEps + scalar alphaEps ( - kEpsilonCoeffs.lookup("alphaEps") + readScalar(kEpsilonCoeffs.lookup("alphaEps")) ); dictionary wallFunctionCoeffs @@ -200,14 +200,14 @@ turbulenceProperties.subDict("wallFunctionCoeffs") ); - dimensionedScalar kappa + scalar kappa ( - wallFunctionCoeffs.lookup("kappa") + readScalar(wallFunctionCoeffs.lookup("kappa")) ); - dimensionedScalar E + scalar E ( - wallFunctionCoeffs.lookup("E") + readScalar(wallFunctionCoeffs.lookup("E")) ); nearWallDist y(mesh); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H index e9e4cbf41b..ea7d1a9b14 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H @@ -1,8 +1,8 @@ { labelList cellBoundaryFaceCount(epsilon.size(), 0); - scalar Cmu25 = ::pow(Cmu.value(), 0.25); - scalar Cmu75 = ::pow(Cmu.value(), 0.75); + scalar Cmu25 = ::pow(Cmu, 0.25); + scalar Cmu75 = ::pow(Cmu, 0.75); const fvPatchList& patches = mesh.boundary(); @@ -52,14 +52,14 @@ epsilon[faceCelli] += Cmu75*::pow(k[faceCelli], 1.5) - /(kappa.value()*y[patchi][facei]); + /(kappa*y[patchi][facei]); if (yPlus > 11.6) { G[faceCelli] += nuw[facei]*magFaceGradU[facei] *Cmu25*::sqrt(k[faceCelli]) - /(kappa.value()*y[patchi][facei]); + /(kappa*y[patchi][facei]); } } } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H index 5915b782f9..cd9c005302 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H @@ -1,5 +1,5 @@ { - scalar Cmu25 = ::pow(Cmu.value(), 0.25); + scalar Cmu25 = ::pow(Cmu, 0.25); const fvPatchList& patches = mesh.boundary(); @@ -24,8 +24,8 @@ if (yPlus > 11.6) { nutw[facei] = - yPlus*nub.value()*kappa.value() - /::log(E.value()*yPlus) + yPlus*nub.value()*kappa + /::log(E*yPlus) - nub.value(); } else diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C index a633325022..96916c20e7 100644 --- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C +++ b/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C @@ -105,15 +105,14 @@ vanDriestDelta::vanDriestDelta ( LESdelta::New("geometricDelta", mesh, dd.subDict(type() + "Coeffs")) ), - kappa_(dimensionedScalar(dd.lookup("kappa")).value()), + kappa_(dd.lookupOrDefault("kappa", 0.4187)), Aplus_ ( - dimensionedScalar(dd.subDict(type() + "Coeffs").lookup("Aplus")).value() + dd.subDict(type() + "Coeffs").lookupOrDefault("Aplus", 26.0) ), Cdelta_ ( - dimensionedScalar(dd.subDict(type() + "Coeffs").lookup("Cdelta")) - .value() + dd.subDict(type() + "Coeffs").lookupOrDefault("Cdelta", 0.158) ) { delta_ = geometricDelta_(); @@ -127,9 +126,9 @@ void vanDriestDelta::read(const dictionary& d) const dictionary& dd(d.subDict(type() + "Coeffs")); geometricDelta_().read(dd); - kappa_ = dimensionedScalar(d.lookup("kappa")).value(); - Aplus_ = dimensionedScalar(dd.lookup("Aplus")).value(); - Cdelta_ = dimensionedScalar(dd.lookup("Cdelta")).value(); + d.readIfPresent("kappa", kappa_); + dd.readIfPresent("Aplus", Aplus_); + dd.readIfPresent("Cdelta", Cdelta_); calcDelta(); } diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options index b0e647e10a..6437903e0c 100644 --- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options +++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ + -I$(LIB_SRC)/turbulenceModels/RAS \ -I$(LIB_SRC)/transportModels EXE_LIBS = \ diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H index 1ae8c416d8..390e3b0149 100644 --- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H +++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H @@ -36,9 +36,9 @@ singlePhaseTransportModel laminarTransport(U, phi); - autoPtr turbulence + autoPtr turbulence ( - turbulenceModel::New(U, phi, laminarTransport) + incompressible::turbulenceModel::New(U, phi, laminarTransport) ); diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties index 733a114ddb..9b738288b3 100644 --- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties @@ -32,166 +32,166 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties index 10111c9951..91e74e5b1e 100644 --- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties +++ b/tutorials/XiFoam/moriyoshiHomogeneous/constant/turbulenceProperties @@ -32,73 +32,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0; - alphah alphah [0 0 0 0 0 0 0] 1.111; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0; + alphah 1.111; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] 0; - alphah alphah [0 0 0 0 0 0 0] 1.111; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0; - alphah alphah [0 0 0 0 0 0 0] 1.111; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0; + alphah 1.111; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties b/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties index 1fb585840f..21fc8a8a02 100644 --- a/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties +++ b/tutorials/Xoodles/pitzDaily/constant/turbulenceProperties @@ -32,34 +32,34 @@ laminarCoeffs oneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.048; - ck ck [0 0 0 0 0 0 0] 0.094; + ce 1.048; + ck 0.094; } dynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } lowReOneEqEddyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.07; - ce ce [0 0 0 0 0 0 0] 1.05; - beta beta [0 0 0 0 0 0 0] 0.01; + ck 0.07; + ce 1.05; + beta 0.01; } SmagorinskyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.02; - ce ce [0 0 0 0 0 0 0] 0.202; + ck 0.02; + ce 0.202; } DeardorffDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.048; - ck ck [0 0 0 0 0 0 0] 0.094; - cm cm [0 0 0 0 0 0 0] 4.13; + ce 1.048; + ck 0.094; + cm 4.13; } cubeRootVolCoeffs @@ -83,7 +83,7 @@ PrandtlCoeffs } maxDeltaRatio 1.1; } - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Cdelta 0.158; } vanDriestCoeffs @@ -102,8 +102,8 @@ vanDriestCoeffs } maxDeltaRatio 1.1; } - Aplus Aplus [0 0 0 0 0 0 0] 26; - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -116,11 +116,11 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa kappa [0 0 0 0 0 0 0] 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties b/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties index 1fb585840f..21fc8a8a02 100644 --- a/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties +++ b/tutorials/Xoodles/pitzDaily3D/constant/turbulenceProperties @@ -32,34 +32,34 @@ laminarCoeffs oneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.048; - ck ck [0 0 0 0 0 0 0] 0.094; + ce 1.048; + ck 0.094; } dynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } lowReOneEqEddyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.07; - ce ce [0 0 0 0 0 0 0] 1.05; - beta beta [0 0 0 0 0 0 0] 0.01; + ck 0.07; + ce 1.05; + beta 0.01; } SmagorinskyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.02; - ce ce [0 0 0 0 0 0 0] 0.202; + ck 0.02; + ce 0.202; } DeardorffDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.048; - ck ck [0 0 0 0 0 0 0] 0.094; - cm cm [0 0 0 0 0 0 0] 4.13; + ce 1.048; + ck 0.094; + cm 4.13; } cubeRootVolCoeffs @@ -83,7 +83,7 @@ PrandtlCoeffs } maxDeltaRatio 1.1; } - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Cdelta 0.158; } vanDriestCoeffs @@ -102,8 +102,8 @@ vanDriestCoeffs } maxDeltaRatio 1.1; } - Aplus Aplus [0 0 0 0 0 0 0] 26; - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -116,11 +116,11 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa kappa [0 0 0 0 0 0 0] 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties index 54288e0783..24ae5e9082 100644 --- a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties @@ -32,166 +32,166 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties index 1a7b122ced..76158edd86 100644 --- a/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties +++ b/tutorials/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties @@ -38,115 +38,115 @@ laminarCoeffs kEpsilonCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // RNG k-epsilon model coefficients RNGkEpsilonCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; + Cmu 0.0845; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.42; + C1 1.42; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.68; + C2 1.68; // alphak - alphak alphaK [0 0 0 0 0 0 0] 1.39; + alphak 1.39; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; + alphaEps 1.39; // eta0 - eta0 eta0 [0 0 0 0 0 0 0] 4.38; + eta0 4.38; // beta - beta beta [0 0 0 0 0 0 0] 0.012; + beta 0.012; } // k-omega-SST model coefficients kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } // Shih non-Linear k-epsilon model coefficients NonlinearKEShihCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; + alphaEps 0.76932; // A1 - A1 A1 [0 0 0 0 0 0 0] 1.25; + A1 1.25; // A2 - A2 A2 [0 0 0 0 0 0 0] 1000; + A2 1000; // Ctau1 - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; + Ctau1 -4; // Ctau2 - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; + Ctau2 13; // Ctau3 - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; + Ctau3 -2; // alphaKsi - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + alphaKsi 0.9; } // Lien non-Linear cubic k-epsilon model coefficients LienCubicKECoeffs { // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // A1 - A1 A1 [0 0 0 0 0 0 0] 1.25; + A1 1.25; // A2 - A2 A2 [0 0 0 0 0 0 0] 1000; + A2 1000; // Ctau1 - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; + Ctau1 -4; // Ctau2 - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; + Ctau2 13; // Ctau3 - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; + Ctau3 -2; // alphaKsi - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + alphaKsi 0.9; } // Gibson's q-zeta low Reynolds number k-epsilon model coefficients QZetaCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphaZeta - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + alphaZeta 0.76923; // anisotropic? anisotropic no; } @@ -155,155 +155,155 @@ QZetaCoeffs LaunderSharmaKECoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // Lam-Bremhorst low Reynolds number k-Epsilon model coefficients LamBremhorstKECoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // Lien-Leschziner low Reynolds number cubic k-epsilon model coefficients LienCubicKELowReCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // A1 - A1 A1 [0 0 0 0 0 0 0] 1.25; + A1 1.25; // A2 - A2 A2 [0 0 0 0 0 0 0] 1000; + A2 1000; // Ctau1 - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; + Ctau1 -4; // Ctau2 - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; + Ctau2 13; // Ctau3 - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; + Ctau3 -2; // alphaKsi - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + alphaKsi 0.9; // Am - Am Am [0 0 0 0 0 0 0] 0.016; + Am 0.016; // Aepsilon - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; + Aepsilon 0.263; // Amu - Amu Amu [0 0 0 0 0 0 0] 0.00222; + Amu 0.00222; } // Lien-Leschziner low Reynolds number cubic k-epsilon model coefficients LienLeschzinerLowReCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // Am - Am Am [0 0 0 0 0 0 0] 0.016; + Am 0.016; // Aepsilon - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; + Aepsilon 0.263; // Amu - Amu Amu [0 0 0 0 0 0 0] 0.00222; + Amu 0.00222; } // Launder-Reece-Rodi RSTM with wall functions model coefficients LRRCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // Clrr1 - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; + Clrr1 1.8; // Clrr2 - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; + Clrr2 0.6; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // Cs - Cs Cs [0 0 0 0 0 0 0] 0.25; + Cs 0.25; // Ceps - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + Ceps 0.15; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // Launder-Gibson RSTM with wall reflection and wall functions model coefficients LaunderGibsonRSTMCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // Clg1 - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; + Clg1 1.8; // Clg2 - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; + Clg2 0.6; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // C1Ref - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; + C1Ref 0.5; // C2Ref - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; + C2Ref 0.3; // Cs - Cs Cs [0 0 0 0 0 0 0] 0.25; + Cs 0.25; // Ceps - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + Ceps 0.15; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // alphaR - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + alphaR 1.22; } // Standard Spalart-Allmaras model coefficients SpalartAllmarasCoeffs { // alphaNut - alphaNut alphaNut [0 0 0 0 0 0 0] 1.5; + alphaNut 1.5; // Cb1 - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; + Cb1 0.1355; // Cb2 - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; + Cb2 0.622; // Cw2 - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; + Cw2 0.3; // Cw3 - Cw3 Cw3 [0 0 0 0 0 0 0] 2; + Cw3 2; // Cv1 - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + Cv1 7.1; + Cv2 5.0; } // Wall function coefficients wallFunctionCoeffs { // kappa - kappa kappa [0 0 0 0 0 0 0] 0.4187; + kappa 0.4187; // E - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties index 0956e1957f..e2e899ca1a 100644 --- a/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/bubbleFoam/bubbleColumn/constant/turbulenceProperties @@ -32,17 +32,17 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties index 48be4c9034..289c15e14a 100644 --- a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties @@ -32,73 +32,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0.85; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphah alphah [0 0 0 0 0 0 0] 1; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaR alphaR [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphah alphah [0 0 0 0 0 0 0] 1; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaR alphaR [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties index 48be4c9034..289c15e14a 100644 --- a/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleFoam/hotRoom/constant/turbulenceProperties @@ -32,73 +32,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0.85; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphah alphah [0 0 0 0 0 0 0] 1; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaR alphaR [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphah alphah [0 0 0 0 0 0 0] 1; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaR alphaR [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties index 48be4c9034..289c15e14a 100644 --- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties +++ b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/turbulenceProperties @@ -32,73 +32,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0.85; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphah alphah [0 0 0 0 0 0 0] 1; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaR alphaR [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphah alphah [0 0 0 0 0 0 0] 1; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaR alphaR [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/channelOodles/channel395/constant/turbulenceProperties b/tutorials/channelOodles/channel395/constant/turbulenceProperties index c785596513..3478ac639c 100644 --- a/tutorials/channelOodles/channel395/constant/turbulenceProperties +++ b/tutorials/channelOodles/channel395/constant/turbulenceProperties @@ -32,90 +32,90 @@ laminarCoeffs oneEqEddyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.07; - ce ce [0 0 0 0 0 0 0] 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; - cD2 cD2 [0 1 0 0 0 0 0] 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - cB cB [0 0 0 0 0 0 0] 8.22; - cK1 cK1 [0 0 0 0 0 0 0] 0.83; - cK2 cK2 [0 0 0 0 0 0 0] 1.03; - cK3 cK3 [0 0 0 0 0 0 0] 4.75; - cK4 cK4 [0 0 0 0 0 0 0] 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - c1 c1 [0 0 0 0 0 0 0] 1.8; - c2 c2 [0 0 0 0 0 0 0] 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - cm cm [0 0 0 0 0 0 0] 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; - CDES CDES [0 0 0 0 0 0 0] 0.65; - ck ck [0 0 0 0 0 0 0] 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -139,7 +139,7 @@ PrandtlCoeffs } maxDeltaRatio 1.1; } - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Cdelta 0.158; } vanDriestCoeffs @@ -158,8 +158,8 @@ vanDriestCoeffs } maxDeltaRatio 1.1; } - Aplus Aplus [0 0 0 0 0 0 0] 26; - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -172,11 +172,11 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa kappa [0 0 0 0 0 0 0] 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/coodles/pitzDaily/constant/turbulenceProperties b/tutorials/coodles/pitzDaily/constant/turbulenceProperties index 1fb585840f..21fc8a8a02 100644 --- a/tutorials/coodles/pitzDaily/constant/turbulenceProperties +++ b/tutorials/coodles/pitzDaily/constant/turbulenceProperties @@ -32,34 +32,34 @@ laminarCoeffs oneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.048; - ck ck [0 0 0 0 0 0 0] 0.094; + ce 1.048; + ck 0.094; } dynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } lowReOneEqEddyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.07; - ce ce [0 0 0 0 0 0 0] 1.05; - beta beta [0 0 0 0 0 0 0] 0.01; + ck 0.07; + ce 1.05; + beta 0.01; } SmagorinskyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.02; - ce ce [0 0 0 0 0 0 0] 0.202; + ck 0.02; + ce 0.202; } DeardorffDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.048; - ck ck [0 0 0 0 0 0 0] 0.094; - cm cm [0 0 0 0 0 0 0] 4.13; + ce 1.048; + ck 0.094; + cm 4.13; } cubeRootVolCoeffs @@ -83,7 +83,7 @@ PrandtlCoeffs } maxDeltaRatio 1.1; } - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Cdelta 0.158; } vanDriestCoeffs @@ -102,8 +102,8 @@ vanDriestCoeffs } maxDeltaRatio 1.1; } - Aplus Aplus [0 0 0 0 0 0 0] 26; - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -116,11 +116,11 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa kappa [0 0 0 0 0 0 0] 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/dieselFoam/aachenBomb/constant/thermophysicalProperties index f3643830b8..46a5780227 100644 --- a/tutorials/dieselFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/dieselFoam/aachenBomb/constant/thermophysicalProperties @@ -32,7 +32,6 @@ liquidComponents liquidProperties { C7H16 C7H16 defaultCoeffs; - C7H16 } /*********************************************************************/ diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties index 80f2b97b30..cf62556002 100644 --- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties @@ -26,74 +26,74 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; muLimiter on; - Lsgs Lsgs [0 1 0 0 0 0 0] 0.0002; + Lsgs 0.0002; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties index b882072a2e..a723387ddb 100644 --- a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties +++ b/tutorials/engineFoam/kivaTest/constant/turbulenceProperties @@ -32,73 +32,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0; - alphah alphah [0 0 0 0 0 0 0] 1.111; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0; + alphah 1.111; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/icoFoam/Allrun b/tutorials/icoFoam/Allrun index bbb56eb55c..fcea17d98e 100755 --- a/tutorials/icoFoam/Allrun +++ b/tutorials/icoFoam/Allrun @@ -10,13 +10,13 @@ cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped" runMapFields () { echo "Running mapFields from $1 to $2" - mapFields -source $1 -case $2 -sourceTime latestTime > $2/log.mapFields 2>&1 + mapFields $1 -case $2 -sourceTime latestTime > $2/log.mapFields 2>&1 } runMapFieldsConsistent () { echo "Running mapFields from $1 to $2" - mapFields -source $1 -case $2 -sourceTime latestTime -consistent > $2/log.mapFields 2>&1 + mapFields $1 -case $2 -sourceTime latestTime -consistent > $2/log.mapFields 2>&1 } runFluentMeshToFoam () diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties index c2ac53a768..e439b7fdb0 100644 --- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties +++ b/tutorials/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties @@ -33,149 +33,149 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties b/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties index 6c86af54a6..4719424842 100644 --- a/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties +++ b/tutorials/lesInterFoam/nozzleFlow2D/constant/turbulenceProperties @@ -32,90 +32,90 @@ laminarCoeffs oneEqEddyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.07; - ce ce [0 0 0 0 0 0 0] 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; - cD2 cD2 [0 1 0 0 0 0 0] 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - cB cB [0 0 0 0 0 0 0] 8.22; - cK1 cK1 [0 0 0 0 0 0 0] 0.83; - cK2 cK2 [0 0 0 0 0 0 0] 1.03; - cK3 cK3 [0 0 0 0 0 0 0] 4.75; - cK4 cK4 [0 0 0 0 0 0 0] 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - c1 c1 [0 0 0 0 0 0 0] 1.8; - c2 c2 [0 0 0 0 0 0 0] 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - cm cm [0 0 0 0 0 0 0] 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; - CDES CDES [0 0 0 0 0 0 0] 0.65; - ck ck [0 0 0 0 0 0 0] 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -139,7 +139,7 @@ PrandtlCoeffs } maxDeltaRatio 1.1; } - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Cdelta 0.158; } vanDriestCoeffs @@ -158,8 +158,8 @@ vanDriestCoeffs } maxDeltaRatio 1.1; } - Aplus Aplus [0 0 0 0 0 0 0] 26; - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -172,11 +172,11 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa kappa [0 0 0 0 0 0 0] 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/mhdFoam/hartmann/Allclean b/tutorials/mhdFoam/Allclean similarity index 60% rename from tutorials/mhdFoam/hartmann/Allclean rename to tutorials/mhdFoam/Allclean index eac022838c..b30c90e13b 100755 --- a/tutorials/mhdFoam/hartmann/Allclean +++ b/tutorials/mhdFoam/Allclean @@ -3,5 +3,5 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -cleanCase -cleanSamples +(cd hartmann && cleanCase) +(cd hartmann && cleanSamples) diff --git a/tutorials/solidDisplacementFoam/plateHole/Allrun b/tutorials/mhdFoam/Allrun similarity index 54% rename from tutorials/solidDisplacementFoam/plateHole/Allrun rename to tutorials/mhdFoam/Allrun index 0cb054ecaa..57065d0204 100755 --- a/tutorials/solidDisplacementFoam/plateHole/Allrun +++ b/tutorials/mhdFoam/Allrun @@ -5,6 +5,6 @@ # Get application name from directory application=`basename $PWD` -runApplication blockMesh -runApplication $application -runApplication sample +(cd hartmann && runApplication blockMesh) +(cd hartmann && runApplication $application) +(cd hartmann && runApplication sample) diff --git a/tutorials/mhdFoam/hartmann/Allrun b/tutorials/mhdFoam/hartmann/Allrun deleted file mode 100755 index 0cb054ecaa..0000000000 --- a/tutorials/mhdFoam/hartmann/Allrun +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name from directory -application=`basename $PWD` - -runApplication blockMesh -runApplication $application -runApplication sample diff --git a/tutorials/oodles/pitzDaily/constant/turbulenceProperties b/tutorials/oodles/pitzDaily/constant/turbulenceProperties index d492f77b72..ce1b97ca73 100644 --- a/tutorials/oodles/pitzDaily/constant/turbulenceProperties +++ b/tutorials/oodles/pitzDaily/constant/turbulenceProperties @@ -32,90 +32,90 @@ laminarCoeffs oneEqEddyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.07; - ce ce [0 0 0 0 0 0 0] 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; - cD2 cD2 [0 1 0 0 0 0 0] 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - cB cB [0 0 0 0 0 0 0] 8.22; - cK1 cK1 [0 0 0 0 0 0 0] 0.83; - cK2 cK2 [0 0 0 0 0 0 0] 1.03; - cK3 cK3 [0 0 0 0 0 0 0] 4.75; - cK4 cK4 [0 0 0 0 0 0 0] 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - c1 c1 [0 0 0 0 0 0 0] 1.8; - c2 c2 [0 0 0 0 0 0 0] 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - cm cm [0 0 0 0 0 0 0] 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; - CDES CDES [0 0 0 0 0 0 0] 0.65; - ck ck [0 0 0 0 0 0 0] 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -139,7 +139,7 @@ PrandtlCoeffs } maxDeltaRatio 1.1; } - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Cdelta 0.158; } vanDriestCoeffs @@ -158,8 +158,8 @@ vanDriestCoeffs } maxDeltaRatio 1.1; } - Aplus Aplus [0 0 0 0 0 0 0] 26; - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -172,11 +172,11 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa kappa [0 0 0 0 0 0 0] 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties b/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties index d492f77b72..ce1b97ca73 100644 --- a/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties +++ b/tutorials/oodles/pitzDailyDirectMapped/constant/turbulenceProperties @@ -32,90 +32,90 @@ laminarCoeffs oneEqEddyCoeffs { - ck ck [0 0 0 0 0 0 0] 0.07; - ce ce [0 0 0 0 0 0 0] 1.05; + ck 0.07; + ce 1.05; } dynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } locDynOneEqEddyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } SmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; } Smagorinsky2Coeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; - cD2 cD2 [0 1 0 0 0 0 0] 0.02; + ce 1.05; + ck 0.07; + cD2 0.02; } spectEddyViscCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - cB cB [0 0 0 0 0 0 0] 8.22; - cK1 cK1 [0 0 0 0 0 0 0] 0.83; - cK2 cK2 [0 0 0 0 0 0 0] 1.03; - cK3 cK3 [0 0 0 0 0 0 0] 4.75; - cK4 cK4 [0 0 0 0 0 0 0] 2.55; + ce 1.05; + cB 8.22; + cK1 0.83; + cK2 1.03; + cK3 4.75; + cK4 2.55; } dynSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } mixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.07; + ce 1.05; + ck 0.07; filter simple; } dynMixedSmagorinskyCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; + ce 1.05; filter simple; } LRRDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - c1 c1 [0 0 0 0 0 0 0] 1.8; - c2 c2 [0 0 0 0 0 0 0] 0.6; + ce 1.05; + ck 0.09; + c1 1.8; + c2 0.6; } DeardorffDiffStressCoeffs { - ce ce [0 0 0 0 0 0 0] 1.05; - ck ck [0 0 0 0 0 0 0] 0.09; - cm cm [0 0 0 0 0 0 0] 4.13; + ce 1.05; + ck 0.09; + cm 4.13; } SpalartAllmarasCoeffs { - alphaNut alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; - CDES CDES [0 0 0 0 0 0 0] 0.65; - ck ck [0 0 0 0 0 0 0] 0.07; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; + CDES 0.65; + ck 0.07; } cubeRootVolCoeffs @@ -139,7 +139,7 @@ PrandtlCoeffs } maxDeltaRatio 1.1; } - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Cdelta 0.158; } vanDriestCoeffs @@ -158,8 +158,8 @@ vanDriestCoeffs } maxDeltaRatio 1.1; } - Aplus Aplus [0 0 0 0 0 0 0] 26; - Cdelta Cdelta [0 0 0 0 0 0 0] 0.158; + Aplus 26; + Cdelta 0.158; } smoothCoeffs @@ -172,11 +172,11 @@ smoothCoeffs maxDeltaRatio 1.1; } -kappa kappa [0 0 0 0 0 0 0] 0.4187; +kappa 0.4187; wallFunctionCoeffs { - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties index 7448d3acc9..2c2118c78a 100644 --- a/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties +++ b/tutorials/rasInterFoam/damBreak/constant/turbulenceProperties @@ -32,158 +32,158 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } realizableKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - A0 A0 [0 0 0 0 0 0 0] 4.0; - C2 C2 [0 0 0 0 0 0 0] 1.9; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.833333; + Cmu 0.09; + A0 4.0; + C2 1.9; + alphak 1; + alphaEps 0.833333; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties index aea6b61008..605d31eb8f 100644 --- a/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties +++ b/tutorials/rhoPimpleFoam/angledDuct/constant/turbulenceProperties @@ -25,73 +25,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } // ************************************************************************* // diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties index aea6b61008..605d31eb8f 100644 --- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties +++ b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties @@ -25,73 +25,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } // ************************************************************************* // diff --git a/tutorials/rhoSonicFoam/shockTube/Allclean b/tutorials/rhoSonicFoam/shockTube/Allclean deleted file mode 100755 index c8dbbe4c95..0000000000 --- a/tutorials/rhoSonicFoam/shockTube/Allclean +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase -rm -rf 0 -cp -r 0.org 0 -cleanSamples diff --git a/tutorials/rhoSonicFoam/shockTube/Allrun b/tutorials/rhoSonicFoam/shockTube/Allrun deleted file mode 100755 index 326fa2b564..0000000000 --- a/tutorials/rhoSonicFoam/shockTube/Allrun +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Get application name from directory -application=`basename $PWD` - -runApplication blockMesh -runApplication setFields -runApplication $application -runApplication foamCalc mag U -runApplication sample diff --git a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties index 84c9c7ba36..639f7418bf 100644 --- a/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/rhoTurbFoam/cavity/constant/turbulenceProperties @@ -38,143 +38,143 @@ laminarCoeffs kEpsilonCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // C3 - C3 C3 [0 0 0 0 0 0 0] -0.33; + C3 -0.33; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // RNG k-epsilon model coefficients RNGkEpsilonCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; + Cmu 0.0845; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.42; + C1 1.42; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.68; + C2 1.68; // C3 - C3 C3 [0 0 0 0 0 0 0] -0.33; + C3 -0.33; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphak - alphak alphaK [0 0 0 0 0 0 0] 1.39; + alphak 1.39; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; + alphaEps 1.39; // eta0 - eta0 eta0 [0 0 0 0 0 0 0] 4.38; + eta0 4.38; // beta - beta beta [0 0 0 0 0 0 0] 0.012; + beta 0.012; } // Launder-Sharma low Reynolds number k-epsilon model coefficients LaunderSharmaKECoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // C3 - C3 C3 [0 0 0 0 0 0 0] -0.33; + C3 -0.33; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // Launder-Reece-Rodi RSTM with wall functions model coefficients LRRCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // Clrr1 - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; + Clrr1 1.8; // Clrr2 - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; + Clrr2 0.6; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // Cs - Cs Cs [0 0 0 0 0 0 0] 0.25; + Cs 0.25; // Ceps - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + Ceps 0.15; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // alphaR - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + alphaR 1.22; } // Launder-Gibson RSTM with wall reflection and wall functions model coefficients LaunderGibsonRSTMCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // Clg1 - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; + Clg1 1.8; // Clg2 - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; + Clg2 0.6; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // C1Ref - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; + C1Ref 0.5; // C2Ref - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; + C2Ref 0.3; // Cs - Cs Cs [0 0 0 0 0 0 0] 0.25; + Cs 0.25; // Ceps - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + Ceps 0.15; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // alphaR - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + alphaR 1.22; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; } // Wall function coefficients wallFunctionCoeffs { // kappa - kappa kappa [0 0 0 0 0 0 0] 0.4187; + kappa 0.4187; // E - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options index 4af7133ad3..ac65c845e2 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options +++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels + -I$(LIB_SRC)/turbulenceModels/RAS EXE_LIBS = \ -llagrangian \ diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties index eb33720fe8..7d4495dc58 100644 --- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties +++ b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties @@ -38,124 +38,124 @@ laminarCoeffs kEpsilonCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // C3 - C3 C3 [0 0 0 0 0 0 0] -0.33; + C3 -0.33; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // RNG k-epsilon model coefficients RNGkEpsilonCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; + Cmu 0.0845; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.42; + C1 1.42; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.68; + C2 1.68; // C3 - C3 C3 [0 0 0 0 0 0 0] -0.33; + C3 -0.33; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphak - alphak alphaK [0 0 0 0 0 0 0] 1.39; + alphak 1.39; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; + alphaEps 1.39; // eta0 - eta0 eta0 [0 0 0 0 0 0 0] 4.38; + eta0 4.38; // beta - beta beta [0 0 0 0 0 0 0] 0.012; + beta 0.012; } // Launder-Sharma low Reynolds number k-epsilon model coefficients LaunderSharmaKECoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // C3 - C3 C3 [0 0 0 0 0 0 0] -0.33; + C3 -0.33; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphak - alphak alphak [0 0 0 0 0 0 0] 1; + alphak 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; } // Launder-Reece-Rodi RSTM with wall functions model coefficients LRRCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // Clrr1 - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; + Clrr1 1.8; // Clrr2 - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; + Clrr2 0.6; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // Cs - Cs Cs [0 0 0 0 0 0 0] 0.25; + Cs 0.25; // Ceps - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + Ceps 0.15; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // alphaR - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + alphaR 1.22; } // Launder-Gibson RSTM with wall reflection and wall functions model coefficients LaunderGibsonRSTMCoeffs { // Cmu - Cmu Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; // Clg1 - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; + Clg1 1.8; // Clg2 - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; + Clg2 0.6; // C1 - C1 C1 [0 0 0 0 0 0 0] 1.44; + C1 1.44; // C2 - C2 C2 [0 0 0 0 0 0 0] 1.92; + C2 1.92; // C1Ref - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; + C1Ref 0.5; // C2Ref - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; + C2Ref 0.3; // Cs - Cs Cs [0 0 0 0 0 0 0] 0.25; + Cs 0.25; // Ceps - Ceps Ceps [0 0 0 0 0 0 0] 0.15; + Ceps 0.15; // alphah - alphah alphah [0 0 0 0 0 0 0] 1; + alphah 1; // alphaEps - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + alphaEps 0.76923; // alphaR - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + alphaR 1.22; } // Wall function coefficients wallFunctionCoeffs { // kappa - kappa kappa [0 0 0 0 0 0 0] 0.4187; + kappa 0.4187; // E - E E [0 0 0 0 0 0 0] 9; + E 9; } diff --git a/tutorials/settlingFoam/dahl/constant/turbulenceProperties b/tutorials/settlingFoam/dahl/constant/turbulenceProperties index ef545fe3bd..2190843e1d 100644 --- a/tutorials/settlingFoam/dahl/constant/turbulenceProperties +++ b/tutorials/settlingFoam/dahl/constant/turbulenceProperties @@ -32,18 +32,18 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0.85; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties index ef545fe3bd..2190843e1d 100644 --- a/tutorials/settlingFoam/tank3D/constant/turbulenceProperties +++ b/tutorials/settlingFoam/tank3D/constant/turbulenceProperties @@ -32,18 +32,18 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] 0.85; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties index 5af0c608eb..f664723edb 100644 --- a/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDaily/constant/turbulenceProperties @@ -32,175 +32,175 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } realizableKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - A0 A0 [0 0 0 0 0 0 0] 4.0; - C2 C2 [0 0 0 0 0 0 0] 1.9; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.833333; + Cmu 0.09; + A0 4.0; + C2 1.9; + alphak 1; + alphaEps 0.833333; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties index 5af0c608eb..f664723edb 100644 --- a/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDaily3Blocks/constant/turbulenceProperties @@ -32,175 +32,175 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } realizableKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - A0 A0 [0 0 0 0 0 0 0] 4.0; - C2 C2 [0 0 0 0 0 0 0] 1.9; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.833333; + Cmu 0.09; + A0 4.0; + C2 1.9; + alphak 1; + alphaEps 0.833333; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties index 5af0c608eb..f664723edb 100644 --- a/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties +++ b/tutorials/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties @@ -32,175 +32,175 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } realizableKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - A0 A0 [0 0 0 0 0 0 0] 4.0; - C2 C2 [0 0 0 0 0 0 0] 1.9; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.833333; + Cmu 0.09; + A0 4.0; + C2 1.9; + alphak 1; + alphaEps 0.833333; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties index 65b42f0063..bebe8455e5 100644 --- a/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties +++ b/tutorials/simpleSRFFoam/mixer/constant/turbulenceProperties @@ -32,166 +32,166 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options index 35a2464b97..be658f22d0 100644 --- a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options +++ b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ + -I$(LIB_SRC)/turbulenceModels/RAS \ -I$(LIB_SRC)/transportModels EXE_LIBS = \ diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H index c0e0337fed..9f1017f23e 100644 --- a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H +++ b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H @@ -46,9 +46,9 @@ singlePhaseTransportModel laminarTransport(Urel, phi); - autoPtr turbulence + autoPtr turbulence ( - turbulenceModel::New(Urel, phi, laminarTransport) + incompressible::turbulenceModel::New(Urel, phi, laminarTransport) ); Info<< "Creating SRF model\n" << endl; diff --git a/tutorials/solidDisplacementFoam/plateHole/Allclean b/tutorials/solidDisplacementFoam/plateHole/Allclean deleted file mode 100755 index eac022838c..0000000000 --- a/tutorials/solidDisplacementFoam/plateHole/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase -cleanSamples diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties index 94309a416d..c24f035fe5 100644 --- a/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/nacaAirfoil/constant/turbulenceProperties @@ -32,73 +32,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties index b2da411881..6a3194ffd3 100644 --- a/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties +++ b/tutorials/sonicTurbFoam/prism/constant/turbulenceProperties @@ -32,73 +32,73 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.33; - alphah alphah [0 0 0 0 0 0 0] 1; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; } LRRCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphah alphah [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/turbFoam/cavity/constant/turbulenceProperties b/tutorials/turbFoam/cavity/constant/turbulenceProperties index 5af0c608eb..f664723edb 100644 --- a/tutorials/turbFoam/cavity/constant/turbulenceProperties +++ b/tutorials/turbFoam/cavity/constant/turbulenceProperties @@ -32,175 +32,175 @@ laminarCoeffs kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } RNGkEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.0845; - C1 C1 [0 0 0 0 0 0 0] 1.42; - C2 C2 [0 0 0 0 0 0 0] 1.68; - alphak alphaK [0 0 0 0 0 0 0] 1.39; - alphaEps alphaEps [0 0 0 0 0 0 0] 1.39; - eta0 eta0 [0 0 0 0 0 0 0] 4.38; - beta beta [0 0 0 0 0 0 0] 0.012; + Cmu 0.0845; + C1 1.42; + C2 1.68; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; } realizableKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - A0 A0 [0 0 0 0 0 0 0] 4.0; - C2 C2 [0 0 0 0 0 0 0] 1.9; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.833333; + Cmu 0.09; + A0 4.0; + C2 1.9; + alphak 1; + alphaEps 0.833333; } kOmegaSSTCoeffs { - alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034; - alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0; - alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5; - alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616; - gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532; - gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403; - beta1 beta1 [0 0 0 0 0 0 0] 0.0750; - beta2 beta2 [0 0 0 0 0 0 0] 0.0828; - betaStar betaStar [0 0 0 0 0 0 0] 0.09; - a1 a1 [0 0 0 0 0 0 0] 0.31; - c1 c1 [0 0 0 0 0 0 0] 10; + 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 Cmu [0 0 0 0 0 0 0] 0.09; + Cmu 0.09; } NonlinearKEShihCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaZeta 0.76923; anisotropic no; } LaunderSharmaKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LamBremhorstKECoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphaEps 0.76923; } LienCubicKELowReCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - A1 A1 [0 0 0 0 0 0 0] 1.25; - A2 A2 [0 0 0 0 0 0 0] 1000; - Ctau1 Ctau1 [0 0 0 0 0 0 0] -4; - Ctau2 Ctau2 [0 0 0 0 0 0 0] 13; - Ctau3 Ctau3 [0 0 0 0 0 0 0] -2; - alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - Am Am [0 0 0 0 0 0 0] 0.016; - Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263; - Amu Amu [0 0 0 0 0 0 0] 0.00222; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8; - Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + 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 Cmu [0 0 0 0 0 0 0] 0.09; - Clg1 Clg1 [0 0 0 0 0 0 0] 1.8; - Clg2 Clg2 [0 0 0 0 0 0 0] 0.6; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C1Ref C1Ref [0 0 0 0 0 0 0] 0.5; - C2Ref C2Ref [0 0 0 0 0 0 0] 0.3; - Cs Cs [0 0 0 0 0 0 0] 0.25; - Ceps Ceps [0 0 0 0 0 0 0] 0.15; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; - alphaR alphaR [0 0 0 0 0 0 0] 1.22; + 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 alphaNut [0 0 0 0 0 0 0] 1.5; - Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355; - Cb2 Cb2 [0 0 0 0 0 0 0] 0.622; - Cw2 Cw2 [0 0 0 0 0 0 0] 0.3; - Cw3 Cw3 [0 0 0 0 0 0 0] 2; - Cv1 Cv1 [0 0 0 0 0 0 0] 7.1; - Cv2 Cv2 [0 0 0 0 0 0 0] 5.0; + alphaNut 1.5; + Cb1 0.1355; + Cb2 0.622; + Cw2 0.3; + Cw3 2; + Cv1 7.1; + Cv2 5.0; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; } diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties index 06441f0935..165657e27c 100644 --- a/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bed/constant/turbulenceProperties @@ -34,13 +34,13 @@ turbulence on; kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.375; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.375; - alphak alphak [0 0 0 0 0 0 0] 1.0; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.82142; + alphak 1.0; + alphaEps 0.82142; } @@ -49,8 +49,8 @@ kEpsilonCoeffs wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9.0; + kappa 0.4187; + E 9.0; } // ************************************************************************* // diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties index c049b3a58f..cbd29fd836 100644 --- a/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bed2/constant/turbulenceProperties @@ -34,13 +34,13 @@ turbulence off; kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - C3 C3 [0 0 0 0 0 0 0] -0.375; + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.375; - alphak alphak [0 0 0 0 0 0 0] 1.0; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.82142; + alphak 1.0; + alphaEps 0.82142; } @@ -49,8 +49,8 @@ kEpsilonCoeffs wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9.0; + kappa 0.4187; + E 9.0; } // ************************************************************************* // diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/Theta b/tutorials/twoPhaseEulerFoam/bubbleColumn/0/Theta index 0fb8ca3e19..94fad5835e 100644 --- a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/Theta +++ b/tutorials/twoPhaseEulerFoam/bubbleColumn/0/Theta @@ -1,16 +1,26 @@ -// ************************************************************************* // +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ -version 1.0; -format ascii; -root ""; -case ""; -instance ""; -local ""; -class volScalarField; -form dictionary; -object Theta; +FoamFile +{ + version 2.0; + format ascii; -// ************************************************************************* // + root ""; + case ""; + instance ""; + local ""; + + class volScalarField; + object Theta; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [ 0 2 -2 0 0 0 0 ]; diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties index 023bcfc148..dc05e1c634 100644 --- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/turbulenceProperties @@ -28,17 +28,17 @@ turbulence off; kEpsilonCoeffs { - Cmu Cmu [0 0 0 0 0 0 0] 0.09; - C1 C1 [0 0 0 0 0 0 0] 1.44; - C2 C2 [0 0 0 0 0 0 0] 1.92; - alphak alphak [0 0 0 0 0 0 0] 1; - alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923; + Cmu 0.09; + C1 1.44; + C2 1.92; + alphak 1; + alphaEps 0.76923; } wallFunctionCoeffs { - kappa kappa [0 0 0 0 0 0 0] 0.4187; - E E [0 0 0 0 0 0 0] 9; + kappa 0.4187; + E 9; }