Index: sm/trunk-jpl/jenkins/execute_shell =================================================================== --- /issm/trunk-jpl/jenkins/execute_shell (revision 20401) +++ (revision ) @@ -1,20 +1,0 @@ -#!/bin/bash - -#some exports required -export ISSM_DIR="$WORKSPACE" - -#which configuration are we using? -case $Platform in - master ) - configfile=linux64_murdo ;; - imac-012301-gil ) - configfile=imac-012301-gil ;; - windows ) - configfile=windows - export PATH=/cygdrive/c/Cygwin/usr/bin:/cygdrive/c/Cygwin/bin:$PATH ;; - -esac - -#run -cd "$WORKSPACE" -source $ISSM_DIR/jenkins/jenkins.sh $ISSM_DIR/jenkins/$configfile Index: sm/trunk-jpl/jenkins/execute_shell_ad =================================================================== --- /issm/trunk-jpl/jenkins/execute_shell_ad (revision 20401) +++ (revision ) @@ -1,16 +1,0 @@ -#!/bin/bash - -#some exports required -export ISSM_DIR="$WORKSPACE" - -#which configuration are we using? -case $AMPI in - ampion ) - configfile=linux64_murdo_ampi ;; - ampioff ) - configfile=linux64_murdo_ad ;; -esac - -#run -cd "$WORKSPACE" -source $ISSM_DIR/jenkins/jenkins.sh $ISSM_DIR/jenkins/$configfile Index: sm/trunk-jpl/jenkins/imac-012301-gil =================================================================== --- /issm/trunk-jpl/jenkins/imac-012301-gil (revision 20401) +++ (revision ) @@ -1,67 +1,0 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path -MATLAB_PATH="/Applications/MATLAB_R2011b.app/" - -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR \ - --with-matlab-dir=$MATLAB_PATH \ - --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 -lpmpich -lmpich -lmpl" \ - --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ - --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ - --with-numthreads=8 \ - --enable-debugging \ - --enable-development' - -#PYTHON and MATLAB testing -MATLAB_TEST=1 -PYTHON_TEST=0 - -#-----------------------------------# -# 3: External packages installation # -#-----------------------------------# - -#List of external pakages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - mpich install-3.0-macosx64.sh - cmake install.sh - m1qn3 install.sh - petsc install-3.5-macosx64.sh - triangle install-macosx64.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=8 - -#number of cpus used in the nightly runs. -NUMCPUS_RUN=1 - -#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]" -## bamg mesh FS -MATLAB_NROPTIONS="'exclude',[218 234 235 412 413 414 417 418 420 514 701 702 703 422 404 421 503 507 510]" -PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_caladan =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_caladan (revision 20402) @@ -33,10 +33,4 @@ PYTHON_TEST=1 -#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 # @@ -54,16 +48,7 @@ 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 # -#------------------------# +#-----------------# +# 4: Test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_caladan_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 20402) @@ -23,10 +23,4 @@ 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 # @@ -43,16 +37,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 20402) @@ -32,10 +32,4 @@ 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 # @@ -53,16 +47,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: sm/trunk-jpl/jenkins/linux64_murdo =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo (revision 20401) +++ (revision ) @@ -1,85 +1,0 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path -MATLAB_PATH="/usr/local/matlab80/" - -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ - --with-matlab-dir=$MATLAB_PATH \ - --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=$ISSM_DIR/externalpackages/python/install\ - --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/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.6/ -lgfortran" \ - --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ - --with-numthreads=18 \ - --enable-development \ - --enable-debugging ' - -#PYTHON and MATLAB testing -MATLAB_TEST=1 -PYTHON_TEST=1 - -#-----------------------------------# -# 3: External packages installation # -#-----------------------------------# - -#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 - python install-2.7.3-linux64.sh - nose install-linux64-python2.sh - blas install-linux64.sh - lapack install-linux64.sh - git install.sh - m1qn3 install.sh - numpy install-linux64.sh - scipy install-linux64.sh - hdf5 install.sh - netcdf install.sh - netcdf-python 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=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="'exclude',[119,514,701,702,435]" -PYTHON_NROPTIONS="--exclude 119 514 701 702 435" Index: sm/trunk-jpl/jenkins/linux64_murdo_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_ad (revision 20401) +++ (revision ) @@ -1,70 +1,0 @@ -# -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path -MATLAB_PATH="/usr/local/matlab80/" - -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ - --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_PATH \ - --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install ' - -#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 # -#-----------------------------------# - -#List of external pakages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake 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=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="'benchmark','adolc','id',[3001:3019]" -PYTHON_NROPTIONS="" Index: sm/trunk-jpl/jenkins/linux64_murdo_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_ampi (revision 20401) +++ (revision ) @@ -1,81 +1,0 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path -MATLAB_PATH="/usr/local/matlab80/" - -#ISSM CONFIGURATION -ISSM_CONFIG='--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-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \ - --with-matlab-dir=$MATLAB_PATH \ - --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=18 \ - --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 \ - -#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 # -#-----------------------------------# - -#List of external pakages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake 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 - mercurial install.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=1 - -#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="'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="" Index: sm/trunk-jpl/jenkins/linux64_murdo_gia =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_gia (revision 20401) +++ (revision ) @@ -1,75 +1,0 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path -MATLAB_PATH="/usr/local/matlab80/" - -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ - --with-matlab-dir=$MATLAB_PATH \ - --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-math77-dir=$ISSM_DIR/externalpackages/math77/install \ - --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \ - --with-gia=yes \ - --with-numthreads=18 \ - --enable-development \ - --enable-debugging ' - -#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 # -#-----------------------------------# - -#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 - math77 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=8 - -#number of cpus used in the nightly runs. -NUMCPUS_RUN=1 - -#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','all','id',[2001:2100]" -PYTHON_NROPTIONS="" Index: sm/trunk-jpl/jenkins/linux64_murdo_iceocean =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_iceocean (revision 20401) +++ (revision ) @@ -1,72 +1,0 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path -MATLAB_PATH="/usr/local/matlab80/" - -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ - --with-matlab-dir=$MATLAB_PATH \ - --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-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \ - --with-numthreads=18 \ - --enable-development \ - --enable-debugging ' - -#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 # -#-----------------------------------# - -#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 - 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=8 - -#number of cpus used in the nightly runs. -NUMCPUS_RUN=1 - -#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','all','id',4001" -PYTHON_NROPTIONS="" Index: sm/trunk-jpl/jenkins/linux64_murdo_python =================================================================== --- /issm/trunk-jpl/jenkins/linux64_murdo_python (revision 20401) +++ (revision ) @@ -1,91 +1,0 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_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=$ISSM_DIR/externalpackages/python/install\ - --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/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.6/ -lgfortran" \ - --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ - --with-numthreads=18 \ - --enable-development \ - --enable-debugging ' - -#MATLAB path -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" - -#-----------------------------------# -# 3: External packages installation # -#-----------------------------------# - -#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 - python install-2.7.3-linux64.sh - nose install-linux64-python2.sh - blas install-linux64.sh - lapack install-linux64.sh - git install.sh - m1qn3 install.sh - numpy install-linux64.sh - scipy install-linux64.sh - hdf5 install.sh - netcdf install.sh - netcdf-python 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=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]" -PYTHON_NROPTIONS="--exclude 119 514 701 702 435" Index: /issm/trunk-jpl/jenkins/linux64_ross =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_ross (revision 20402) @@ -33,11 +33,4 @@ 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" - #-----------------------------------# # 3: External packages installation # @@ -55,17 +48,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_ross_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_ad (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_ross_ad (revision 20402) @@ -25,10 +25,4 @@ PYTHON_TEST=1 -#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 # @@ -45,16 +39,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_ross_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_ampi (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_ross_ampi (revision 20402) @@ -34,10 +34,4 @@ PYTHON_TEST=1 -#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 # @@ -55,16 +49,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_ross_gia =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_gia (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_ross_gia (revision 20402) @@ -29,12 +29,4 @@ 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 # @@ -50,17 +42,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_ross_iceocean =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_iceocean (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_ross_iceocean (revision 20402) @@ -27,10 +27,4 @@ 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 # @@ -45,17 +39,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_ross_se =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_se (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_ross_se (revision 20402) @@ -28,10 +28,4 @@ PYTHON_TEST=1 -#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 # @@ -50,16 +44,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/linux64_ross_test =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_test (revision 20401) +++ /issm/trunk-jpl/jenkins/linux64_ross_test (revision 20402) @@ -33,10 +33,4 @@ #PYTHON_TEST=1 -#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 # @@ -54,17 +48,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/macosx_pine-island =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island (revision 20401) +++ /issm/trunk-jpl/jenkins/macosx_pine-island (revision 20402) @@ -39,16 +39,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/macosx_pine-island_dakota =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20401) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20402) @@ -29,10 +29,4 @@ 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 # @@ -51,16 +45,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/macosx_pine-island_static =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_static (revision 20401) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_static (revision 20402) @@ -30,10 +30,4 @@ 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 # @@ -49,16 +43,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/windows =================================================================== --- /issm/trunk-jpl/jenkins/windows (revision 20401) +++ /issm/trunk-jpl/jenkins/windows (revision 20402) @@ -32,10 +32,4 @@ 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 # @@ -49,16 +43,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/windows-par =================================================================== --- /issm/trunk-jpl/jenkins/windows-par (revision 20401) +++ /issm/trunk-jpl/jenkins/windows-par (revision 20402) @@ -30,10 +30,4 @@ 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 # @@ -47,16 +41,7 @@ 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 # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually Index: /issm/trunk-jpl/jenkins/windows_test =================================================================== --- /issm/trunk-jpl/jenkins/windows_test (revision 20401) +++ /issm/trunk-jpl/jenkins/windows_test (revision 20402) @@ -10,24 +10,11 @@ PYTHON_TEST=0 -#execution path used for parallel runs -EXECUTION_PATH=$ISSM_DIR/execution - - #-----------------------------------# # 3: External packages installation # #-----------------------------------# -#---------------------# -# 4: ISSM Compilation # -#---------------------# - -#ISSM_COMPILATION can have 2 values: -# - "yes" compile ISSM -# - "no" do not compile ISSM -ISSM_COMPILATION="no" - -#------------------------# -# 5: Nightly run options # -#------------------------# +#-----------------# +# 4: test options # +#-----------------# #number of cpus used in ISSM installation and compilation (one is usually