Changeset 28013 for issm/trunk/jenkins/ross-debian_linux-solid_earth

Timestamp:

11/15/23 12:14:04 (17 months ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 28011

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• jenkins/ross-debian_linux-solid_earth (modified) (6 diffs)

issm/trunk/jenkins/ross-debian_linux-solid_earth

@@ +1 @@
+MATLAB_PATH="/usr/local/MATLAB/R2019b"
+
 #--------------------#
 # ISSM Configuration #
 #--------------------#
-
-MATLAB_PATH="/usr/local/MATLAB/R2019b"
 
 ISSM_CONFIG='\
@@ -12 +12 @@
         --with-numthreads=4 \
         --with-matlab-dir=${MATLAB_PATH} \
+        --with-python-version=3.7 \
         --with-python-dir=/usr \
-        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
+        --with-python-numpy-dir=/usr/local/lib/python3.7/dist-packages/numpy \
         --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
@@ -22 +23 @@
         --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
-        --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-hdf5-dir=${ISSM_DIR}/externalpackages/hdf5/install \
         --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
@@ -41 +42 @@
         autotools               install-linux.sh
         cmake                   install.sh
-        petsc                   install-3.12-linux.sh
+        petsc                   install-3.17-linux.sh
         gsl                             install.sh
         boost                   install-1.7-linux.sh
         dakota                  install-6.2-linux.sh
         curl                    install-7-linux.sh
+        hdf5                    install-1-parallel.sh
         netcdf                  install-4.7-parallel.sh
         proj                    install-6.sh
@@ -53 +55 @@
         gmsh                    install-4-linux.sh
         triangle                install-linux.sh
-        chaco                   install.sh
+        chaco                   install-linux.sh
         m1qn3                   install.sh
         semic                   install.sh
@@ -90 +92 @@
 # - Excluding 2012 until it can be looked at by Eric ("FindParam error message: Parameter HydrologyModel not set")
 #
-MATLAB_NROPTIONS="'benchmark','slc','exclude',[2004 2006 2012 2021 2051 2052 2053 2085 2090 2101 2424 2425]"
-PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2012 2021 2051 2052 2053 2085 2090 2101 2424 2425"
+MATLAB_NROPTIONS="'benchmark','slc','exclude',[2004 2006 2012 2051 2052 2053 2085 2424 2425]"
+PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2012 2021 2051 2052 2053 2085 2424 2425"