Added error message support

git-svn-id: http://svn.cactuscode.org/arrangements/CactusExternal/PETSc/trunk@5 fc86f234-e40e-4302-a95b-5e02f8c343c9

1 files changed, 24 insertions, 18 deletions

diff --git a/petsc.sh b/petsc.sh
index c898fb4..196263b 100755
--- a/petsc.sh
+++ b/petsc.sh
@@ -45,29 +45,35 @@ CCTK_Search()
 }
 
 
-choose_petsc=`echo $PETSC | tr '[:upper:]' '[:lower:]'`
+echo 'Configuring with PETSc'
+
+# Check that MPI is there
+if [ -z "$MPI" -o "$MPI" = 'none' ]; then
+  echo "BEGIN ERROR"
+  echo 'PETSc requires MPI - please configure with MPI'
+  echo "END ERROR"
+  exit 2
+fi
 
 # Work out PETSc's installation directory
 if [ -z "$PETSC_DIR" ]; then
+  echo "BEGIN MESSAGE"
+  echo 'PETSc selected but no PETSC_DIR set. Checking some places...'
+  echo "END MESSAGE"
   CCTK_Search PETSC_DIR '/usr /usr/local /usr/local/petsc /usr/local/packages/petsc /usr/local/apps/petsc' include/petsc.h
   if [ -z "$PETSC_DIR" ] ; then
-     echo "BEGIN MESSAGE" 
-     echo "Unable to locate the PETSC directory, please set PETSC_DIR."
-     echo "END MESSAGE" 
+     echo "BEGIN ERROR"
+     echo 'Unable to locate the PETSc directory - please set PETSC_DIR'
+     echo "END ERROR"
      exit 2
   fi
-fi
-
-
-# Check what architecture is available
-if [ -z "$PETSC_ARCH" ]; then
-  if [ ! -d "$PETSC_DIR/lib/libg" ]; then
-    echo "BEGIN MESSAGE" 
-    echo "Unable to determine arch, please set PETSC_ARCH."
-    echo "END MESSAGE" 
-    exit 2
-  fi
-  PETSC_ARCH=`/bin/ls -1 $PETSC_DIR/lib/libg | head -n1`
+  echo "BEGIN MESSAGE"
+  echo "Found a PETSc package in $PETSC_DIR"
+  echo "END MESSAGE"
+else
+  echo "BEGIN MESSAGE"
+  echo "Using PETSc package in $PETSC_DIR"
+  echo "END MESSAGE"
 fi
 
 # Set platform-specific libraries
@@ -80,10 +86,10 @@ if [ -z "$PETSC_ARCH_LIBS" ]; then
     linux-gnu) PETSC_ARCH_LIBS='mkl_lapack mkl_def guide' ;;
     linux64_intel) PETSC_ARCH_LIBS='mkl_lapack mkl guide' ;;
     rs6000_64) PETSC_ARCH_LIBS='essl' ;;
-    *)           echo "BEGIN MESSAGE" 
+    *)           echo "BEGIN ERROR" 
                  echo "No PETSc support for architecture '$PETSC_ARCH' !"
                  echo 'Please file a bug report to cactusmaint@cactuscode.org.'
-                 echo "END MESSAGE" 
+                 echo "END ERROR" 
                  exit 2
   esac
 fi