From b8f07097ce728a56c43fcf327d099b15f9746f8a Mon Sep 17 00:00:00 2001
From: Gerhard Holzinger <gerhard.holzinger@jku.at>
Date: Wed, 8 Nov 2017 10:35:27 +0100
Subject: [PATCH] clean-up of tutorials

* removed all references to non-existent turboEngineM2M locateModel
* proper formatting of turboEngineProps dictionaries
---
 .../ErgunTestCG/CFD/constant/couplingProperties          | 2 +-
 .../ErgunTestMPI/CFD/constant/couplingProperties         | 9 +++------
 .../ErgunTestMPI_cgs/CFD/constant/couplingProperties     | 9 +++------
 .../ErgunTestMPI/CFD/constant/couplingProperties         | 9 +++------
 .../FinesColumn/CFD/constant/couplingProperties          | 9 +++------
 5 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties
index e82fc015..fd901353 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/constant/couplingProperties
@@ -33,7 +33,7 @@ couplingInterval 100;
 
 voidFractionModel divided;//centre;//
 
-locateModel engine;//turboEngineM2M;//
+locateModel engine;//turboEngine;//
 
 meshMotionModel noMeshMotion;
 
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
index 51ca9d0d..a383595f 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
@@ -35,7 +35,7 @@ couplingInterval 100;
 
 voidFractionModel divided;//centre;//
 
-locateModel engine;//turboEngineM2M;//
+locateModel engine;//turboEngine;//
 
 meshMotionModel noMeshMotion;
 
@@ -215,12 +215,9 @@ engineProps
     treeSearch true;
 }
 
-turboEngineM2MProps
+turboEngineProps
 {
-    turboEngineProps
-    {
-        treeSearch true;
-    }
+    treeSearch true;
 }
 
 dividedProps
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties
index 01b5a9da..b059dbe1 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties
@@ -32,7 +32,7 @@ couplingInterval 100;
 
 voidFractionModel divided;
 
-locateModel engine;//turboEngineM2M;//
+locateModel engine;//turboEngine;//
 
 meshMotionModel noMeshMotion;
 
@@ -152,12 +152,9 @@ engineProps
     treeSearch true;
 }
 
-turboEngineM2MProps
+turboEngineProps
 {
-    turboEngineProps
-    {
-        treeSearch true;
-    }
+    treeSearch true;
 }
 
 dividedProps
diff --git a/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties
index 9fd8552c..debd08bf 100644
--- a/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/constant/couplingProperties
@@ -35,7 +35,7 @@ couplingInterval 25;
 
 voidFractionModel divided;//centre;//
 
-locateModel engine;//turboEngineM2M;//
+locateModel engine;//turboEngine;//
 
 meshMotionModel noMeshMotion;
 
@@ -237,12 +237,9 @@ engineProps
     treeSearch true;
 }
 
-turboEngineM2MProps
+turboEngineProps
 {
-    turboEngineProps
-    {
-        treeSearch true;
-    }
+    treeSearch true;
 }
 
 dividedProps
diff --git a/tutorials/cfdemSolverRhoPimple/FinesColumn/CFD/constant/couplingProperties b/tutorials/cfdemSolverRhoPimple/FinesColumn/CFD/constant/couplingProperties
index e85f4dcf..60023537 100755
--- a/tutorials/cfdemSolverRhoPimple/FinesColumn/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverRhoPimple/FinesColumn/CFD/constant/couplingProperties
@@ -32,7 +32,7 @@ couplingInterval 10;
 
 voidFractionModel divided;
 
-locateModel engine;//turboEngineM2M;//
+locateModel engine;//turboEngine;//
 
 meshMotionModel noMeshMotion;
 
@@ -195,12 +195,9 @@ engineProps
     treeSearch true;
 }
 
-turboEngineM2MProps
+turboEngineProps
 {
-    turboEngineProps
-    {
-        treeSearch true;
-    }
+    treeSearch true;
 }
 
 dividedProps