Index: /issm/trunk-jpl/jenkins/execute_shell =================================================================== --- /issm/trunk-jpl/jenkins/execute_shell (revision 18398) +++ /issm/trunk-jpl/jenkins/execute_shell (revision 18399) @@ -10,6 +10,4 @@ imac-012301-gil ) configfile=imac-012301-gil ;; - larsen ) - configfile=linux64_larsen ;; windows ) configfile=windows Index: sm/trunk-jpl/jenkins/linux64_larsen =================================================================== --- /issm/trunk-jpl/jenkins/linux64_larsen (revision 18398) +++ (revision ) @@ -1,105 +1,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: /issm/trunk-jpl/jenkins/linux64_murdo =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo (revision 18398) +++ /issm/trunk-jpl/jenkins/linux64_murdo (revision 18399) @@ -13,16 +13,16 @@ --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 \ @@ -55,13 +55,13 @@ #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 @@ -74,5 +74,5 @@ netcdf install.sh netcdf-python install.sh - shell2junit install.sh" + shell2junit install.sh" @@ -86,20 +86,6 @@ 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 # #------------------------# Index: /issm/trunk-jpl/jenkins/linux64_murdo_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_ad (revision 18398) +++ /issm/trunk-jpl/jenkins/linux64_murdo_ad (revision 18399) @@ -65,20 +65,6 @@ 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 # #------------------------# Index: /issm/trunk-jpl/jenkins/linux64_murdo_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_ampi (revision 18398) +++ /issm/trunk-jpl/jenkins/linux64_murdo_ampi (revision 18399) @@ -78,20 +78,6 @@ 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 # #------------------------# Index: /issm/trunk-jpl/jenkins/windows =================================================================== --- /issm/trunk-jpl/jenkins/windows (revision 18398) +++ /issm/trunk-jpl/jenkins/windows (revision 18399) @@ -66,20 +66,6 @@ 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 # #------------------------#