From d94a7bf590ef9b31db278de8afade78ce6176e84 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Tue, 1 Oct 2019 15:00:55 +0100
Subject: [PATCH] tutorials/incompressible/simpleFoam/turbineSiting: Replaced
 file copying with foamDictionary and .orig

---
 .../simpleFoam/turbineSiting/Allclean         | 12 ----------
 .../simpleFoam/turbineSiting/Allrun           |  7 ++----
 ...ict.hierarchical => decomposeParDict.orig} |  0
 .../system/decomposeParDict.ptscotch          | 22 -------------------
 4 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100755 tutorials/incompressible/simpleFoam/turbineSiting/Allclean
 rename tutorials/incompressible/simpleFoam/turbineSiting/system/{decomposeParDict.hierarchical => decomposeParDict.orig} (100%)
 delete mode 100644 tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch

diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
deleted file mode 100755
index 78e29a4dce..0000000000
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-
-# Remove decomposeParDict
-rm -f system/decomposeParDict
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
index 965a990c41..00da955932 100755
--- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun
@@ -5,14 +5,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp system/decomposeParDict.hierarchical system/decomposeParDict
+foamDictionary -entry "method" -set "hierarchical" system/decomposeParDict
 runApplication decomposePar -copyZero
-
-cp system/decomposeParDict.ptscotch system/decomposeParDict
+foamDictionary -entry "method" -set "ptscotch" system/decomposeParDict
 runParallel snappyHexMesh -overwrite
 
-find . -type f -iname "*level*" -exec rm {} \;
-
 runParallel topoSet
 runParallel $(getApplication)
 
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.hierarchical b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.orig
similarity index 100%
rename from tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.hierarchical
rename to tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.orig
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch
deleted file mode 100644
index 14de5e1d22..0000000000
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict.ptscotch
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      decomposeParDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method          ptscotch;
-
-// ************************************************************************* //