Index: /issm/trunk-jpl/jenkins/linux64_caladan
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan	(revision 19470)
+++ /issm/trunk-jpl/jenkins/linux64_caladan	(revision 19471)
@@ -85,5 +85,5 @@
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=2
+NUMCPUS_RUN=3
 
 #Nightly run options. The matlab routine runme.m will be called
Index: /issm/trunk-jpl/jenkins/linux64_caladan_ad
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_ad	(revision 19471)
+++ /issm/trunk-jpl/jenkins/linux64_caladan_ad	(revision 19471)
@@ -0,0 +1,80 @@
+#
+#-------------------------------#
+# 1: ISSM general configuration #
+#-------------------------------#
+
+#ISSM CONFIGURATION 
+ISSM_CONFIG='--prefix=$ISSM_DIR\
+				--disable-static \
+				--prefix=$ISSM_DIR \
+				--without-kriging \
+				--without-kml \
+				--without-Gia \
+				--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+				--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+				--with-matlab-dir=$MATLAB_DIR \
+				--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
+#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"
+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
+					 petsc install-3.5-linux64.sh
+					 metis install-5.0.1-linux64.sh
+					 triangle install-linux64.sh 
+					 gsl install-linux64.sh 
+					 adolc 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=3
+
+#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="'benchmark','adolc','id',[3001:3019]"
+PYTHON_NROPTIONS=""
Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 19471)
+++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 19471)
@@ -0,0 +1,90 @@
+#-------------------------------#
+# 1: ISSM general configuration #
+#-------------------------------#
+
+#ISSM CONFIGURATION 
+ISSM_CONFIG='--prefix=$ISSM_DIR\
+				 --disable-static \
+				 --without-kriging \
+				 --without-kml \
+				 --without-Gia \
+				 --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+				 --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+				 --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
+				 --with-matlab-dir=$MATLAB_DIR \
+				 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
+				 --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
+				 --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
+				 --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+				 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
+				 --with-numthreads=4  \
+				 --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+				 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
+				 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
+				 --enable-development \
+				 --enable-debugging CXXFLAGS="-g -O0" '
+#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"
+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
+					 petsc install-3.5-linux64.sh
+					 metis install-5.0.1-linux64.sh
+					 triangle install-linux64.sh 
+					 gsl install-linux64.sh 
+					 adjoinablempi install.sh
+					 adolc install-withampi.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=3
+
+#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="'benchmark','adolc','id',[3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3119]"
+PYTHON_NROPTIONS=""