From ba1daed66f4f96f9e739351023e9b35da63f6269 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 15 Dec 2010 15:36:44 +0000
Subject: [PATCH] ENH: windTurbineTerrain : updated Allrun to use ptscotch

---
 .../simpleFoam/windTurbineTerrain/Allclean    |  3 ++
 .../simpleFoam/windTurbineTerrain/Allrun      |  2 ++
 .../system/decomposeParDict-nonPar            | 29 +++++++++++++++++++
 .../system/decomposeParDict-par               | 29 +++++++++++++++++++
 .../windTurbineTerrain/system/fvSchemes       |  2 +-
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-nonPar
 create mode 100644 tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-par

diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean
index cfc95cf865..2e2bcf8132 100755
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allclean
@@ -19,4 +19,7 @@ rm -rf constant/polyMesh/sets
 #rm -rf constant/refinementHistory
 #rm -rf constant/surfaceIndex
 
+# Reset decomposeParDict
+cp system/decomposeParDict-nonPar system/decomposeParDict
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun
index fbbdf2c04a..c69808608c 100755
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/Allrun
@@ -7,6 +7,7 @@ cd ${0%/*} || exit 1    # run from this directory
 compileApplication windSimpleFoam
 
 runApplication blockMesh
+cp system/decomposeParDict-nonPar system/decomposeParDict
 runApplication decomposePar
 
 #runApplication snappyHexMesh -overwrite
@@ -14,6 +15,7 @@ runApplication decomposePar
 #runApplication setsToZones -noFlipMap
 #runApplication windSimpleFoam
 
+cp system/decomposeParDict-par system/decomposeParDict
 runParallel snappyHexMesh 2 -overwrite
 
 # Add wildcard entries for meshes patches since not preserved
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-nonPar b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-nonPar
new file mode 100644
index 0000000000..f45f2839e1
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-nonPar
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-par b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-par
new file mode 100644
index 0000000000..52262d8cdd
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/decomposeParDict-par
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 2;
+
+method          ptscotch;//hierarchical;
+
+hierarchicalCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+    order       xyz;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes
index 30ee3b82f4..2e7c10da7b 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
 {
     default             none;
     div(phi,U)          Gauss upwind grad(U);
-    div((nuEff*dev(grad(U).T())))   Gauss linear;
+    div((nuEff*dev(T(grad(U)))))    Gauss linear;
     div(phi,epsilon)    Gauss upwind;
     div(phi,k)          Gauss upwind;
 }