Index: ../trunk-jpl/test/NightlyRun/test124.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test124.m (revision 19931) +++ ../trunk-jpl/test/NightlyRun/test124.m (revision 19932) @@ -20,7 +20,7 @@ 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2',... 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; field_tolerances={... - 1e-09,3.2e-10,3.2e-10,1e-10,1e-13,1e-13,1e-13,... + 1e-09,3.4e-10,3.2e-10,1e-10,1e-13,1e-13,1e-13,... 1e-09,3e-10,3e-10,1e-10,1e-10,1e-10,1e-10,... 1e-09,3e-10,3e-10,1e-10,1e-10,1e-10,1e-10}; field_values={... Index: ../trunk-jpl/test/NightlyRun/test211.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test211.py (revision 19931) +++ ../trunk-jpl/test/NightlyRun/test211.py (revision 19932) @@ -29,7 +29,7 @@ field_tolerances=[\ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\ 5e-07,5e-07,5e-05,1e-07,1e-08,1e-08,1e-08,1e-08,5e-08,2e-06,\ - 5e-06,5e-06,5e-05,5e-06,1e-07,5e-07,5e-07,5e-07,5e-06,5e-05] + 5.4e-06,5e-06,5e-05,5e-06,1e-07,5e-07,5e-07,5e-07,5e-06,5e-05] field_values=[\ md.results.TransientSolution[0].Vx,\ md.results.TransientSolution[0].Vy,\ Index: ../trunk-jpl/test/NightlyRun/test211.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test211.m (revision 19931) +++ ../trunk-jpl/test/NightlyRun/test211.m (revision 19932) @@ -16,7 +16,7 @@ field_tolerances={... 2e-08,2e-08,2e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... 5e-07,5e-07,5e-05,2e-07,1e-08,1e-08,1e-08,1e-08,6e-08,2e-06,... - 5e-06,5e-06,5e-05,5e-06,5e-07,5e-07,5e-07,5e-07,5e-06,5e-05}; + 5.4e-06,5e-06,5e-05,5e-06,5e-07,5e-07,5e-07,5e-07,5e-06,5e-05}; field_values={... (md.results.TransientSolution(1).Vx),... (md.results.TransientSolution(1).Vy),... Index: ../trunk-jpl/externalpackages/petsc/install-3.5-win7.sh =================================================================== --- ../trunk-jpl/externalpackages/petsc/install-3.5-win7.sh (revision 19931) +++ ../trunk-jpl/externalpackages/petsc/install-3.5-win7.sh (revision 19932) @@ -6,7 +6,7 @@ mkdir install src #Download from ISSM server -#$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.5.3.tar.gz' 'petsc-3.5.3.tar.gz' +$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.5.3.tar.gz' 'petsc-3.5.3.tar.gz' #Untar and move petsc to install directory tar -zxvf petsc-3.5.3.tar.gz Index: ../trunk-jpl/jenkins/linux64_ross_test =================================================================== --- ../trunk-jpl/jenkins/linux64_ross_test (revision 0) +++ ../trunk-jpl/jenkins/linux64_ross_test (revision 19932) @@ -0,0 +1,93 @@ +#-------------------------------# +# 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 + petsc install-3.5-linux64.sh + triangle install-linux64.sh + boost install.sh + dakota install-6.2-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=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 119 243 514 701 702 435" +MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,435]"