Changeset 25653

Timestamp:

10/07/20 15:05:48 (5 years ago)

Author:

jdquinn

Message:

ADD: New configurations

Location:

issm/trunk-jpl/jenkins

Files:

• pine_island-mac-matlab (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac ) (3 diffs)
• pine_island-mac-python (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac ) (6 diffs)

issm/trunk-jpl/jenkins/pine_island-mac-matlab

@@ -21 +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-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -37 +41 @@
         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.67.sh
+        netcdf          install-4.7-parallel.sh
+        proj            install-6.2.sh
+        gdal            install-3-netcdf.sh
+        gshhg           install.sh
+        gmt                     install-6.0-mac.sh
+        gmsh            install-4.sh
         triangle        install-mac.sh
         chaco           install.sh
@@ -66 +80 @@
 # Nightly run options
 #
-# See documentation in test/NightlyRun/runme.* for more information
+# See documentation in test/NightlyRun/runme.* for more information.
 #
 # NOTE:
-# - test701 is skipped because it uses full Stokes equations
+# - Errors are large for tests 234, 235, 418, and 420 under MATLAB
+# - Tests 444 and 445 fail intermittently under MATLAB with "Index exceeds array bounds."\
+# - Tests 701, 702, and 703 are skipped because they use full Stokes equations
 #
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
+MATLAB_NROPTIONS="'exclude',[234 235 418 420 435 444 445 701 702 703]"
 PYTHON_NROPTIONS=""

issm/trunk-jpl/jenkins/pine_island-mac-python

@@ -2 +2 @@
 # ISSM Configuration #
 #--------------------#
-
-# MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2018a.app"
 
 # ISSM CONFIGURATION
@@ -13 +10 @@
         --enable-debugging \
         --with-numthreads=4 \
-        --with-matlab-dir=${MATLAB_PATH} \
+        --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-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
@@ -21 +19 @@
         --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-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -37 +39 @@
         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.67.sh
+        netcdf          install-4.7-parallel.sh
+        proj            install-6.2.sh
+        gdal            install-3-python-netcdf.sh
+        gshhg           install.sh
+        gmt                     install-6.0-mac.sh
+        gmsh            install-4.sh
         triangle        install-mac.sh
         chaco           install.sh
@@ -49 +61 @@
 
 # Test suites
-MATLAB_TEST=1
-PYTHON_TEST=0
+MATLAB_TEST=0
+PYTHON_TEST=1
 JAVASCRIPT_TEST=0
 EXAMPLES_TEST=0
@@ -66 +78 @@
 # Nightly run options
 #
-# See documentation in test/NightlyRun/runme.* for more information
+# See documentation in test/NightlyRun/runme.* for more information.
 #
 # NOTE:
-# - test701 is skipped because it uses full Stokes equations
+# - Errors are large for tests 234 418 and 420 under Python
+# - See test417.py for why it is excluded
+# - Test 444 fails intermittently under Python with "IndexError: list index out of range"
+# - Tests 701, 702, and 703 are skipped because they use full Stokes equations
 #
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
-PYTHON_NROPTIONS=""
+MATLAB_NROPTIONS=""
+PYTHON_NROPTIONS="--exclude 234 417 418 420 435 444 445 701 702 703 2005 2006]"