Index: /issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth (revision 27806) +++ /issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth (revision 27807) @@ -1,7 +1,8 @@ +MATLAB_PATH="/usr/local/MATLAB/R2020a" + #--------------------# # ISSM Configuration # #--------------------# -MATLAB_PATH="/usr/local/MATLAB/R2020a" ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ Index: /issm/trunk-jpl/jenkins/mac-intel-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-basic (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-intel-basic (revision 27807) @@ -1,7 +1,7 @@ +MATLAB_PATH="/Applications/MATLAB_R2022b.app" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab (revision 27807) @@ -1,7 +1,7 @@ +MATLAB_PATH="/Applications/MATLAB_R2022b.app" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Index: /issm/trunk-jpl/jenkins/mac-intel-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-intel-dakota (revision 27807) @@ -4,9 +4,9 @@ # +MATLAB_PATH="/Applications/MATLAB_R2022b.app" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/mac-intel-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-examples (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-intel-examples (revision 27807) @@ -7,9 +7,9 @@ # +MATLAB_PATH="/Applications/MATLAB_R2022b.app" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" ISSM_CONFIG='\ @@ -20,7 +20,4 @@ --with-numthreads=4 \ --with-matlab-dir=${MATLAB_PATH} \ - --with-python-version=3.9 \ - --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \ - --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \ --with-fortran-lib="-L/usr/local/Cellar/gcc/13.1.0/lib/gcc/13 -lgfortran" \ --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ @@ -58,5 +55,5 @@ netcdf install-4.7-parallel.sh proj install-6.sh - gdal install-3-python.sh + gdal install-3.sh gshhg install.sh gmt install-6-mac.sh Index: /issm/trunk-jpl/jenkins/mac-intel-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-full (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-intel-full (revision 27807) @@ -2,9 +2,4 @@ # - This configuration adds solid earth and Dakota capabilities to the basic # build. -# - Currently, this configuration does not compile the MATLAB API. After -# compiling, you will need to download the ISSM pre-compiled binaries from -# https://issm.jpl.nasa.gov/download/binaries, copy the contents of lib/ to -# $ISSM_DIR/lib-precompiled, then add $ISSM_DIR/lib-precompiled to the path -# in MATLAB. # # TODO: @@ -12,4 +7,6 @@ # node has been upgraded. # + +MATLAB_PATH="/Applications/MATLAB_R2022b.app" #--------------------# Index: /issm/trunk-jpl/jenkins/mac-intel-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-intel-solid_earth (revision 27807) @@ -7,9 +7,9 @@ # +MATLAB_PATH="/Applications/MATLAB_R2022b.app" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/mac-silicon-basic =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-silicon-basic (revision 27807) @@ -11,9 +11,9 @@ # +MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/mac-silicon-dakota =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-dakota (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-silicon-dakota (revision 27807) @@ -10,4 +10,6 @@ # node has been upgraded. # + +MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing #--------------------# Index: /issm/trunk-jpl/jenkins/mac-silicon-examples =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-silicon-examples (revision 27807) @@ -12,4 +12,6 @@ # +MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing + #--------------------# # ISSM Configuration # @@ -22,7 +24,4 @@ --enable-debugging \ --with-numthreads=8 \ - --with-python-version=3.9 \ - --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \ - --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \ --with-fortran-lib="-L/opt/homebrew/Cellar/gcc/12.2.0/lib/gcc/12 -lgfortran" \ --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ @@ -60,5 +59,5 @@ netcdf install-4.7-parallel.sh proj install-6.sh - gdal install-3-python.sh + gdal install-3.sh gshhg install.sh gmt install-6-mac.sh Index: /issm/trunk-jpl/jenkins/mac-silicon-full =================================================================== --- /issm/trunk-jpl/jenkins/mac-silicon-full (revision 27806) +++ /issm/trunk-jpl/jenkins/mac-silicon-full (revision 27807) @@ -12,4 +12,6 @@ # node has been upgraded. # + +MATLAB_PATH="/Applications/MATLAB_R2022b.app" # NOTE: Although we do not configure/compile MATLAB wrappers, we need to set this variable for testing #--------------------# Index: /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff (revision 27807) @@ -1,7 +1,8 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion (revision 27807) @@ -1,7 +1,8 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-basic =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-basic (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-basic (revision 27807) @@ -1,7 +1,8 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab (revision 27807) @@ -1,7 +1,7 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/usr/local/MATLAB/R2019b" # NOTE: Index: /issm/trunk-jpl/jenkins/ross-debian_linux-codipack =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-codipack (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-codipack (revision 27807) @@ -1,7 +1,8 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-dakota =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-dakota (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-dakota (revision 27807) @@ -1,7 +1,7 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-full =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-full (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-full (revision 27807) @@ -1,10 +1,10 @@ # NOTE: This configuration adds solid earth and Dakota capabilities to the # basic build. + +MATLAB_PATH="/usr/local/MATLAB/R2019b" #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack (revision 27807) @@ -1,10 +1,7 @@ -# NOTE: This configuration adds solid earth and Dakota capabilities to the -# basic build. +MATLAB_PATH="/usr/local/MATLAB/R2019b" #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind (revision 27807) @@ -1,10 +1,10 @@ # NOTE: This configuration adds solid earth and Dakota capabilities to the # basic build, as well as the ability to debug with Valgrind. + +MATLAB_PATH="/usr/local/MATLAB/R2019b" #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-gia =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-gia (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-gia (revision 27807) @@ -1,7 +1,8 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean (revision 27807) @@ -1,7 +1,8 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ --prefix=${ISSM_DIR} \ Index: /issm/trunk-jpl/jenkins/ross-debian_linux-python =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-python (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-python (revision 27807) @@ -84,8 +84,5 @@ # NOTE: # - Errors are large for tests 234, 418, and 420 under Python -# - Tests 2002, 2003, 2010, 2101, and 2021 are excluded as Gmsh produces -# different-sized meshes on macOS and Linux for 3d objects (archives are -# generated on macOS). # MATLAB_NROPTIONS="" -PYTHON_NROPTIONS="--exclude 234 418 420 2002 2003 2010 2021 2101" +PYTHON_NROPTIONS="--exclude 234 418 420" Index: /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth =================================================================== --- /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 27807) @@ -1,7 +1,7 @@ +MATLAB_PATH="/usr/local/MATLAB/R2019b" + #--------------------# # ISSM Configuration # #--------------------# - -MATLAB_PATH="/usr/local/MATLAB/R2019b" ISSM_CONFIG='\ Index: /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic =================================================================== --- /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic (revision 27806) +++ /issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic (revision 27807) @@ -1,2 +1,4 @@ +MATLAB_PATH=$(cygpath -u $(cygpath -ms "/c/Program Files/MATLAB/R2019b")) + ISSM_CONFIG='\ --prefix=${ISSM_DIR} \