src/parallel/decompose: Corrected handling of sentinel files

OpenFOAM · May 24, 2024 · 8b11d6a · 8b11d6a
1 parent 81dd264
commit 8b11d6a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 38 deletions.
diff --git a/src/parallel/decompose/metis/Allwmake b/src/parallel/decompose/metis/Allwmake
@@ -9,7 +9,7 @@ if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis`
 then
     . $settings
     echo "    using METIS_ARCH_PATH=$METIS_ARCH_PATH"
-    if [ -r $METIS_ARCH_PATH/lib/libmetis.so ]
+    if [ -r "$METIS_ARCH_PATH/lib/libmetis.so" ]
     then
         wmake $targetType
     fi

diff --git a/src/parallel/decompose/parMetis/Allwclean b/src/parallel/decompose/parMetis/Allwclean
@@ -3,16 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeMpiLib
 
-# Get PARMETIS_VERSION, PARMETIS_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/parMetis`
-then
-    . $settings
-    echo "    using PARMETIS_ARCH_PATH=$PARMETIS_ARCH_PATH"
-    wcleanMpiLib $PARMETIS_VERSION parMetisDecomp
-else
-    echo
-    echo "    Error: no config.sh/parMetis settings"
-    echo
-fi
+wcleanMpiLib
 
 #------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/parMetis/Allwmake b/src/parallel/decompose/parMetis/Allwmake
@@ -11,9 +11,11 @@ if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/parMetis`
 then
     . $settings
     echo "    using PARMETIS_ARCH_PATH=$PARMETIS_ARCH_PATH"
-    if [ -r $PARMETIS_ARCH_PATH/lib/libparmetis.so ]
+    if [ -r "$PARMETIS_ARCH_PATH/lib/libparmetis.so" ]
     then
-        wmakeMpiLib $PARMETIS_VERSION
+        wmakeMpiLib $PARMETIS_VERSION parMetis
+    else
+        echo "    skipping parMetis"
     fi
 else
     echo

diff --git a/src/parallel/decompose/ptscotch/Allwclean b/src/parallel/decompose/ptscotch/Allwclean
@@ -3,16 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeMpiLib
 
-# 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"
-    wcleanMpiLib $SCOTCH_VERSION
-else
-    echo
-    echo "    Error: no config.sh/scotch settings"
-    echo
-fi
+wcleanMpiLib
 
 #------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/ptscotch/Allwmake b/src/parallel/decompose/ptscotch/Allwmake
@@ -15,7 +15,9 @@ then
     && [ -n "$WM_MPLIB" ] \
     && [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
     then
-        wmakeMpiLib $SCOTCH_VERSION
+        wmakeMpiLib $SCOTCH_VERSION ptscotch
+    else
+        echo "    skipping ptscotch"
     fi
 else
     echo

diff --git a/src/parallel/decompose/zoltan/Allwclean b/src/parallel/decompose/zoltan/Allwclean
@@ -3,6 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeMpiLib
 
-wcleanMpiLib 3.90
+wcleanMpiLib
 
 #------------------------------------------------------------------------------
diff --git a/src/parallel/decompose/zoltan/Allwmake b/src/parallel/decompose/zoltan/Allwmake
@@ -6,19 +6,19 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeMpiLib
 
+# Get ZOLTAN_VERSION, ZOLTAN_ARCH_PATH
 if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan`
 then
     . $settings
     echo "    using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH"
-
     if [ -n "$ZOLTAN_ARCH_PATH" ] \
     && [ -r "$ZOLTAN_ARCH_PATH/include/zoltan.h" ] \
     && { \
          [ -r "$FOAM_EXT_LIBBIN/$FOAM_MPI/libzoltan.a" ] \
       || [ -r "$ZOLTAN_ARCH_PATH/lib/libzoltan.a" ]; \
        }
     then
-        wmakeMpiLib $ZOLTAN_VERSION
+        wmakeMpiLib $ZOLTAN_VERSION zoltan
     else
         echo "    skipping zoltan"
     fi

diff --git a/wmake/scripts/AllwmakeMpiLib b/wmake/scripts/AllwmakeMpiLib
@@ -44,9 +44,9 @@ wmakeMpiLib()
         WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
         whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$FOAM_MPI"
         whichtarget="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$version"
-        [ -e "$whichmpi" -a -e "$whichtarget" ] || wclean -noLnInclude $libName
-        echo "wmake $targetType $libName"
-        wmake $targetType $libName
+        [ -e "$whichmpi" -a -e "$whichtarget" ] || wclean -noLnInclude
+        echo "wmake $targetType"
+        wmake $targetType
         touch "$whichmpi" "$whichtarget"
     )
 }
@@ -56,13 +56,8 @@ wmakeMpiLib()
 wcleanMpiLib()
 {
     (
-        version="$1"
-        libName="$2"
-
         WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
-        whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$FOAM_MPI"
-        whichtarget="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$version"
-        wclean $libName
+        wclean
     )
 }