Index: /issm/trunk-jpl/externalpackages/mpich/install-3.2-mac-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich/install-3.2-mac-static.sh (revision 24394) +++ /issm/trunk-jpl/externalpackages/mpich/install-3.2-mac-static.sh (revision 24394) @@ -0,0 +1,37 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf src install mpich-3.2 +mkdir src install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/mpich-3.2.tar.gz' 'mpich-3.2.tar.gz' + +#Untar +tar -zxvf mpich-3.2.tar.gz + +#Move mpich into src directory +mv mpich-3.2/* src +rm -rf mpich-3.2 + +#patch from http://lists.mpich.org/pipermail/discuss/2016-May/004764.html +cat src/src/include/mpiimpl.h | sed -e 's/} MPID_Request ATTRIBUTE((__aligned__(32)));/} ATTRIBUTE((__aligned__(32))) MPID_Request;/g' > TEMP +mv TEMP src/src/include/mpiimpl.h + +#Configure mpich +cd src +./configure \ + --prefix="$ISSM_DIR/externalpackages/mpich/install" \ + --disable-shared \ + --enable-strict=all \ + --enable-fast \ + --with-pic + +#Compile mpich (this new version supports parallel make) +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install Index: /issm/trunk-jpl/externalpackages/mpich/install-3.2-mac.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich/install-3.2-mac.sh (revision 24394) +++ /issm/trunk-jpl/externalpackages/mpich/install-3.2-mac.sh (revision 24394) @@ -0,0 +1,34 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf src install mpich-3.2 +mkdir src install + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/mpich-3.2.tar.gz' 'mpich-3.2.tar.gz' + +#Untar +tar -zxvf mpich-3.2.tar.gz + +#Move mpich into src directory +mv mpich-3.2/* src +rm -rf mpich-3.2 + +#patch from http://lists.mpich.org/pipermail/discuss/2016-May/004764.html +cat src/src/include/mpiimpl.h | sed -e 's/} MPID_Request ATTRIBUTE((__aligned__(32)));/} ATTRIBUTE((__aligned__(32))) MPID_Request;/g' > TEMP +mv TEMP src/src/include/mpiimpl.h + +#Configure mpich +cd src +./configure \ + --prefix="$ISSM_DIR/externalpackages/mpich/install" \ + --enable-shared + +#Compile mpich (this new version supports parallel make) +if [ $# -eq 0 ]; then + make +else + make -j $1 +fi +make install Index: sm/trunk-jpl/externalpackages/mpich/install-3.2-macosx64-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich/install-3.2-macosx64-static.sh (revision 24393) +++ (revision ) @@ -1,37 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf src install mpich-3.2 -mkdir src install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/mpich-3.2.tar.gz' 'mpich-3.2.tar.gz' - -#Untar -tar -zxvf mpich-3.2.tar.gz - -#Move mpich into src directory -mv mpich-3.2/* src -rm -rf mpich-3.2 - -#patch from http://lists.mpich.org/pipermail/discuss/2016-May/004764.html -cat src/src/include/mpiimpl.h | sed -e 's/} MPID_Request ATTRIBUTE((__aligned__(32)));/} ATTRIBUTE((__aligned__(32))) MPID_Request;/g' > TEMP -mv TEMP src/src/include/mpiimpl.h - -#Configure mpich -cd src -./configure \ - --prefix="$ISSM_DIR/externalpackages/mpich/install" \ - --disable-shared \ - --enable-strict=all \ - --enable-fast \ - --with-pic - -#Compile mpich (this new version supports parallel make) -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install Index: sm/trunk-jpl/externalpackages/mpich/install-3.2-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich/install-3.2-macosx64.sh (revision 24393) +++ (revision ) @@ -1,34 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf src install mpich-3.2 -mkdir src install - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/mpich-3.2.tar.gz' 'mpich-3.2.tar.gz' - -#Untar -tar -zxvf mpich-3.2.tar.gz - -#Move mpich into src directory -mv mpich-3.2/* src -rm -rf mpich-3.2 - -#patch from http://lists.mpich.org/pipermail/discuss/2016-May/004764.html -cat src/src/include/mpiimpl.h | sed -e 's/} MPID_Request ATTRIBUTE((__aligned__(32)));/} ATTRIBUTE((__aligned__(32))) MPID_Request;/g' > TEMP -mv TEMP src/src/include/mpiimpl.h - -#Configure mpich -cd src -./configure \ - --prefix="$ISSM_DIR/externalpackages/mpich/install" \ - --enable-shared - -#Compile mpich (this new version supports parallel make) -if [ $# -eq 0 ]; then - make -else - make -j $1 -fi -make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-mac-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.7-mac-static.sh (revision 24394) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-mac-static.sh (revision 24394) @@ -0,0 +1,40 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install petsc-3.7.6 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.6.tar.gz' 'petsc-3.7.6.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.7.6.tar.gz +mv petsc-3.7.6/* src/ +rm -rf petsc-3.7.6 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --with-single-library=1 \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-shared-libraries=0 \ + --with-debugging=0 \ + --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ + --download-fblaslapack=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --with-x=0 \ + --download-scalapack=1 \ + --download-mumps=1 \ + --with-ssl=0 \ + --with-valgrind=0 \ + --with-pic=1 \ + --COPTFLAGS="-fPIC" \ + --CXXOPTFLAGS="-fPIC" \ + --FOPTFLAGS="-fPIC" + +#Compile and intall +make +make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.7-mac.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.7-mac.sh (revision 24394) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.7-mac.sh (revision 24394) @@ -0,0 +1,34 @@ +#!/bin/bash +set -eu + +#Some cleanup +rm -rf install petsc-3.7.6 src +mkdir install src + +#Download from ISSM server +$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/petsc-lite-3.7.6.tar.gz' 'petsc-3.7.6.tar.gz' + +#Untar and move petsc to install directory +tar -zxvf petsc-3.7.6.tar.gz +mv petsc-3.7.6/* src/ +rm -rf petsc-3.7.6 + +#configure +cd src +./config/configure.py \ + --prefix="$ISSM_DIR/externalpackages/petsc/install" \ + --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ + --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ + --with-debugging=1 \ + --with-valgrind=0 \ + --with-x=0 \ + --with-ssl=0 \ + --with-shared-libraries=1 \ + --download-metis=1 \ + --download-parmetis=1 \ + --download-mumps=1 \ + --download-scalapack=1 + +#Compile and intall +make +make install Index: sm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64-static.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64-static.sh (revision 24393) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf install petsc-3.7.6 src -mkdir install src - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.7.6.tar.gz' 'petsc-3.7.6.tar.gz' - -#Untar and move petsc to install directory -tar -zxvf petsc-3.7.6.tar.gz -mv petsc-3.7.6/* src/ -rm -rf petsc-3.7.6 - -#configure -cd src -./config/configure.py \ - --prefix="$ISSM_DIR/externalpackages/petsc/install" \ - --with-single-library=1 \ - --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ - --with-shared-libraries=0 \ - --with-debugging=0 \ - --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ - --download-fblaslapack=1 \ - --download-metis=1 \ - --download-parmetis=1 \ - --with-x=0 \ - --download-scalapack=1 \ - --download-mumps=1 \ - --with-ssl=0 \ - --with-valgrind=0 \ - --with-pic=1 \ - --COPTFLAGS="-fPIC" \ - --CXXOPTFLAGS="-fPIC" \ - --FOPTFLAGS="-fPIC" - -#Compile and intall -make -make install Index: sm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.7-macosx64.sh (revision 24393) +++ (revision ) @@ -1,34 +1,0 @@ -#!/bin/bash -set -eu - -#Some cleanup -rm -rf install petsc-3.7.6 src -mkdir install src - -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/petsc-lite-3.7.6.tar.gz' 'petsc-3.7.6.tar.gz' - -#Untar and move petsc to install directory -tar -zxvf petsc-3.7.6.tar.gz -mv petsc-3.7.6/* src/ -rm -rf petsc-3.7.6 - -#configure -cd src -./config/configure.py \ - --prefix="$ISSM_DIR/externalpackages/petsc/install" \ - --with-mpi-dir="$ISSM_DIR/externalpackages/mpich/install" \ - --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ - --with-debugging=1 \ - --with-valgrind=0 \ - --with-x=0 \ - --with-ssl=0 \ - --with-shared-libraries=1 \ - --download-metis=1 \ - --download-parmetis=1 \ - --download-mumps=1 \ - --download-scalapack=1 - -#Compile and intall -make -make install Index: /issm/trunk-jpl/jenkins/macosx_pine-island =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island (revision 24393) +++ /issm/trunk-jpl/jenkins/macosx_pine-island (revision 24394) @@ -11,5 +11,5 @@ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \ - --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ @@ -39,7 +39,6 @@ autotools install.sh cmake install.sh - mpich install-3.3.sh - lapack install-3.8-mac.sh - petsc install-3.11-macOS.sh + mpich install-3.3-mac.sh + petsc install-3.11-mac.sh triangle install-macosx64.sh chaco install.sh @@ -56,5 +55,5 @@ # # NOTE: One is usually safer as some packages are very sensitive to parallel -# compilation. +# compilation # NUMCPUS_INSTALL=8 @@ -65,5 +64,5 @@ # Nightly run options # -# See documentation in test/NightlyRun/runme.* for more information. +# See documentation in test/NightlyRun/runme.* for more information # # NOTE: Index: /issm/trunk-jpl/jenkins/macosx_pine-island_dakota =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 24393) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_dakota (revision 24394) @@ -1,26 +1,26 @@ - #-------------------------------# # 1: ISSM general configuration # #-------------------------------# -#MATLAB path +# MATLAB path MATLAB_PATH="/Applications/MATLAB_R2015b.app" -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR \ +# ISSM CONFIGURATION +ISSM_CONFIG='\ + --prefix=$ISSM_DIR \ --with-matlab-dir=$MATLAB_PATH \ --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \ --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \ + --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ --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-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ - --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \ --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ - --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \ - --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \ - --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ + --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \ --with-cxxoptflags="-std=c++11" \ --with-numthreads=4 \ @@ -28,7 +28,9 @@ --enable-development' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=1 PYTHON_TEST=1 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 #-----------------------------------# @@ -37,14 +39,17 @@ #List of external pakages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake install.sh - mpich install-3.2-macosx64.sh - chaco install-macosx64.sh - m1qn3 install.sh - petsc install-3.7-macosx64.sh - triangle install-macosx64.sh - boost install-1.55-macosx-el_capitan.sh - dakota install-6.2-macosx64.sh - shell2junit install.sh" +EXTERNALPACKAGES=" + autotools install.sh + cmake install.sh + mpich install-3.3-mac.sh + petsc install-3.11-mac.sh + triangle install-macosx64.sh + chaco install.sh + m1qn3 install.sh + semic install.sh + boost install-1.55-macosx-el_capitan.sh + dakota install-6.2-macosx64.sh + shell2junit install.sh +" #-----------------# @@ -52,15 +57,21 @@ #-----------------# -#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=4 -#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]" ERRORS ARE LARGE FOR: 418 420 +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information +# +# NOTE: +# - Errors are large for 418, 420 +# PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 234 235 418 420 --include_name 'Dakota'" MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,234,235,418,420],'id',[IdFromString('Dakota')]" Index: /issm/trunk-jpl/jenkins/macosx_pine-island_examples =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_examples (revision 24393) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_examples (revision 24394) @@ -12,5 +12,5 @@ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \ - --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ @@ -40,7 +40,6 @@ autotools install.sh cmake install.sh - mpich install-3.3.sh - lapack install-3.8-mac.sh - petsc install-3.7-macosx64.sh + mpich install-3.3-mac.sh + petsc install-3.11-mac.sh triangle install-macosx64.sh chaco install.sh @@ -64,5 +63,16 @@ # # NOTE: One is usually safer as some packages are very sensitive to parallel -# compilation. +# compilation # -NUMCPUS_INSTALL=10 +NUMCPUS_INSTALL=8 + +# Number of CPUs used in the nightly runs +NUMCPUS_RUN=8 + +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +PYTHON_NROPTIONS="" +MATLAB_NROPTIONS="" + Index: /issm/trunk-jpl/jenkins/macosx_pine-island_static =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_static (revision 24393) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_static (revision 24394) @@ -1,31 +1,36 @@ - #-------------------------------# # 1: ISSM general configuration # #-------------------------------# -#MATLAB path +# MATLAB path MATLAB_PATH="/Applications/MATLAB_R2015b.app" -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR \ +# ISSM CONFIGURATION +ISSM_CONFIG='\ + --prefix=$ISSM_DIR \ --disable-static \ --enable-standalone-executables \ --enable-standalone-libraries \ + --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \ --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 -lpmpi -lmpifort -lmpicxx" \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ + --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \ --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \ + --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \ --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \ - --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a"' +' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=0 PYTHON_TEST=0 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 #-----------------------------------# @@ -33,33 +38,43 @@ #-----------------------------------# -#List of external pakages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake install.sh - mpich install-3.2-macosx64-static.sh - m1qn3 install.sh - petsc install-3.7-macosx64-static.sh - triangle install-macosx64.sh - math77 install.sh - gmt install-mac-precompiled.sh - gmsh install-mac-precompiled.sh - shell2junit install.sh" +# List of external pakages to be installed and their installation scripts +# +# NOTE: +# - For SLR capabilities, we need gmsh, math77, and gmt +# - GMT depends on GDAL and NetCDF +# +EXTERNALPACKAGES=" + autotools install.sh + cmake install.sh + mpich install-3.2-mac-static.sh + petsc install-3.7-mac-static.sh + triangle install-macosx64.sh + chaco install.sh + m1qn3 install.sh + semic install.sh + math77 install.sh + gmt install-mac-precompiled.sh + gmsh install-mac-precompiled.sh + shell2junit install.sh +" -#for SLR we need gmsh to mesh, math77, and gmt (which itself needs gdal and netcdf...) #-----------------# # 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=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. -NUMCPUS_RUN=4 +# 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]" -## bamg mesh FS -#PYTHON_NROPTIONS="" -#MATLAB_NROPTIONS="" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information. +# +PYTHON_NROPTIONS="" +MATLAB_NROPTIONS="" Index: /issm/trunk-jpl/test/NightlyRun/test124.js =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test124.js (revision 24393) +++ /issm/trunk-jpl/test/NightlyRun/test124.js (revision 24394) @@ -24,5 +24,5 @@ 2e-09,3e-9,3e-9,3e-9,1e-13,1e-12,1e-12, 2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10, - 2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10]; + 3e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10]; field_values=[ (md.results.TransientSolution[0](1).Vx), Index: /issm/trunk-jpl/test/NightlyRun/test124.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test124.m (revision 24393) +++ /issm/trunk-jpl/test/NightlyRun/test124.m (revision 24394) @@ -23,5 +23,5 @@ 2e-09,3e-9,3e-9,3e-9,1e-13,1e-12,1e-12,... 2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10,... - 2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10}; + 3e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10}; field_values={... (md.results.TransientSolution(1).Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test124.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test124.py (revision 24393) +++ /issm/trunk-jpl/test/NightlyRun/test124.py (revision 24394) @@ -29,5 +29,5 @@ field_tolerances = [2e-09, 3e-9, 3e-9, 3e-9, 1e-13, 1e-12, 1e-12, 2e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10, - 2e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10] + 3e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10] field_values = [md.results.TransientSolution[0].Vx, md.results.TransientSolution[0].Vy,