Changeset 21723

Timestamp:

05/19/17 13:16:49 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics

Location:

issm/trunk-jpl/etc

Files:

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

issm/trunk-jpl/etc/environment.csh

@@ -3 +3 @@
 #Load ISSM scripts
 setenv PATH {$PATH}:{$ISSM_DIR}/scripts
-
-##MATLAB
-#set MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
-#if (-e $MATLAB_DIR) then
-#       setenv MATLAB_DIR {$MATLAB_DIR}
-#       setenv PATH {$MATLAB_DIR}/bin:{$PATH}
-#       setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$MATLAB_DIR}/bin/glnxa64
-#endif
 
 #MPI

issm/trunk-jpl/etc/environment.sh

@@ -67 +67 @@
 pathappend "$ISSM_DIR/scripts"
 
-#MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
-#export MATLAB_DIR
-#pathprepend   "$MATLAB_DIR/bin" #take precedence over /usr/local/bin/matlab
-#libpathappend "$MATLAB_DIR/lib"
-
 #GMT 
 GMT_DIR="$ISSM_DIR/externalpackages/gmt/install"
-export GMT_DIR
-pathprepend   "$GMT_DIR/bin" 
-libpathappend "$GMT_DIR/lib"
+if [ -d "$GMT_DIR" ]; then
+        export GMT_DIR
+        pathprepend   "$GMT_DIR/bin" 
+        libpathappend "$GMT_DIR/lib"
+fi
 
 #legacy mpich2 (To be removed)
@@ -89 +86 @@
 if [ -d "$MPI_DIR" ]; then
         export MPI_DIR
+        export MPI_INC_DIR="$MPI_DIR/include"
         pathprepend   "$MPI_DIR/bin"
         libpathappend "$MPI_DIR/lib"
 fi
-
-export MPI_INC_DIR="$MPI_DIR/include"
 
 PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"