diff options
-rwxr-xr-x | PETSc.sh (renamed from petsc.sh) | 27 | ||||
-rw-r--r-- | configuration.ccl | 14 |
2 files changed, 21 insertions, 20 deletions
@@ -1,6 +1,6 @@ #! /bin/sh #/*@@ -# @file setup.sh +# @file petsc.sh # @date Fri 29 Aug 2003 # @author Thomas Radke # @desc @@ -16,7 +16,7 @@ # Used to search for something in various directories # @enddesc #@@*/ - + CCTK_Search() { eval $1="" @@ -40,7 +40,7 @@ CCTK_Search() fi # echo "$ac_t"" No" #1>&6 done - + return } @@ -64,7 +64,7 @@ if [ -z "$PETSC_DIR" ]; then echo "BEGIN ERROR" echo 'Thorn PETSc requires an external installation of the PETSc ' \ 'library. Please set PETSC_DIR to the directory of this ' \ - 'installation or remove PETSc from your configuration ThornList.' + 'installation, or remove PETSc from your configuration ThornList.' echo "END ERROR" exit 2 fi @@ -87,26 +87,29 @@ 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 ERROR" + *) echo 'BEGIN ERROR' echo "No PETSc support for architecture '$PETSC_ARCH'." echo 'Please set the variable PETSC_ARCH_LIBS manually,' echo 'and/or send a request to <cactusmaint@cactuscode.org>.' - echo "END ERROR" + echo 'END ERROR' exit 2 esac fi # Set the PETSc libs, libdirs and includedirs -PETSC_LIB_DIRS='$(PETSC_DIR)/lib/libO/$(PETSC_ARCH)' PETSC_INC_DIRS='$(PETSC_DIR)/include $(PETSC_DIR)/bmake/$(PETSC_ARCH)' +PETSC_LIB_DIRS='$(PETSC_DIR)/lib/libO/$(PETSC_ARCH)' PETSC_LIBS="petscts petscsnes petscsles petscdm petscmat petscvec petsc $PETSC_ARCH_LIBS" -echo "BEGIN MAKE_DEFINITION" +echo 'BEGIN MAKE_DEFINITION' echo "PETSC_DIR = $PETSC_DIR" echo "PETSC_ARCH = $PETSC_ARCH" -echo "END MAKE_DEFINITION" - +echo "PETSC_INC_DIRS = $PETSC_INC_DIRS" +echo "PETSC_LIB_DIRS = $PETSC_LIB_DIRS" +echo "PETSC_LIBS = $PETSC_LIBS" +echo 'END MAKE_DEFINITION' -echo 'LIBRARY $(PETSC_LIBS) X11 $(MPI_LIBS)' -echo 'LIBRARY_DIRECTORY $(PETSC_LIB_DIRS) $(X_LIB_DIR)' +# Write the data out to the headers and makefiles echo 'INCLUDE_DIRECTORY $(PETSC_INC_DIRS)' +echo 'LIBRARY_DIRECTORY $(PETSC_LIB_DIRS) $(X_LIB_DIR)' +echo 'LIBRARY $(PETSC_LIBS) X11 $(MPI_LIBS)' diff --git a/configuration.ccl b/configuration.ccl index 6b19078..7a4c303 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -1,7 +1,12 @@ # Configuration definitions for thorn PETSc # $Header$ -# NO_SOURCE +PROVIDES PETSc +{ + SCRIPT PETSc.sh + LANG sh + OPTIONS PETSC_DIR PETSC_ARCH PETSC_ARCH_LIBS +} REQUIRES LAPACK @@ -9,10 +14,3 @@ REQUIRES LAPACK # PETSc also depends on MPI and X # (unless PETSc has been configured in a special way, # which is probably typically not the case) - -PROVIDES PETSC -{ - SCRIPT petsc.sh - LANG sh - OPTIONS PETSC_DIR PETSC_ARCH PETSC_ARCH_LIBS -} |