diff --git a/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e b/applications/solvers/heatTransfer/TlesPimlpleFoam/calculateAverages.H~918dc24fd09dc58d05222b287f51b98d2599f83e
deleted file mode 100644
index 331a2aaa7ec522107455b8e44e3e177341bf0a72..0000000000000000000000000000000000000000
--- 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 331a2aaa7ec522107455b8e44e3e177341bf0a72..0000000000000000000000000000000000000000
--- 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 331a2aaa7ec522107455b8e44e3e177341bf0a72..0000000000000000000000000000000000000000
--- 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 64e53cdc778a2c4b6887a4f83d3e2385feb5c978..0000000000000000000000000000000000000000
--- 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<volVectorField> UmeanPtr;
- autoPtr<volSymmTensorField> RPtr;
- autoPtr<volSymmTensorField> BmeanPtr;
- autoPtr<volScalarField> epsilonMeanPtr;
-
- autoPtr<volScalarField> pMeanPtr;
- autoPtr<volScalarField> 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 64e53cdc778a2c4b6887a4f83d3e2385feb5c978..0000000000000000000000000000000000000000
--- 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<volVectorField> UmeanPtr;
- autoPtr<volSymmTensorField> RPtr;
- autoPtr<volSymmTensorField> BmeanPtr;
- autoPtr<volScalarField> epsilonMeanPtr;
-
- autoPtr<volScalarField> pMeanPtr;
- autoPtr<volScalarField> 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 64e53cdc778a2c4b6887a4f83d3e2385feb5c978..0000000000000000000000000000000000000000
--- 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<volVectorField> UmeanPtr;
- autoPtr<volSymmTensorField> RPtr;
- autoPtr<volSymmTensorField> BmeanPtr;
- autoPtr<volScalarField> epsilonMeanPtr;
-
- autoPtr<volScalarField> pMeanPtr;
- autoPtr<volScalarField> 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 f590d9ba6ff3e9de34ab75cdc4e2ff3bd62dc748..0000000000000000000000000000000000000000
--- 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 f590d9ba6ff3e9de34ab75cdc4e2ff3bd62dc748..0000000000000000000000000000000000000000
--- 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 f590d9ba6ff3e9de34ab75cdc4e2ff3bd62dc748..0000000000000000000000000000000000000000
--- 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 8b60d34a2954f67883dd165d5781b6e3df0d4891..347fa1168e86a82a10ea771c0094dc00a9028a41 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 2921cdf4c98e98de3c031d8b1d883d9e089cb64d..8650460bc11772ab72ad15e4b089ed5244cfd0ab 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 5915b782f938ea2b3e97e5e42668503bafd5e52c..cd9c005302daa1d899fa13bd09cd7469d06ee372 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 7cf3305194f2ba6e87046bf7816ea3d24b7908bc..dfc560135ec5d6e7452afa8c92e1fbd9756f6bd9 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 d6b4360c9ea38bf13eaf7a9e0cb2c86663f8e18a..411a897499268413b93fbb873962584f0e86aae2 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 2b2cc99339a464bd6154231b246aa6094231d14a..665d4bbf74bca783cb38080d2bfc2474a982b511 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 13dc8b1b143d1e8494c9dc3c347e24fcfc06446c..7d70f4e57517d6fff495c570ac7b14927a95584c 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 e9e4cbf41b686ab4cffc6c0ba2f5fcc42132f1cc..ea7d1a9b14579d25d67cfa53a98168c24f2c00b8 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 5915b782f938ea2b3e97e5e42668503bafd5e52c..cd9c005302daa1d899fa13bd09cd7469d06ee372 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 a6333250226acf59b2f2ae29114d645fc49e4d23..96916c20e7e554f097fe1d94aed16c5559ee03c7 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<scalar>("kappa", 0.4187)),
Aplus_
(
- dimensionedScalar(dd.subDict(type() + "Coeffs").lookup("Aplus")).value()
+ dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Aplus", 26.0)
),
Cdelta_
(
- dimensionedScalar(dd.subDict(type() + "Coeffs").lookup("Cdelta"))
- .value()
+ dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("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<scalar>("kappa", kappa_);
+ dd.readIfPresent<scalar>("Aplus", Aplus_);
+ dd.readIfPresent<scalar>("Cdelta", Cdelta_);
calcDelta();
}
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
index b0e647e10a1e3ef1f41e11bce4758f9dbd53c759..6437903e0c05c3ff367197a834b0bc565108cb3c 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 1ae8c416d891be40f4363d11eb828a89a07c8041..390e3b01498fee77fb612ef2a461cdc2211590b6 100644
--- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
+++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
@@ -36,9 +36,9 @@
singlePhaseTransportModel laminarTransport(U, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> 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 733a114ddba466dba58e066bb363c3e759b0dcd7..9b738288b3963ad6673518d3f814d1acf5cc9f23 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 10111c9951d11173e22ef1862b570941e9ddc36c..91e74e5b1e4f67bda7d1392630021ed86530d719 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 1fb585840f6e02d48c7d985a057020ee33819dd4..21fc8a8a02e18e7247d1c05518a5e823ae4e3d3a 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 1fb585840f6e02d48c7d985a057020ee33819dd4..21fc8a8a02e18e7247d1c05518a5e823ae4e3d3a 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 54288e078327692244193f1412bfc2c5df228acd..24ae5e908264acdef73e656487b00f8b6829bf16 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 1a7b122cedf33b66670d1f96fcb062ae30d84e35..76158edd86a503ef85d055084cb226c6c08929bc 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 0956e1957f4c06092593b9bf356b2fa5b2ea7aa8..e2e899ca1a067da84553d214f8823f2195a3000d 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 48be4c90346552bcbb706994d5dc3245d42d1742..289c15e14aab7e3defc8d4bfa6bfeb3b50e793aa 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 48be4c90346552bcbb706994d5dc3245d42d1742..289c15e14aab7e3defc8d4bfa6bfeb3b50e793aa 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 48be4c90346552bcbb706994d5dc3245d42d1742..289c15e14aab7e3defc8d4bfa6bfeb3b50e793aa 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 c785596513396687e8a82d4dc2af483ee828b706..3478ac639cbfa776a736fab59821907affb82d7d 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 1fb585840f6e02d48c7d985a057020ee33819dd4..21fc8a8a02e18e7247d1c05518a5e823ae4e3d3a 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 f3643830b8c47e31be4586a805a3bb1d19f647d9..46a57802276e801ef33b9ed74d8992d0736ddda5 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 80f2b97b3091d443360aa6a286a6786dff9dd55d..cf62556002b61d32701412ae42ac0379a0075249 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 b882072a2ebbacb18dae55acad908c6ef9cddf49..a723387ddb419669b367394cd949a718db10fcf1 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 bbb56eb55c3ddd2efd09910d0bffa2a53bedd327..fcea17d98e2001b2f2eff9570382ffa96710caa5 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 c2ac53a768a9d6d2cb0e12d95115f1c3bedde818..e439b7fdb0fa51ba69353c5b0788657dc2652adf 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 6c86af54a6d9c7ad274ed2589b24f1bd274f5c0b..47194248421159e8bf18ee866545b25cafcf01f3 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 eac022838c4984decf81984d619d9a2016774834..b30c90e13b5398304475b406c33baa3c9536cdd8 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 0cb054ecaa7ed35d31639c1312ae46ca7c8a85d2..57065d0204ecad010825e3658fa2530f77a37f05 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 0cb054ecaa7ed35d31639c1312ae46ca7c8a85d2..0000000000000000000000000000000000000000
--- 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 d492f77b72712e5e2de648e6c162627b3814e3c7..ce1b97ca73796c1b43ee1baeab345990d4d72fcd 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 d492f77b72712e5e2de648e6c162627b3814e3c7..ce1b97ca73796c1b43ee1baeab345990d4d72fcd 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 7448d3acc94090ef702f908f5fb4f1a4863ee673..2c2118c78a0fa85f5fe7320d04edc03cb1213372 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 aea6b61008489a3108971e58c3f5cce194eba423..605d31eb8fd3ed88e1356654df4cce2239dc7245 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 aea6b61008489a3108971e58c3f5cce194eba423..605d31eb8fd3ed88e1356654df4cce2239dc7245 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 c8dbbe4c95f05ded3bcba9a45d4b5c2396c1f60d..0000000000000000000000000000000000000000
--- 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 326fa2b56408c1f3f1f128fba0bd53a34deb0714..0000000000000000000000000000000000000000
--- 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 84c9c7ba36d805943d00ae78c2be96180607855f..639f7418bf9102894cee7902c8abfa9e74ddd350 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;
-
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
-
- alphah alphah [0 0 0 0 0 0 0] 1;
+ alphaK1 0.85034;
+ alphaK2 1.0;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.0750;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+
+ Cmu 0.09;
+
+ alphah 1;
}
// 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 4af7133ad332cad337a01c0dad6f21880272033d..ac65c845e2859b4e4a02ccd9cbc33709c881eb61 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 eb33720fe872b2016d815aea5fd8fd6634f22155..7d4495dc582ee84e11a275b7a4483852dc276637 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 ef545fe3bdd60b9f63571e29335558313bf5880b..2190843e1dcaf8c8cf7426d1aedf60f34faaee73 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 ef545fe3bdd60b9f63571e29335558313bf5880b..2190843e1dcaf8c8cf7426d1aedf60f34faaee73 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 5af0c608ebd6ee65999739a135887122e638f4dc..f664723edb91744c23cccf978d54fbd0355ac00f 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 5af0c608ebd6ee65999739a135887122e638f4dc..f664723edb91744c23cccf978d54fbd0355ac00f 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 5af0c608ebd6ee65999739a135887122e638f4dc..f664723edb91744c23cccf978d54fbd0355ac00f 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 65b42f00637b42d054fd8d51ba51b09f28c1aff8..bebe8455e501a4fd2cbf3a6ed800413785f54d52 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 35a2464b977bddf8edd5b0b55933a9d7e9a7f9fd..be658f22d059a6495b6d6437ebbca2f42e4bff8a 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 c0e0337fedaab435d5428208d2fcd63704ebdaf7..9f1017f23e30d8f450c3abd9655b32bf822a11da 100644
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H
+++ b/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H
@@ -46,9 +46,9 @@
singlePhaseTransportModel laminarTransport(Urel, phi);
- autoPtr<turbulenceModel> turbulence
+ autoPtr<incompressible::turbulenceModel> 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 eac022838c4984decf81984d619d9a2016774834..0000000000000000000000000000000000000000
--- 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 94309a416d681f54c6bcbeea60f51d0edf78a4eb..c24f035fe5b19609cf52b0498cf9a7aa823cd7dc 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 b2da41188176baf965d43c1f9c1ce0ec7bf14900..6a3194ffd34a80e98e4808d085558d880e6c0fbe 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 5af0c608ebd6ee65999739a135887122e638f4dc..f664723edb91744c23cccf978d54fbd0355ac00f 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 06441f09355a1eeed4f20041de53cde22b2059dc..165657e27c2ade280118836e4f3b52ba559e72a6 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 c049b3a58fbc43f2e1c0a496f39de633286c8364..cbd29fd8360a1bcb8ec8494a54ad27f3d0975565 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 0fb8ca3e19f372843fd8a679ba5959db8098cdd3..94fad5835e140e9017dc4ec34084536aebd24b02 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 | |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+ version 2.0;
+ format ascii;
-version 1.0;
-format ascii;
-root "";
-case "";
-instance "";
-local "";
-class volScalarField;
-form dictionary;
-object Theta;
+ 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 023bcfc148b50def94b346630e1c994a9966d341..dc05e1c634f1e725f2a8a8182b8bd3db0b0b7687 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;
}