Index: /issm/trunk-jpl/jenkins/linux64_caladan
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan	(revision 19463)
+++ /issm/trunk-jpl/jenkins/linux64_caladan	(revision 19463)
@@ -0,0 +1,95 @@
+
+#-------------------------------#
+# 1: ISSM general configuration #
+#-------------------------------#
+
+#ISSM CONFIGURATION 
+ISSM_CONFIG='--prefix=$ISSM_DIR\
+	--disable-static \
+	--with-matlab-dir=$MATLAB_DIR \
+	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/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=/usr\
+	--with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
+	--with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
+	--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.9/ -lgfortran" \
+	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
+	--with-numthreads=4 \
+	--enable-development \
+	--enable-debugging '
+
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
+
+#PYTHON and MATLAB testing
+MATLAB_TEST=1
+PYTHON_TEST=1
+
+#execution path used for parallel runs
+EXECUTION_PATH=$ISSM_DIR/execution
+
+#repo:
+#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use.
+REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
+SVN='/usr/bin/svn'
+SVNVERSION='/usr/bin/svnversion'
+
+#-----------------------------------#
+# 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 
+						m1qn3         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: 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=4
+
+#number of cpus used in the nightly runs.
+NUMCPUS_RUN=4
+
+#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]"
+PYTHON_NROPTIONS="--exclude 119 514 701 702 435"
+MATLAB_NROPTIONS="'exclude',[119,514,701,702,435]"
Index: sm/trunk-jpl/jenkins/linux64_caladan_python
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_python	(revision 19462)
+++ 	(revision )
@@ -1,91 +1,0 @@
-
-#-------------------------------#
-# 1: ISSM general configuration #
-#-------------------------------#
-
-#ISSM CONFIGURATION 
-ISSM_CONFIG='--prefix=$ISSM_DIR\
-	--disable-static \
-	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/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=/usr\
-	--with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
-	--with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-	--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.9/ -lgfortran" \
-	--with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
-	--with-numthreads=4 \
-	--enable-development \
-	--enable-debugging '
-
-#MATLAB path
-
-#PYTHON and MATLAB testing
-MATLAB_TEST=0
-PYTHON_TEST=1
-
-#execution path used for parallel runs
-EXECUTION_PATH=$ISSM_DIR/execution
-
-#repo:
-#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use.
-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
-SVN='/usr/bin/svn'
-SVNVERSION='/usr/bin/svnversion'
-
-#-----------------------------------#
-# 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                
-						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 
-						m1qn3         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: 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=4
-
-#number of cpus used in the nightly runs.
-NUMCPUS_RUN=4
-
-#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]"
-PYTHON_NROPTIONS="--exclude 119 514 701 702 435"