STYLE: adjust tutorial Allclean scripts (issue #310)

- A few without a 'cd' at the start. Several remove files that are already covered by the cleanCase function.
2025-11-28 03:28:01 +00:00 · 2016-11-20 17:26:44 +01:00
parent f3cc16e42c
commit 21679c04e4
110 changed files with 253 additions and 282 deletions
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allclean
@ -9,4 +9,4 @@ cleanCase
 rm -f system/blockMeshDict
 rm -f 0/alpha.water

-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
@ -4,7 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-
 # Set application name
 application=$(getApplication)

@ -33,4 +32,4 @@ runParallel $(getApplication)
 # Reconstruct case
 runApplication reconstructPar

-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allclean
@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-rm -rf constant/polyMesh/sets > /dev/null 2>&1
-rm -rf 0/polyMesh > /dev/null 2>&1
-rm system/topoSetDict > /dev/null 2>&1
 cleanCase

+rm -rf 0/polyMesh > /dev/null 2>&1
+rm system/topoSetDict > /dev/null 2>&1
+
 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean
@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-rm -rf constant/polyMesh/sets > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+cleanCase
+rm -rf 0
+
 rm system/topoSetDict > /dev/null 2>&1
 rm -rf processor[0-9] > /dev/null 2>&1
-cleanCase

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
+++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/Allclean
@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-rm -rf constant/polyMesh/sets > /dev/null 2>&1
-rm -rf 0/polyMesh > /dev/null 2>&1
-rm system/topoSetDict > /dev/null 2>&1
 cleanCase

+rm -rf 0/polyMesh > /dev/null 2>&1
+rm system/topoSetDict > /dev/null 2>&1
+
 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0
 rm -rf processor*

--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
+++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allclean
@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory

 # Clean time directories only
-
 rm -rf *[1-9]*
 rm -f log.* 2>/dev/null

--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/Allclean
@ -4,14 +4,13 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-# remove surface
-rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
-
 cleanCase
-rm constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
 rm system/topoSetDict > /dev/null 2>&1

+# Remove surface and features
+rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
+rm -f constant/triSurface/DTC-scaled.eMesh  > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/damBreakWithObstacle/Allclean
@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-rm system/cellSetDict > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+rm system/cellSetDict > /dev/null 2>&1

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/floatingObject/Allclean
@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/Allclean
@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0 > /dev/null 2>&1
+
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1

--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allclean
@ -1,17 +1,17 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory

 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-# remove surface and features
-\rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
-\rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-\rm -f constant/triSurface/motorBike.eMesh > /dev/null 2>&1
-
-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0

-\rm -f constant/polyMesh/boundary
+# Remove surface and features
+\rm -f  constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+\rm -f  constant/triSurface/motorBike.eMesh  > /dev/null 2>&1
+\rm -rf constant/extendedFeatureEdgeMesh     > /dev/null 2>&1

 \cp system/controlDict_run system/controlDict
+
+# -----------------------------------------------------------------------------
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/Allrun
@ -17,4 +17,4 @@ runParallel -s decompose redistributePar -decompose -latestTime
 runParallel -s restart $(getApplication)


-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
@ -4,14 +4,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-# remove surface
-rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
-rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
-
 cleanCase
-rm constant/polyMesh/boundary > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
+
 rm system/topoSetDict > /dev/null 2>&1

+# Remove surfaces and features
+rm -f  constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
+rm -f  constant/triSurface/DTC-scaled.eMesh  > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/waterChannel/Allclean
@ -4,7 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

+cleanCase
+
 rm 0/alpha.water.gz 0/alpha.water 2>/dev/null
 rm -rf *Flux

-cleanCase
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean
@ -1,8 +1,10 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-rm -rf 0 > /dev/null 2>&1
-
 cleanCase
+rm -rf 0
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean
@ -4,11 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-# remove surface
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
-
 cleanCase
-
 rm -rf 0 > /dev/null 2>&1
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
+# Remove surface
+rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
 rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun
@ -11,3 +11,5 @@ runApplication decomposePar
 runParallel $(getApplication)

 runApplication reconstructPar
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre
@ -36,3 +36,5 @@ runApplication createPatch -overwrite
 # - apply the initial fields

 restore0Dir
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean
@ -4,12 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

+cleanCase
+rm -rf 0
+
 # Remove surface
 rm -f constant/triSurface/bullet.stl.gz

-# Remove 0.orig/ copy
-\rm -rf 0
-
-cleanCase
-
 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean
@ -1,10 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0
 rm -rf poolHeight poolHeight_vs_time
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean
@ -1,10 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory

-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0
 rm -rf poolHeight poolHeight_vs_time
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean
@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

 cleanCase
-
 rm -rf 0

 #------------------------------------------------------------------------------