Index: ../trunk-jpl/jenkins/linux64_larsen
===================================================================
--- ../trunk-jpl/jenkins/linux64_larsen	(revision 18398)
+++ ../trunk-jpl/jenkins/linux64_larsen	(revision 18399)
@@ -1,105 +0,0 @@
-#
-########### Configuration file for Eric Larour's Jenkins run on Murdo ############
-
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#Nightly run name
-NAME="ISSM matlab tests on Linux64 (murdo)"
-
-#ISSM CONFIGURATION 
-ISSM_CONFIG='--prefix=$ISSM_DIR\
-	--with-matlab-dir=$MATLAB_DIR \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
-	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
-	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-	--with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-	--with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \
-	--with-numthreads=18 \
-	--enable-development \
-	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
-
-#PYTHON and MATLAB testing
-MATLAB_TEST=1
-PYTHON_TEST=0
-
-#execution path used for parallel runs
-EXECUTION_PATH=$ISSM_DIR/execution
-
-#repo:
-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
-
-#-----------------------------------#
-# 3: External packages installation #
-#-----------------------------------#
-
-#ISSM_EXTERNALPACKAGES can have 3 values:
-# - "install" install all external packages listed below
-# - "copy"    copy existing directories (EXTERNALPACKAGESDIR)
-# - "none"    leave external packages as is
-#             ->skip to section 4
-ISSM_EXTERNALPACKAGES="install"
-EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages
-
-#List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools install.sh                
-						matlab    install.sh                
-						mpich     install-3.0-linux64.sh    
-						cmake     install.sh                
-						petsc     install-3.5-linux64.sh    
-						triangle  install-linux64.sh        
-						boost     install.sh                
-						dakota    install-5.3.1-linux64.sh  
-						chaco     install.sh 
-						shell2junit install.sh"
-
-#---------------------#
-# 4: ISSM Compilation #
-#---------------------#
-
-#ISSM_COMPILATION can have 2 values:
-# - "yes" compile ISSM
-# - "no"  do not compile ISSM
-ISSM_COMPILATION="yes"
-
-#----------------------#
-# 5: Mail notification #
-#----------------------#
-
-#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
-SKIPMAIL="no"
-
-#Sender email address
-EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
-
-#Mailing list
-MAILINGLIST="eric.larour@jpl.nasa.gov"
-
-#------------------------#
-# 6: Nightly run options #
-#------------------------#
-
-#number of cpus used in ISSM installation and compilation (one is usually
-#safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=8
-
-#number of cpus used in the nightly runs.
-NUMCPUS_RUN=8
-
-#Nightly run options. The matlab routine runme.m will be called
-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
-#by Matlab and runme.m
-#ex: "'id',[101 102 103]"
-MATLAB_NROPTIONS=""
-PYTHON_NROPTIONS=""
Index: ../trunk-jpl/jenkins/linux64_murdo
===================================================================
--- ../trunk-jpl/jenkins/linux64_murdo	(revision 18398)
+++ ../trunk-jpl/jenkins/linux64_murdo	(revision 18399)
@@ -12,18 +12,18 @@
 ISSM_CONFIG='--prefix=$ISSM_DIR\
 	--with-matlab-dir=$MATLAB_DIR \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
 	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-python-dir=$ISSM_DIR/externalpackages/python/install\
 	--with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-	--with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
 	--with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
+	--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
 	--with-numthreads=18 \
 	--enable-development \
 	--enable-debugging '
@@ -54,15 +54,15 @@
 EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools install.sh                
-						matlab    install.sh                
-						mpich     install-3.0-linux64.sh    
-						cmake     install.sh                
-						petsc     install-3.5-linux64.sh    
-						triangle  install-linux64.sh        
-						boost     install.sh                
-						dakota    install-5.3.1-linux64.sh  
-						chaco     install.sh 
+EXTERNALPACKAGES="autotools     install.sh                
+						matlab        install.sh                
+						mpich         install-3.0-linux64.sh    
+						cmake         install.sh                
+						petsc         install-3.5-linux64.sh    
+						triangle      install-linux64.sh        
+						boost         install.sh                
+						dakota        install-5.3.1-linux64.sh  
+						chaco         install.sh 
 						python        install-2.7.3-linux64.sh    
 						nose          install-linux64-python2.sh  
 						blas          install-linux64.sh          
@@ -73,7 +73,7 @@
 						hdf5          install.sh                  
 						netcdf        install.sh                  
 						netcdf-python install.sh
-						shell2junit install.sh"
+						shell2junit   install.sh"
 
 
 #---------------------#
@@ -85,22 +85,8 @@
 # - "no"  do not compile ISSM
 ISSM_COMPILATION="yes"
 
-#----------------------#
-# 5: Mail notification #
-#----------------------#
-
-#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
-SKIPMAIL="no"
-
-#Sender email address
-EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
-
-#Mailing list
-MAILINGLIST="eric.larour@jpl.nasa.gov"
-
 #------------------------#
-# 6: Nightly run options #
+# 5: Nightly run options #
 #------------------------#
 
 #number of cpus used in ISSM installation and compilation (one is usually
Index: ../trunk-jpl/jenkins/linux64_murdo_ad
===================================================================
--- ../trunk-jpl/jenkins/linux64_murdo_ad	(revision 18398)
+++ ../trunk-jpl/jenkins/linux64_murdo_ad	(revision 18399)
@@ -64,22 +64,8 @@
 # - "no"  do not compile ISSM
 ISSM_COMPILATION="yes"
 
-#----------------------#
-# 5: Mail notification #
-#----------------------#
-
-#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
-SKIPMAIL="no"
-
-#Sender email address
-EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
-
-#Mailing list
-MAILINGLIST="eric.larour@jpl.nasa.gov"
-
 #------------------------#
-# 6: Nightly run options #
+# 5: Nightly run options #
 #------------------------#
 
 #number of cpus used in ISSM installation and compilation (one is usually
Index: ../trunk-jpl/jenkins/linux64_murdo_ampi
===================================================================
--- ../trunk-jpl/jenkins/linux64_murdo_ampi	(revision 18398)
+++ ../trunk-jpl/jenkins/linux64_murdo_ampi	(revision 18399)
@@ -77,22 +77,8 @@
 # - "no"  do not compile ISSM
 ISSM_COMPILATION="yes"
 
-#----------------------#
-# 5: Mail notification #
-#----------------------#
-
-#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
-SKIPMAIL="no"
-
-#Sender email address
-EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
-
-#Mailing list
-MAILINGLIST="eric.larour@jpl.nasa.gov"
-
 #------------------------#
-# 6: Nightly run options #
+# 5: Nightly run options #
 #------------------------#
 
 #number of cpus used in ISSM installation and compilation (one is usually
Index: ../trunk-jpl/jenkins/execute_shell
===================================================================
--- ../trunk-jpl/jenkins/execute_shell	(revision 18398)
+++ ../trunk-jpl/jenkins/execute_shell	(revision 18399)
@@ -9,8 +9,6 @@
 		configfile=linux64_murdo ;;
 	imac-012301-gil )
 		configfile=imac-012301-gil ;;
-	larsen )
-		configfile=linux64_larsen ;;
 	windows )
 		configfile=windows
 		export PATH=/cygdrive/c/Cygwin/usr/bin:/cygdrive/c/Cygwin/bin:$PATH ;;
Index: ../trunk-jpl/jenkins/windows
===================================================================
--- ../trunk-jpl/jenkins/windows	(revision 18398)
+++ ../trunk-jpl/jenkins/windows	(revision 18399)
@@ -65,22 +65,8 @@
 # - "no"  do not compile ISSM
 ISSM_COMPILATION="yes"
 
-#----------------------#
-# 5: Mail notification #
-#----------------------#
-
-#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
-SKIPMAIL="no"
-
-#Sender email address
-EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
-
-#Mailing list
-MAILINGLIST="eric.larour@jpl.nasa.gov"
-
 #------------------------#
-# 6: Nightly run options #
+# 5: Nightly run options #
 #------------------------#
 
 #number of cpus used in ISSM installation and compilation (one is usually
