Changeset 14509

Timestamp:

04/04/13 14:57:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: updating environment variables for pleiades (PETSc's libararies are in petsc/install/lib for example)

Location:

issm/trunk-jpl/etc

Files:

• environment.csh (modified) (4 diffs)
• environment.sh (modified) (1 diff)

issm/trunk-jpl/etc/environment.csh

@@ -1 @@
-#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
+#ISSM_DIR should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
 
 #Load ISSM scripts
@@ -25 +25 @@
 if (-d $PETSC_DIR) then
         setenv PETSC_DIR {$PETSC_DIR}
-        setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$PETSC_DIR/lib/{$ISSM_ARCH}
+        setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$PETSC_DIR/lib
 endif
 
@@ -31 +31 @@
 set SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
 if (-d $SLEPC_DIR) then
-        setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SLEPC_DIR/lib/{$ISSM_ARCH}
+        setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SLEPC_DIR/lib
 endif
 
@@ -37 +37 @@
 set TAO_DIR="$ISSM_DIR/externalpackages/tao/install"
 if (-d $TAO_DIR) then
-        setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$TAO_DIR/lib/{$ISSM_ARCH}
+        setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$TAO_DIR/lib
 endif
 

issm/trunk-jpl/etc/environment.sh

@@ -77 +77 @@
 
 SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
-libpathappend "$SLEPC_DIR/lib/$ISSM_ARCH"
+libpathappend "$SLEPC_DIR/lib"
 
 TAO_DIR="$ISSM_DIR/externalpackages/tao/install"