Changeset 26744 for issm/trunk/jenkins/pine_island-mac-solid_earth

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/pine_island-mac-solid_earth (modified) (5 diffs)

issm/trunk/jenkins/pine_island-mac-solid_earth

@@ +1 @@
+# TODO: Change PROJ installation script to latest version once Jenkins macOS 
+#               build node has been upgraded.
+#
+
 #--------------------#
 # ISSM Configuration #
@@ -14 +18 @@
         --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
         --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
-        --with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.0/lib/gcc/10 -lgfortran" \
+        --with-fortran-lib="-L/usr/local/Cellar/gcc/10.3.0/lib/gcc/10 -lgfortran" \
         --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
         --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 \
@@ -26 +31 @@
         --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 \
@@ -38 +44 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
-        autotools               install.sh
-        cmake                   install.sh
-        petsc                   install-3.12-mac.sh
-        gsl                             install.sh
-        boost                   install-1.7-mac.sh
-        dakota                  install-6.2-mac.sh
-        curl                    install-7-mac.sh
-        netcdf                  install-4.7-parallel.sh
-        proj                    install-6.2.sh
-        gdal                    install-3-python-netcdf.sh
-        gshhg                   install.sh
-        gmt                             install-6-mac.sh
-        gmsh                    install-4.sh
-        triangle                install-mac.sh
-        chaco                   install.sh
-        m1qn3                   install.sh
-        semic                   install.sh
-        shell2junit             install.sh
+        autotools       install-mac.sh
+        cmake           install.sh
+        petsc           install-3.12-mac.sh
+        gsl                     install.sh
+        boost           install-1.7-mac.sh
+        dakota          install-6.2-mac.sh
+        curl            install-7-mac.sh
+        netcdf          install-4.7-parallel.sh
+        proj            install-6.sh
+        gdal            install-3-python.sh
+        gshhg           install.sh
+        gmt                     install-6-mac.sh
+        gmsh            install-4.sh
+        triangle        install-mac.sh
+        chaco           install.sh
+        m1qn3           install.sh
+        semic           install.sh
+        shell2junit     install.sh
 "
 
@@ -85 +91 @@
 # - Excluding 2006 until it can be debugged (file I/O)
 #
-MATLAB_NROPTIONS="'benchmark','slr','exclude',[2006]"
-PYTHON_NROPTIONS="--benchmark slr --exclude 2005 2006"
+MATLAB_NROPTIONS="'benchmark','slc','exclude',[2004 2006 2051 2052 2053 2084 2085 2424 2425]"
+PYTHON_NROPTIONS="--benchmark slc --exclude 2004 2006 2051 2052 2053 2084 2085 2424 2425"