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

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

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

issm/trunk/jenkins/ross-debian_linux-solid_earth

@@ -4 +4 @@
 
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
+
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -20 +21 @@
         --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-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
+        --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
+        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
+        --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
         --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
-        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
+        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
+        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
+        --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
 '
 
@@ -30 +37 @@
 
 EXTERNALPACKAGES="
-        autotools       install-debian-linux.sh
-        cmake           install.sh
-        petsc           install-3.12-linux-solid_earth.sh
-        triangle        install-linux.sh
-        chaco           install.sh
-        m1qn3           install.sh
-        semic           install.sh
-        boost           install-1.55-linux.sh
-        curl            install-7.67.sh
-        netcdf          install-4.7.sh
-        proj            install-6.2.sh
-        gdal            install-3.0-python-netcdf.sh
-        gshhg           install.sh
-        gmt                     install-6.0-linux.sh
-        gmsh            install.sh
-        shell2junit     install.sh
+        autotools               install-debian-linux.sh
+        cmake                   install.sh
+        petsc                   install-3.12-linux.sh
+        gsl                             install.sh
+        boost                   install-1.7-linux.sh
+        dakota                  install-6.2-linux.sh
+        boost                   install-1.7-linux.sh
+        curl                    install-7-linux.sh
+        netcdf                  install-4.7-parallel.sh
+        proj                    install-6.2.sh
+        gdal                    install-3-python-netcdf.sh
+        gshhg                   install.sh
+        gmt                             install-6-linux.sh
+        gmsh                    install-4.sh
+        triangle                install-linux.sh
+        chaco                   install.sh
+        m1qn3                   install.sh
+        semic                   install.sh
+        shell2junit             install.sh
 "
 
@@ -75 +85 @@
 # See documentation in test/NightlyRun/runme.* for more information.
 #
-MATLAB_NROPTIONS="'benchmark','slr'"
-PYTHON_NROPTIONS="--benchmark=slr"
+# NOTE:
+# - Tests 2002, 2003, 2005, 2010, 2101, and 2021 are excluded as Gmsh produces 
+# different-sized meshes on macOS and Linux for 3d objects (archives are 
+# generated on macOS).
+# - Excluding 2006 until it can be debugged (PETSc crash)
+#
+MATLAB_NROPTIONS="'benchmark','slr','exclude',[2002 2003 2005 2006 2010 2021 2101]"
+PYTHON_NROPTIONS="--benchmark slr --exclude 2002 2003 2005 2006 2010 2021 2101"