Index: /issm/trunk-jpl/jenkins/linux64_ross =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross (revision 24403) @@ -57,15 +57,20 @@ #-----------------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) +# Number of CPUs used in ISSM compilation +# +# NOTE: 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 +# 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +MATLAB_NROPTIONS="" +PYTHON_NROPTIONS="" MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]" PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_ross_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_ad (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_ad (revision 24403) @@ -32,5 +32,5 @@ ' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=1 PYTHON_TEST=1 @@ -68,5 +68,5 @@ # compilation. # -NUMCPUS_INSTALL=5 +NUMCPUS_INSTALL=8 # Number of CPUs used in the nightly runs Index: /issm/trunk-jpl/jenkins/linux64_ross_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_ampi (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_ampi (revision 24403) @@ -34,5 +34,5 @@ ' -#PYTHON and MATLAB testing +# PYTHON and MATLAB testing MATLAB_TEST=1 PYTHON_TEST=1 @@ -74,5 +74,5 @@ # Number of CPUs used in the nightly runs -NUMCPUS_RUN=8 +NUMCPUS_RUN=4 # Nightly run options Index: /issm/trunk-jpl/jenkins/linux64_ross_codi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_codi (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_codi (revision 24403) @@ -34,5 +34,5 @@ ' -# PYTHON and MATLAB testing +# Test suites MATLAB_TEST=1 PYTHON_TEST=0 @@ -65,18 +65,18 @@ #-----------------# -# List of external packages to be installed and their installation scripts +# Number of CPUs used in ISSM compilation # -# NOTE: The PETSc libraries are compiled but not used: PETSc is really just -# being used as an installer for other external packages. +# NOTE: 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 +# 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# MATLAB_NROPTIONS="'benchmark','all','id',[3015,3119,3480]" PYTHON_NROPTIONS="--benchmark='all' -i 3015 3119 3480" Index: /issm/trunk-jpl/jenkins/linux64_ross_dakota =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_dakota (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_dakota (revision 24403) @@ -32,5 +32,5 @@ ' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=1 PYTHON_TEST=1 @@ -61,10 +61,13 @@ #-----------------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) +# Number of CPUs used in ISSM compilation +# +# NOTE: 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 +# Number of CPUs used in the nightly runs +NUMCPUS_RUN=4 # Nightly run options @@ -75,4 +78,4 @@ # - See test418.py for reason why it is excluded for now. # +MATLAB_NROPTIONS="'exclude',[243,435,701,702],'id',[IdFromString('Dakota')]" PYTHON_NROPTIONS="--exclude 243 418 435 701 702 --include_name 'Dakota'" -MATLAB_NROPTIONS="'exclude',[243,435,701,702],'id',[IdFromString('Dakota')]" Index: /issm/trunk-jpl/jenkins/linux64_ross_dakota_static =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_dakota_static (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_dakota_static (revision 24403) @@ -29,7 +29,9 @@ --with-pic' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=0 PYTHON_TEST=0 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 #-----------------------------------# @@ -53,15 +55,18 @@ #-----------------# -#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 ISSM compilation +# +# NOTE: One is usually safer as some packages are very sensitive to parallel +# compilation. +# +NUMCPUS_INSTALL=8 -#number of cpus used in the nightly runs. +# 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="" -#MATLAB_NROPTIONS="" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +MATLAB_NROPTIONS="" +PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_ross_gia =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_gia (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_gia (revision 24403) @@ -29,5 +29,5 @@ ' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=1 PYTHON_TEST=0 @@ -56,15 +56,18 @@ #-----------------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) +# Number of CPUs used in ISSM compilation +# +# NOTE: 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 +# 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# MATLAB_NROPTIONS="'benchmark','all','id',[2001:2100]" PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_ross_iceocean =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_iceocean (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_iceocean (revision 24403) @@ -56,14 +56,18 @@ #-----------------# -# List of external packages to be installed and their installation scripts +# Number of CPUs used in ISSM compilation +# +# NOTE: 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 +# 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# MATLAB_NROPTIONS="'benchmark','all','id',[4001 4002 4003]" PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_ross_javascript =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_javascript (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_javascript (revision 24403) @@ -44,5 +44,15 @@ # # NOTE: One is usually safer as some packages are very sensitive to parallel -# compilation. +# compilation. # NUMCPUS_INSTALL=8 + +# Number of CPUs used in the nightly runs +NUMCPUS_RUN=4 + +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +MATLAB_NROPTIONS="" +PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_ross_python =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_python (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_python (revision 24403) @@ -59,15 +59,18 @@ #-----------------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) +# Number of CPUs used in ISSM compilation +# +# NOTE: 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 +# 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +MATLAB_NROPTIONS="" PYTHON_NROPTIONS="--exclude_name 'Dakota'" -MATLAB_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_ross_se =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_se (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_se (revision 24403) @@ -82,8 +82,8 @@ 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +MATLAB_NROPTIONS="'benchmark','slr'" PYTHON_NROPTIONS="--benchmark=slr" -MATLAB_NROPTIONS="'benchmark','slr'" Index: /issm/trunk-jpl/jenkins/linux64_ross_static =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_static (revision 24402) +++ /issm/trunk-jpl/jenkins/linux64_ross_static (revision 24403) @@ -27,7 +27,9 @@ --with-pic' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=0 PYTHON_TEST=0 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 #-----------------------------------# @@ -50,16 +52,18 @@ #-----------------# -#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 ISSM compilation +# +# NOTE: One is usually safer as some packages are very sensitive to parallel +# compilation. +# +NUMCPUS_INSTALL=8 -#number of cpus used in the nightly runs. +# 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]" -## FS -#PYTHON_NROPTIONS="" -#MATLAB_NROPTIONS="" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +MATLAB_NROPTIONS="" +PYTHON_NROPTIONS="" Index: sm/trunk-jpl/jenkins/linux64_ross_test =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_test (revision 24402) +++ (revision ) @@ -1,67 +1,0 @@ -# -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path -MATLAB_PATH="/usr/local/MATLAB/R2015a" - -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ - --disable-static \ - --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 -lmpi" \ - --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-scalapack-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 ' - -#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.2-linux64.sh - petsc install-3.7-linux64.sh - triangle install-linux64.sh - boost install-1.55-linux.sh - dakota install-6.2-linux64.sh - chaco install.sh - m1qn3 install.sh - shell2junit install.sh" - -#-----------------# -# 4: test 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=6 - -#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]" -PYTHON_NROPTIONS="--exclude 243 701 702 435" -MATLAB_NROPTIONS="'exclude',[243,701,702,435]"