Changeset 26744 for issm/trunk/jenkins/ross-debian_linux-full

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• jenkins/ross-debian_linux-full (modified) (3 diffs)

issm/trunk/jenkins/ross-debian_linux-full

@@ -22 +22 @@
         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -29 +30 @@
         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
+        --with-proj-dir=${ISSM_DIR}/externalpackages/proj/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -40 +42 @@
 
 EXTERNALPACKAGES="
-        autotools       install-debian-linux.sh
+        autotools       install-linux.sh
         cmake           install.sh
         petsc           install-3.12-linux.sh
         gsl                     install.sh
-        boost           install-1.7-linux-valgrind.sh
+        boost           install-1.7-linux.sh
         dakota          install-6.2-linux.sh
         curl            install-7-linux.sh
         netcdf          install-4.7-parallel.sh
-        proj            install-6.2.sh
-        gdal            install-3-python-netcdf.sh
+        proj            install-8.sh
+        gdal            install-3-python.sh
         gshhg           install.sh
         gmt                     install-6-linux.sh