ENH: finer granularity for CleanFunctions

- separate handling of auxiliary files vs time directories

- restore0Dir: avoid removing 0/ if 0.orig/ does not exist

bin/tools/CleanFunctions

@@ -25,12 +25,18 @@ cleanTimeDirectories()
     zeros=""
     while [ ${#zeros} -lt 8 ]
     do
-        timeDir="0.${zeros}[1-9]*"
+        rm -rf ./"0.$zeros"[1-9]* ./"-0.$zeros"[1-9]*
-        rm -rf ./${timeDir} ./-${timeDir}
         zeros="0$zeros"
     done
+    rm -rf ./[1-9]* ./-[1-9]*
+}
+
+
+# Various files (logs, paraview, etc)
+cleanAuxiliary()
+{
     rm -rf \
-        ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* \
+        ./log ./log.* ./log-* ./logSummary.* \
         ./.fxLock ./*.xml ./ParaView* ./paraFoam* \
         ./*.blockMesh ./*.foam ./*.OpenFOAM \
         ./.setSet
@@ -102,10 +108,11 @@ cleanPostProcessing()
 cleanCase()
 {
     cleanTimeDirectories
-    cleanPostProcessing
     cleanAdiosOutput
+    cleanAuxiliary
     cleanDynamicCode
     cleanOptimisation
+    cleanPostProcessing
 
     rm -rf processor*
     rm -rf TDAC

bin/tools/RunFunctions

@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2015-2020 OpenCFD Ltd.
+#     Copyright (C) 2015-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -455,12 +455,16 @@ cloneParallelCase()
 #
 restore0Dir()
 {
+    if [ ! -d 0.orig ]
+    then
+        echo "No 0.orig/ to restore..." 1>&2
+        return 0
+    fi
+
     case "$1" in
     -processor | -processors)
-        echo "Restore 0/ from 0.orig/ for processor directories"
+        echo "Restore 0/ from 0.orig/  [processor directories]"
-        [ -d 0.orig ] || echo "    Warning: no 0.orig/ found"
 
-        # do nonetheless
         \ls -d processor* | xargs -I {} \rm -rf ./{}/0
         \ls -d processor* | xargs -I {} \cp -r 0.orig ./{}/0 > /dev/null 2>&1
 
@@ -483,13 +487,8 @@ restore0Dir()
 
     *)
         echo "Restore 0/ from 0.orig/"
-        if [ -d 0.orig ]
-        then
         \rm -rf 0
         \cp -r 0.orig 0 2>/dev/null
-        else
-            echo "    Warning: no 0.orig/ found"
-        fi
         ;;
     esac
 }

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean

@@ -4,7 +4,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 cleanTimeDirectories
-
+cleanAuxiliary
 cleanPostProcessing
 
 cleanFaMesh

tutorials/incompressible/boundaryFoam/steadyBoundaryLayer/Allrun

@@ -54,6 +54,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/incompressible/pimpleFoam/LES/planeChannel/Allrun

@@ -52,6 +52,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/Allrun

@@ -53,6 +53,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/incompressible/simpleFoam/bump2D/Allrun

@@ -103,6 +103,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allrun

@@ -123,6 +123,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/verificationAndValidation/StefanProblem/Allrun

@@ -53,6 +53,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/Allrun

@@ -52,6 +52,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun

@@ -54,6 +54,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun

@@ -55,6 +55,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun

@@ -57,6 +57,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else

tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/Allrun

@@ -54,6 +54,7 @@ collect() {
         echo "      # Cleaning up the case"
 
         cleanTimeDirectories
+        cleanAuxiliary
         cleanPostProcessing
 
     else