From 9b3ed8eda6f1f6a6e24fceeebff03f62b895950f Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <thomas.lichtenegger@jku.at>
Date: Wed, 20 Jul 2016 14:53:48 +0200
Subject: [PATCH] CfdemSolverPiso tutorial adapted to OF 4.x.

---
 .../ErgunTestMPI/CFD/constant/RASProperties   | 25 -------------------
 .../CFD/constant/couplingProperties           |  2 +-
 .../CFD/constant/turbulenceProperties         |  2 +-
 .../ErgunTestMPI/CFD/system/controlDict       | 24 ++----------------
 .../ErgunTestMPI/parCFDDEMrun.sh              |  0
 5 files changed, 4 insertions(+), 49 deletions(-)
 delete mode 100644 tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/RASProperties
 mode change 100644 => 100755 tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh

diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/RASProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/RASProperties
deleted file mode 100644
index daec1829..00000000
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     on;
-
-
-// ************************************************************************* //
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
index 2c6aee77..8f405355 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties
@@ -75,7 +75,7 @@ momCoupleModels
     implicitCouple
 );
 
-turbulenceModelType "RASProperties";//"LESProperties";//
+turbulenceModelType "turbulenceProperties";//"LESProperties";//
 
 //===========================================================================//
 // sub-model properties
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/turbulenceProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/turbulenceProperties
index f6753662..9cfc50a3 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/turbulenceProperties
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/turbulenceProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RASModel;
+simulationType  laminar;
 
 
 // ************************************************************************* //
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict
index 596886d1..05af8ef1 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict
@@ -49,10 +49,9 @@ adjustTimeStep  no;
 
 maxCo 0.1;
 
-//libs ( "libgroovyBC.so" "libfiniteVolumeCFDEM.so");
 
 functions
-(
+{
 
     probes
     {
@@ -94,24 +93,5 @@ functions
         outputInterval  1;
     }
 
-   /*pressureDrop
-   {
-     type patchAverage;
-     functionObjectLibs
-     (
-         "libsimpleFunctionObjects.so"
-     );
-     verbose true;
-     patches
-     (
-         inlet
-         outlet
-     );
-     fields
-     (
-         p
-     );
-     factor  1;
-   }*/
-);
+};
 // ************************************************************************* //
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh
old mode 100644
new mode 100755