From ca724b2e1a0ae8cfa78ab759b603ebe352a5813b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 4 Jun 2019 15:11:05 +0200
Subject: [PATCH] TUT: cleanup postProcessing in planeTransport finiteArea
 tutorial

---
 bin/tools/CleanFunctions                       | 18 ++++++++++++------
 .../sphereTransport/Allclean                   |  2 ++
 .../surfactantFoam/planeTransport/Allclean     |  4 ++++
 .../planeTransport/system/areaWrite            |  1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 06b6c3921a3..d05354592b4 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -39,7 +39,7 @@ cleanTimeDirectories()
 
 cleanDynamicCode()
 {
-    if [ -d system -a -d dynamicCode ]
+    if [ -d dynamicCode ] && [ -d system ]
     then
         rm -rf dynamicCode > /dev/null 2>&1
     fi
@@ -73,22 +73,28 @@ cleanSnappyFiles()
 }
 
 
+cleanPostProcessing()
+{
+    rm -rf Ensight EnSight ensightWrite insitu VTK > /dev/null 2>&1
+    rm -rf postProcessing > /dev/null 2>&1
+    rm -rf cuttingPlane > /dev/null 2>&1
+    rm -rf surfaceSampling > /dev/null 2>&1
+}
+
+
 cleanCase()
 {
     cleanTimeDirectories
+    cleanPostProcessing
     cleanDynamicCode
 
     rm -rf processor* > /dev/null 2>&1
-    rm -rf postProcessing > /dev/null 2>&1
     rm -rf TDAC > /dev/null 2>&1
     rm -rf probes* > /dev/null 2>&1
     rm -rf forces* > /dev/null 2>&1
     rm -rf graphs* > /dev/null 2>&1
     rm -rf sets > /dev/null 2>&1
-    rm -rf surfaceSampling > /dev/null 2>&1
-    rm -rf cuttingPlane > /dev/null 2>&1
     rm -rf system/machines > /dev/null 2>&1
-    rm -rf Ensight EnSight ensightWrite insitu VTK > /dev/null 2>&1
 
     # From mpirunDebug
     rm -f gdbCommands  mpirun.schema
@@ -149,7 +155,7 @@ removeCase()
 
 cleanSamples()
 {
-    rm -rf ./sets ./samples ./sampleSurfaces > /dev/null 2>&1
+    rm -rf sets samples sampleSurfaces > /dev/null 2>&1
 }
 
 
diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean
index 9752129998f..b1673ba4c14 100755
--- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean
+++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean
@@ -4,6 +4,8 @@ cd ${0%/*} || exit 1                        # Run from this directory
 
 cleanTimeDirectories
 
+cleanPostProcessing
+
 cleanFaMesh
 
 rm -rf processor*
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean b/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean
index e9770805391..b1673ba4c14 100755
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/Allclean
@@ -4,6 +4,10 @@ cd ${0%/*} || exit 1                        # Run from this directory
 
 cleanTimeDirectories
 
+cleanPostProcessing
+
 cleanFaMesh
 
+rm -rf processor*
+
 #------------------------------------------------------------------------------
diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/system/areaWrite b/tutorials/finiteArea/surfactantFoam/planeTransport/system/areaWrite
index 0b7aec7ca74..efcffa063a9 100644
--- a/tutorials/finiteArea/surfactantFoam/planeTransport/system/areaWrite
+++ b/tutorials/finiteArea/surfactantFoam/planeTransport/system/areaWrite
@@ -9,6 +9,7 @@ areaWrite
 
     writeControl    writeTime;
     writeInterval   1;
+    // verbose         true;
 
     // Fields to output (words or regex)
     fields  (".*");
-- 
GitLab