Changeset 26744 for issm/trunk/jenkins/ross-debian_linux-adolc-ampion

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-adolc-ampion (modified) (3 diffs)

issm/trunk/jenkins/ross-debian_linux-adolc-ampion

@@ -12 +12 @@
         --without-kriging \
         --without-kml \
-        --without-Gia \
+        --without-Sealevelchange \
         --without-Love \
         --with-matlab-dir=${MATLAB_PATH} \
@@ -22 +22 @@
         --with-ampi-dir=${ISSM_DIR}/externalpackages/adjoinablempi/install \
         --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
         --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
@@ -39 +40 @@
 #
 EXTERNALPACKAGES="
-        autotools               install-debian-linux.sh
+        autotools               install-linux.sh
         cmake                   install.sh
         petsc                   install-3.12-linux.sh