diff --git a/applications/solvers/lagrangian/DPMFoam/Allwclean b/applications/solvers/lagrangian/DPMFoam/Allwclean
index 158a56c8f3421faa57b45786ed47fd4678709e16..f953f59874023350202867bd0c2c2a9a2bd89be2 100755
--- a/applications/solvers/lagrangian/DPMFoam/Allwclean
+++ b/applications/solvers/lagrangian/DPMFoam/Allwclean
@@ -1,7 +1,8 @@
#!/bin/sh
-
-cd ${0%/*} || exit 1
+cd ${0%/*} || exit 1 # Run from this directory
wclean libso DPMTurbulenceModels
wclean
wclean MPPICFoam
+
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/DPMFoam/Allwmake
index 1f021bfc2fdfa6d7ccf3eff7f87dd5d08b7901d8..2af858f6bb9bc21b7e27284ac72bda06fce8898d 100755
--- a/applications/solvers/lagrangian/DPMFoam/Allwmake
+++ b/applications/solvers/lagrangian/DPMFoam/Allwmake
@@ -8,3 +8,5 @@ wmake $targetType DPMTurbulenceModels
wmake $targetType
wmake $targetType MPPICFoam
+
+#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/MPPICInterFoam/Allwclean b/applications/solvers/multiphase/MPPICInterFoam/Allwclean
index 12d384e35695e6b298099563f1456891cb553bcc..79ee0feb220648f5a92c1a5b20dee1f01db2a5b1 100755
--- a/applications/solvers/multiphase/MPPICInterFoam/Allwclean
+++ b/applications/solvers/multiphase/MPPICInterFoam/Allwclean
@@ -1,5 +1,5 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
wclean libso CompressibleTwoPhaseMixtureTurbulenceModels
wclean
diff --git a/applications/utilities/miscellaneous/foamHelp/Allwclean b/applications/utilities/miscellaneous/foamHelp/Allwclean
index 68cf4d8151832d800aad06124c2daf2869adc6cb..b34d18b24a22fab6b4e0ee4e49b0c095b9745864 100755
--- a/applications/utilities/miscellaneous/foamHelp/Allwclean
+++ b/applications/utilities/miscellaneous/foamHelp/Allwclean
@@ -4,5 +4,4 @@ cd ${0%/*} || exit 1 # Run from this directory
wclean libso helpTypes
wclean
-
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
index 6614154374a3850893706afce944aeb5cb718d1f..54808b94b1b75fa19287ccca871003f4757b9b22 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
@@ -5,7 +5,4 @@ wclean libso foamPv
PVblockMeshReader/Allwclean
PVFoamReader/Allwclean
-# remove dummy directory (see Allwmake)
-rmdir Make 2>/dev/null
-
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
index 13eb3a947067c851d93f12f1ab1765838ddb5a3a..d80b89f34dc66d5f809ff7d478a1a84944807fad 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
@@ -24,10 +24,6 @@ case "$major" in
wmakeLibPv foamPv
PVblockMeshReader/Allwmake $targetType $*
PVFoamReader/Allwmake $targetType $*
-
- # Dummy directory to trigger proper 'wclean all' behaviour
- # - the Allwclean will otherwise not be used
- mkdir -p Make
)
fi
;;
diff --git a/applications/utilities/preProcessing/wallFunctionTable/Allwclean b/applications/utilities/preProcessing/wallFunctionTable/Allwclean
index bf93e1c06b73b1711ff8d87c7c149526bfb6219a..d2a7ff3af90b1a19468d9fd05d0391778edbce18 100755
--- a/applications/utilities/preProcessing/wallFunctionTable/Allwclean
+++ b/applications/utilities/preProcessing/wallFunctionTable/Allwclean
@@ -1,5 +1,7 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
wclean libso tabulatedWallFunction
wclean
+#------------------------------------------------------------------------------
diff --git a/src/Pstream/Allwclean b/src/Pstream/Allwclean
index 2650e4e38a912031c1ddf8c8e6afcdbf584787a5..29ce00baa0c14a9ffeac78f44796bada6b6ee658 100755
--- a/src/Pstream/Allwclean
+++ b/src/Pstream/Allwclean
@@ -1,26 +1,23 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# Define how an mpi-versioned library is created
-# clean the qualified directory
+# Clean an mpi-versioned library
wcleanMpiLib()
{
- for libName
- do
+ case "$WM_MPLIB" in (*MPI*)
(
WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
- wclean $libName
+ for libName
+ do
+ wclean $libName
+ done
)
- done
+ ;;
+ esac
}
-wclean dummy
-
-case "$WM_MPLIB" in
-*MPI*)
- wcleanMpiLib mpi
- ;;
-esac
+wclean dummy
+wcleanMpiLib mpi
#------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/Allwclean b/src/parallel/decompose/Allwclean
index ef6dc412124af2a04bde5e5993d6b27da8c9c24d..88c606b523c26c7b8eefe57107d0c6937ab4568d 100755
--- a/src/parallel/decompose/Allwclean
+++ b/src/parallel/decompose/Allwclean
@@ -1,44 +1,26 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
-then
- . $settings
- echo " using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
-else
- echo
- echo " Error: no config.sh/scotch settings"
- echo
-fi
-
-
-# Define how to clean an mpi-versioned library
+# Clean an mpi-versioned library
wcleanMpiLib()
{
- for libName
- do
+ case "$WM_MPLIB" in (*MPI*)
(
WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
- wclean $libName
+ for libName
+ do
+ wclean $libName
+ done
)
- done
+ ;;
+ esac
}
-if [ -n "$SCOTCH_ARCH_PATH" ]
-then
- wclean scotchDecomp
-
- if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
- then
- wcleanMpiLib ptscotchDecomp
- fi
-else
- echo " skipping scotchDecomp (ptscotchDecomp)"
-fi
+wclean scotchDecomp
wclean metisDecomp
wclean decompositionMethods
wclean decompose
+wcleanMpiLib ptscotchDecomp
#------------------------------------------------------------------------------
diff --git a/src/regionModels/Allwclean b/src/regionModels/Allwclean
index 2996d85d6158179e6e7c4c1f5ef16e0805ff00ad..7ba2cd3e517e239d018590f04af5480a7bf25184 100755
--- a/src/regionModels/Allwclean
+++ b/src/regionModels/Allwclean
@@ -1,11 +1,10 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-makeType=${1:-libso}
-wclean $makeType regionModel
-wclean $makeType pyrolysisModels
-wclean $makeType surfaceFilmModels
-wclean $makeType thermalBaffleModels
-wclean $makeType regionCoupling
+wclean libso regionModel
+wclean libso pyrolysisModels
+wclean libso surfaceFilmModels
+wclean libso thermalBaffleModels
+wclean libso regionCoupling
#------------------------------------------------------------------------------
diff --git a/wmake/wclean b/wmake/wclean
index 0f3e5eb8de9d9d205e6d98066bbf5c8c72eabf59..426dd18a8ccb2fcce67b1b10c01f6bf7fe842dd0 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -128,8 +128,8 @@ then
}
fi
- # Print command
- echo "$Script $targetType${targetType:+ }${dir:-.}"
+ # Print command, trim off leading './' for readability
+ echo "$Script $targetType${targetType:+ }${dir#./}"
fi
@@ -152,19 +152,18 @@ then
echo "Removing empty directories..."
# Get sub-directories avoiding particular directories
- for dir in $(find . -mindepth 1 -maxdepth 1 \
- -name .git -prune -o -type d -print)
+ for d in $(find . -mindepth 1 -maxdepth 1 \
+ -name .git -prune -o -type d -print)
do
- echo " searching: $dir"
- find $dir -depth -empty -type d -delete -print
+ echo " searching: ${d#./}"
+ find $d -depth -empty -type d -delete -print
done
# Second pass: clean up object directories with WM_PROJECT_DIR that don't
# have respective source code folders, along with the respective binaries
-
if [ "$(expandPath $PWD)" = "$WM_PROJECT_DIR" ]
then
- objectsDir=$(findObjectDir $PWD) || exit 1 # Fatal
+ objectsDir=$(findObjectDir $PWD 2>/dev/null) || exit 1 # Fatal
if [ -d "$objectsDir" ]
then