From 40401ccbd081b8f50c7e652a2aec370ad88dcbe1 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 24 Jun 2019 13:51:15 +0100
Subject: [PATCH] TUT: tutorial script updates

---
 tutorials/incompressible/adjointOptimisationFoam/Allrun      | 2 +-
 tutorials/verificationAndValidation/turbulentInflow/Allclean | 2 +-
 tutorials/verificationAndValidation/turbulentInflow/Allrun   | 2 +-
 .../turbulentInflow/{Allrunparallel => Allrun-parallel}      | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename tutorials/verificationAndValidation/turbulentInflow/{Allrunparallel => Allrun-parallel} (94%)

diff --git a/tutorials/incompressible/adjointOptimisationFoam/Allrun b/tutorials/incompressible/adjointOptimisationFoam/Allrun
index 1bbb9f1fd8..0912ec72bb 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                        # Run from this directory
 
 if notTest $@
 then
-    foamRunTutorials
+    foamRunTutorials -skipFirst
 else
     echo "--- Skipping testing of tutorials in : $PWD" 1>&2
 fi
diff --git a/tutorials/verificationAndValidation/turbulentInflow/Allclean b/tutorials/verificationAndValidation/turbulentInflow/Allclean
index 213d289a42..de07eb05c4 100755
--- a/tutorials/verificationAndValidation/turbulentInflow/Allclean
+++ b/tutorials/verificationAndValidation/turbulentInflow/Allclean
@@ -5,4 +5,4 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
 cleanCase0
-\rm -r results
+\rm -rf results
diff --git a/tutorials/verificationAndValidation/turbulentInflow/Allrun b/tutorials/verificationAndValidation/turbulentInflow/Allrun
index e2679d94ec..1ba4a4e189 100755
--- a/tutorials/verificationAndValidation/turbulentInflow/Allrun
+++ b/tutorials/verificationAndValidation/turbulentInflow/Allrun
@@ -21,7 +21,7 @@ runApplication blockMesh
 for val in ${Models[@]}; do
   echo "Running the case with the model: $val"
   \cp 0/U.$val 0/U
-  \rm -r constant/boundaryData/inlet
+  \rm -rf constant/boundaryData/inlet
   \cp -r constant/boundaryData/inlet.$val constant/boundaryData/inlet
   runApplication pimpleFoam
   gnuplot plot.patch
diff --git a/tutorials/verificationAndValidation/turbulentInflow/Allrunparallel b/tutorials/verificationAndValidation/turbulentInflow/Allrun-parallel
similarity index 94%
rename from tutorials/verificationAndValidation/turbulentInflow/Allrunparallel
rename to tutorials/verificationAndValidation/turbulentInflow/Allrun-parallel
index 78f16766c6..c759ba8950 100755
--- a/tutorials/verificationAndValidation/turbulentInflow/Allrunparallel
+++ b/tutorials/verificationAndValidation/turbulentInflow/Allrun-parallel
@@ -20,9 +20,9 @@ runApplication blockMesh
 # Compute parallel and collect data
 for val in ${Models[@]}; do
   echo "Running the case with the model: $val"
-  \rm 0/U*
+  \rm -f 0/U*
   \cp 0.orig/U.$val 0/U
-  \rm -r constant/boundaryData/inlet
+  \rm -rf constant/boundaryData/inlet
   \cp -r constant/boundaryData/inlet.$val constant/boundaryData/inlet
   runApplication decomposePar
   runParallel pimpleFoam
@@ -34,4 +34,3 @@ for val in ${Models[@]}; do
   cleanTimeDirectories
   \rm -rf processor* > /dev/null 2>&1
 done
-