Index: /issm/trunk-jpl/jenkins/linux64_caladan =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan (revision 28126) +++ /issm/trunk-jpl/jenkins/linux64_caladan (revision 28127) @@ -1,12 +1,9 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path MATLAB_PATH="/usr/local/MATLAB/R2015a" -#ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR\ +#--------------------# +# ISSM Configuration # +#--------------------# + +ISSM_CONFIG='\ --disable-static \ --with-matlab-dir=$MATLAB_PATH \ @@ -31,39 +28,45 @@ --enable-debugging ' -#PYTHON and MATLAB testing +#-------------------# +# External Packages # +#-------------------# + +EXTERNALPACKAGES=" + autotools install.sh + cmake install.sh + mpich install-3.2-linux64.sh + petsc install-3.7-linux64.sh + triangle install-linux64.sh + boost install-1.7-linux.sh + dakota install-6.2-linux64.sh + chaco install-linux.sh + m1qn3 install-linux.sh + shell2junit install.sh +" + +#---------# +# Testing # +#---------# + +# Test suites MATLAB_TEST=1 PYTHON_TEST=1 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 -#-----------------------------------# -# 3: External packages installation # -#-----------------------------------# - -#List of external packages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake install.sh - mpich install-3.2-linux64.sh - petsc install-3.7-linux64.sh - triangle install-linux64.sh - boost install-1.7-linux.sh - dakota install-6.2-linux64.sh - chaco install-linux.sh - m1qn3 install-linux.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) +# 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=2 -#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 +# PYTHON_NROPTIONS="--exclude 701 702 435" MATLAB_NROPTIONS="'exclude',[701,702,435]" Index: /issm/trunk-jpl/jenkins/linux64_caladan_ad =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 28126) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ad (revision 28127) @@ -1,11 +1,8 @@ -# -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path MATLAB_PATH="/usr/local/MATLAB/R2015a" -#ISSM CONFIGURATION +#--------------------# +# ISSM Configuration # +#--------------------# + ISSM_CONFIG='\ --prefix=$ISSM_DIR\ @@ -21,13 +18,8 @@ ' -#PYTHON and MATLAB testing -MATLAB_TEST=1 -PYTHON_TEST=0 +#-------------------# +# External Packages # +#-------------------# -#-----------------------------------# -# 3: External packages installation # -#-----------------------------------# - -#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-linux.sh @@ -41,19 +33,28 @@ " -#-----------------# -# 4: test options # -#-----------------# +#---------# +# Testing # +#---------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) +# Test suites +MATLAB_TEST=1 +PYTHON_TEST=0 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 + +# Number of CPUs used in ISSM compilation +# +# NOTE: One is usually safer as some packages are very sensitive to parallel +# compilation +# NUMCPUS_INSTALL=2 -#number of cpus used in the nightly runs. +# 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information +# MATLAB_NROPTIONS="'benchmark','adolc','id',[3001:3019]" PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi =================================================================== --- /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 28126) +++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi (revision 28127) @@ -1,11 +1,8 @@ - -#-------------------------------# -# 1: ISSM general configuration # -#-------------------------------# - -#MATLAB path MATLAB_PATH="/usr/local/MATLAB/R2015a" -#ISSM CONFIGURATION +#--------------------# +# ISSM Configuration # +#--------------------# + ISSM_CONFIG='\ --prefix=$ISSM_DIR \ @@ -31,13 +28,8 @@ ' -#PYTHON and MATLAB testing -MATLAB_TEST=1 -PYTHON_TEST=0 +#-------------------# +# External Packages # +#-------------------# -#-----------------------------------# -# 3: External packages installation # -#-----------------------------------# - -#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-linux.sh @@ -52,19 +44,28 @@ " -#-----------------# -# 4: test options # -#-----------------# +#---------# +# Testing # +#---------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) +# Test suites +MATLAB_TEST=1 +PYTHON_TEST=0 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 + +# Number of CPUs used in ISSM compilation +# +# NOTE: One is usually safer as some packages are very sensitive to parallel +# compilation +# NUMCPUS_INSTALL=2 -#number of cpus used in the nightly runs. +# 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]" +# Nightly run options +# +# See documentation in test/NightlyRun/runme.* for more information +# 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: /issm/trunk-jpl/jenkins/mac-intel-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-basic (revision 28126) +++ /issm/trunk-jpl/jenkins/mac-intel-basic (revision 28127) @@ -30,5 +30,4 @@ #-------------------# -# List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/mac-intel-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 28126) +++ /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 28127) @@ -44,5 +44,4 @@ #-------------------# -#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh Index: /issm/trunk-jpl/jenkins/mac-silicon-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 28126) +++ /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 28127) @@ -30,5 +30,4 @@ #-------------------# -# List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" autotools install-mac.sh @@ -66,7 +65,7 @@ # # NOTE: -# - Tests 216, 274, 430, 435, 441:442, 456, 470:476, 517 are excluded because of large errors -# - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 808 are excluded because of failure "Arrays have incompatible sizes for this operation." +# - Tests 216, 274, 430, 435, 441:442, 517 are excluded because of large errors +# - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 702:703, 808 are excluded because of failure "Arrays have incompatible sizes for this operation." # -MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),119,216,274,423,430,433,435,441:442,448,456,462:464,470:476,508,517,544,546,808]" +MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),119,216,274,423,430,433,435,441:442,448,462:464,508,517,544,546,702:703,808]" PYTHON_NROPTIONS="" Index: /issm/trunk-jpl/jenkins/mac-silicon-python =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-python (revision 28126) +++ /issm/trunk-jpl/jenkins/mac-silicon-python (revision 28127) @@ -63,9 +63,10 @@ # # See documentation in test/NightlyRun/runme.* for more information -# + # NOTE: -# - Tests 234, 418, and 420 are excluded because of large errors +# - Tests 216, 274, 430, 435, 441:442 517 are excluded because of large errors +# - Tests 119, 423, 433, 448, 462:464, 508, 544, 546, 702:703, 808 are excluded because of failure "Arrays have incompatible sizes for this operation." # MATLAB_NROPTIONS="" -PYTHON_NROPTIONS="--exclude 234 418 420" +PYTHON_NROPTIONS="--exclude_name 'Dakota'--exclude 119 216 274 423 430 433 435 441:442 448 462:464 508 517 544 546 702:703 808" Index: /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic =================================================================== --- /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic (revision 28126) +++ /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic (revision 28127) @@ -26,5 +26,4 @@ #-------------------# -#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" metis install-5-win-msys2-gcc.sh Index: /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic =================================================================== --- /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic (revision 28126) +++ /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic (revision 28127) @@ -27,5 +27,4 @@ #-------------------# -#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" msmpi install.sh Index: /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab =================================================================== --- /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab (revision 28126) +++ /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab (revision 28127) @@ -28,5 +28,4 @@ #-------------------# -#List of external packages to be installed and their installation scripts EXTERNALPACKAGES=" msmpi install-static.sh Index: /issm/trunk-jpl/test/NightlyRun/test504.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.m (revision 28126) +++ /issm/trunk-jpl/test/NightlyRun/test504.m (revision 28127) @@ -12,8 +12,32 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','IceVolume1','IceVolumeScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1','TotalSmb1','TotalSmbScaled1','TotalFloatingBmb1','TotalFloatingBmbScaled1',... - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','IceVolume2','IceVolumeScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2','TotalSmb2','TotalSmbScaled2','TotalFloatingBmb2','TotalFloatingBmbScaled2'}; -field_tolerances={1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_names ={'Vx1','Vy1','Vel1','Pressure1',... + 'Bed1','Surface1','Thickness1',... + 'IceVolume1','IceVolumeScaled1',... + 'GroundedArea1','GroundedAreaScaled1',... + 'FloatingArea1','FloatingAreaScaled1',... + 'TotalSmb1','TotalSmbScaled1',... + 'TotalFloatingBmb1','TotalFloatingBmbScaled1',... + 'Vx2','Vy2','Vel2','Pressure2',... + 'Bed2','Surface2','Thickness2',... + 'IceVolume2','IceVolumeScaled2',... + 'GroundedArea2','GroundedAreaScaled2',... + 'FloatingArea2','FloatingAreaScaled2',... + 'TotalSmb2','TotalSmbScaled2',... + 'TotalFloatingBmb2','TotalFloatingBmbScaled2'}; +field_tolerances={1e-12,2e-12,2e-12,1e-13,... + 1e-13,1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 3e-13,4e-13,4e-13,1e-13,... + 1e-13,1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13}; field_values={... (md.results.TransientSolution(1).Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test504.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.py (revision 28126) +++ /issm/trunk-jpl/test/NightlyRun/test504.py (revision 28127) @@ -37,8 +37,8 @@ 1e-13, 1e-13, 1e-13, 1e-13, - 1e-12, 1e-12, - 1e-12, 1e-13, 1e-13, 1e-13, - 1e-13, 1e-13, 1e-13, 1e-13, + 1e-13, 1e-13, + 1e-13, 1e-13, + 3e-13, 4e-13, 4e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, Index: /issm/trunk-jpl/test/NightlyRun/test519.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test519.m (revision 28126) +++ /issm/trunk-jpl/test/NightlyRun/test519.m (revision 28127) @@ -13,8 +13,32 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','IceVolume1','IceVolumeScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1','TotalSmb1','TotalSmbScaled1','TotalFloatingBmb1','TotalFloatingBmbScaled1',... - 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','IceVolume2','IceVolumeScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2','TotalSmb2','TotalSmbScaled2','TotalFloatingBmb2','TotalFloatingBmbScaled2'}; -field_tolerances={1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_names ={'Vx1','Vy1','Vel1','Pressure1',... + 'Bed1','Surface1','Thickness1',... + 'IceVolume1','IceVolumeScaled1',... + 'GroundedArea1','GroundedAreaScaled1',... + 'FloatingArea1','FloatingAreaScaled1',... + 'TotalSmb1','TotalSmbScaled1',... + 'TotalFloatingBmb1','TotalFloatingBmbScaled1',... + 'Vx2','Vy2','Vel2','Pressure2',... + 'Bed2','Surface2','Thickness2',... + 'IceVolume2','IceVolumeScaled2',... + 'GroundedArea2','GroundedAreaScaled2',... + 'FloatingArea2','FloatingAreaScaled2',... + 'TotalSmb2','TotalSmbScaled2',... + 'TotalFloatingBmb2','TotalFloatingBmbScaled2'}; +field_tolerances={1e-12,2e-12,2e-12,1e-13,... + 1e-13,1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 4e-13,4e-13,4e-13,1e-13,... + 1e-13,1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13,... + 1e-13,1e-13}; field_values={... (md.results.TransientSolution(1).Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test519.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test519.py (revision 28126) +++ /issm/trunk-jpl/test/NightlyRun/test519.py (revision 28127) @@ -43,5 +43,5 @@ 1e-12, 1e-13, 1e-13, 1e-13, - 1e-13, 1e-13, 1e-13, 1e-13, + 4e-13, 4e-13, 4e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,