From eaea0460cd065cf47aded3e05e4d627aa9d62de7 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 19 Dec 2008 17:59:54 +0000
Subject: [PATCH] general updates for new turbulence model structure

---
 .../hotRoom/constant/turbulenceProperties     | 22 +++++++++++++++++++
 .../depthCharge2D/0/U                         |  0
 .../depthCharge2D/0/alpha1.org                |  0
 .../depthCharge2D/0/pd.org                    |  0
 .../depthCharge2D/Allrun                      |  0
 .../depthCharge2D/constant/LESProperties      |  4 +++-
 .../constant/environmentalProperties          |  0
 .../constant/polyMesh/blockMeshDict           |  0
 .../depthCharge2D/constant/polyMesh/boundary  |  7 +++---
 .../constant/transportProperties              |  0
 .../constant/turbulenceProperties             | 22 +++++++++++++++++++
 .../depthCharge2D/system/controlDict          |  0
 .../depthCharge2D/system/fvSchemes            |  0
 .../depthCharge2D}/system/fvSolution          |  2 +-
 .../depthCharge2D/system/setFieldsDict        |  0
 .../depthCharge3D/0/U                         |  0
 .../depthCharge3D/0/alpha1.org                |  0
 .../depthCharge3D/0/pd.org                    |  0
 .../depthCharge3D/Allclean                    |  0
 .../depthCharge3D/Allrun                      |  0
 .../depthCharge3D/constant/LESProperties      |  4 +++-
 .../constant/environmentalProperties          |  0
 .../constant/polyMesh/blockMeshDict           |  0
 .../depthCharge3D/constant/polyMesh/boundary  |  7 +++---
 .../constant/transportProperties              |  0
 .../constant/turbulenceProperties             | 22 +++++++++++++++++++
 .../depthCharge3D/system/controlDict          |  0
 .../depthCharge3D/system/decomposeParDict     |  0
 .../depthCharge3D/system/fvSchemes            |  0
 .../depthCharge3D}/system/fvSolution          |  2 +-
 .../depthCharge3D/system/machines             |  0
 .../depthCharge3D/system/setFieldsDict        |  0
 32 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/0/U (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/0/alpha1.org (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/0/pd.org (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/Allrun (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/LESProperties (98%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/environmentalProperties (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/polyMesh/blockMeshDict (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/polyMesh/boundary (78%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/constant/transportProperties (100%)
 create mode 100644 tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/system/controlDict (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/system/fvSchemes (100%)
 rename tutorials/{compressibleLesInterFoam/depthCharge3D => compressibleInterFoam/depthCharge2D}/system/fvSolution (99%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge2D/system/setFieldsDict (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/0/U (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/0/alpha1.org (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/0/pd.org (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/Allclean (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/Allrun (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/LESProperties (98%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/environmentalProperties (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/polyMesh/blockMeshDict (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/polyMesh/boundary (75%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/constant/transportProperties (100%)
 create mode 100644 tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/controlDict (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/decomposeParDict (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/fvSchemes (100%)
 rename tutorials/{compressibleLesInterFoam/depthCharge2D => compressibleInterFoam/depthCharge3D}/system/fvSolution (99%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/machines (100%)
 rename tutorials/{compressibleLesInterFoam => compressibleInterFoam}/depthCharge3D/system/setFieldsDict (100%)

diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
new file mode 100644
index 00000000000..321c08496ae
--- /dev/null
+++ b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//simulationType       laminar;
+simulationType       RASModel;
+//simulationType       LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/0/U b/tutorials/compressibleInterFoam/depthCharge2D/0/U
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/0/U
rename to tutorials/compressibleInterFoam/depthCharge2D/0/U
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/0/alpha1.org b/tutorials/compressibleInterFoam/depthCharge2D/0/alpha1.org
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/0/alpha1.org
rename to tutorials/compressibleInterFoam/depthCharge2D/0/alpha1.org
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/0/pd.org b/tutorials/compressibleInterFoam/depthCharge2D/0/pd.org
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/0/pd.org
rename to tutorials/compressibleInterFoam/depthCharge2D/0/pd.org
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/Allrun b/tutorials/compressibleInterFoam/depthCharge2D/Allrun
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/Allrun
rename to tutorials/compressibleInterFoam/depthCharge2D/Allrun
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/LESProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties
similarity index 98%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/LESProperties
rename to tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties
index 130d0947d9c..bb84772ba51 100644
--- a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/LESProperties
+++ b/tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties
@@ -16,7 +16,9 @@ FoamFile
 
 LESModel        laminar;
 
-delta           smooth;
+turbulence      off;
+
+delta           cubeRootVol;
 
 laminarCoeffs
 {
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/environmentalProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/environmentalProperties
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/environmentalProperties
rename to tutorials/compressibleInterFoam/depthCharge2D/constant/environmentalProperties
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
rename to tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/boundary b/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
similarity index 78%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/boundary
rename to tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
index e1e2119e32d..a6a3281fd72 100644
--- a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/polyMesh/boundary
+++ b/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
@@ -1,15 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
+|  \\    /   O peration     | Version:  dev-09ca1eb6b56f                      |
+|   \\  /    A nd           |                                                 |
+|    \\/     M anipulation  |                                www.OpenFOAM.org |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/constant/transportProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/transportProperties
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/constant/transportProperties
rename to tutorials/compressibleInterFoam/depthCharge2D/constant/transportProperties
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties
new file mode 100644
index 00000000000..d3f32ecb06e
--- /dev/null
+++ b/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//simulationType       laminar;
+//simulationType       RASModel;
+simulationType       LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/controlDict b/tutorials/compressibleInterFoam/depthCharge2D/system/controlDict
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/controlDict
rename to tutorials/compressibleInterFoam/depthCharge2D/system/controlDict
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSchemes b/tutorials/compressibleInterFoam/depthCharge2D/system/fvSchemes
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSchemes
rename to tutorials/compressibleInterFoam/depthCharge2D/system/fvSchemes
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSolution b/tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution
similarity index 99%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSolution
rename to tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution
index f97cf54032e..86825247397 100644
--- a/tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSolution
+++ b/tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution
@@ -120,7 +120,7 @@ PISO
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      1;
     nAlphaSubCycles 1;
-    cGamma          1;
+    cAlpha          1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/setFieldsDict b/tutorials/compressibleInterFoam/depthCharge2D/system/setFieldsDict
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/setFieldsDict
rename to tutorials/compressibleInterFoam/depthCharge2D/system/setFieldsDict
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/0/U b/tutorials/compressibleInterFoam/depthCharge3D/0/U
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/0/U
rename to tutorials/compressibleInterFoam/depthCharge3D/0/U
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/0/alpha1.org b/tutorials/compressibleInterFoam/depthCharge3D/0/alpha1.org
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/0/alpha1.org
rename to tutorials/compressibleInterFoam/depthCharge3D/0/alpha1.org
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/0/pd.org b/tutorials/compressibleInterFoam/depthCharge3D/0/pd.org
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/0/pd.org
rename to tutorials/compressibleInterFoam/depthCharge3D/0/pd.org
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/Allclean b/tutorials/compressibleInterFoam/depthCharge3D/Allclean
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/Allclean
rename to tutorials/compressibleInterFoam/depthCharge3D/Allclean
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/Allrun b/tutorials/compressibleInterFoam/depthCharge3D/Allrun
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/Allrun
rename to tutorials/compressibleInterFoam/depthCharge3D/Allrun
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/LESProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties
similarity index 98%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/LESProperties
rename to tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties
index 130d0947d9c..bb84772ba51 100644
--- a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/LESProperties
+++ b/tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties
@@ -16,7 +16,9 @@ FoamFile
 
 LESModel        laminar;
 
-delta           smooth;
+turbulence      off;
+
+delta           cubeRootVol;
 
 laminarCoeffs
 {
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/environmentalProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/environmentalProperties
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/environmentalProperties
rename to tutorials/compressibleInterFoam/depthCharge3D/constant/environmentalProperties
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
rename to tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/boundary b/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
similarity index 75%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/boundary
rename to tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
index 178b2ace003..3517ca55be1 100644
--- a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/polyMesh/boundary
+++ b/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
@@ -1,15 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
+|  \\    /   O peration     | Version:  dev-09ca1eb6b56f                      |
+|   \\  /    A nd           |                                                 |
+|    \\/     M anipulation  |                                www.OpenFOAM.org |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/constant/transportProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/transportProperties
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/constant/transportProperties
rename to tutorials/compressibleInterFoam/depthCharge3D/constant/transportProperties
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties
new file mode 100644
index 00000000000..fe67e8fecae
--- /dev/null
+++ b/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//simulationType laminar;
+//simulationType RASModel;
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/controlDict b/tutorials/compressibleInterFoam/depthCharge3D/system/controlDict
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/controlDict
rename to tutorials/compressibleInterFoam/depthCharge3D/system/controlDict
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/decomposeParDict b/tutorials/compressibleInterFoam/depthCharge3D/system/decomposeParDict
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/decomposeParDict
rename to tutorials/compressibleInterFoam/depthCharge3D/system/decomposeParDict
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSchemes b/tutorials/compressibleInterFoam/depthCharge3D/system/fvSchemes
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/fvSchemes
rename to tutorials/compressibleInterFoam/depthCharge3D/system/fvSchemes
diff --git a/tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSolution b/tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution
similarity index 99%
rename from tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSolution
rename to tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution
index f97cf54032e..86825247397 100644
--- a/tutorials/compressibleLesInterFoam/depthCharge2D/system/fvSolution
+++ b/tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution
@@ -120,7 +120,7 @@ PISO
     nNonOrthogonalCorrectors 0;
     nAlphaCorr      1;
     nAlphaSubCycles 1;
-    cGamma          1;
+    cAlpha          1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/machines b/tutorials/compressibleInterFoam/depthCharge3D/system/machines
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/machines
rename to tutorials/compressibleInterFoam/depthCharge3D/system/machines
diff --git a/tutorials/compressibleLesInterFoam/depthCharge3D/system/setFieldsDict b/tutorials/compressibleInterFoam/depthCharge3D/system/setFieldsDict
similarity index 100%
rename from tutorials/compressibleLesInterFoam/depthCharge3D/system/setFieldsDict
rename to tutorials/compressibleInterFoam/depthCharge3D/system/setFieldsDict
-- 
GitLab