Changeset 25200

Timestamp:

07/03/20 01:14:56 (5 years ago)

Author:

jdquinn

Message:

CHG: Clean up; working on new solid earth build for macOS.

Location:

issm/trunk-jpl/jenkins

Files:

• macosx_pine-island_examples (modified) (1 diff)
• pine_island-mac-solid_earth (copied) (copied from issm/trunk-jpl/jenkins/pine_island-mac-dakota ) (3 diffs)
• ross-debian_linux-binaries-solid_earth (modified) (1 diff)
• ross-debian_linux-solid_earth (modified) (1 diff)

issm/trunk-jpl/jenkins/macosx_pine-island_examples

@@ -39 +39 @@
         autotools       install.sh
         cmake           install.sh
-        mpich           install-3.3.sh
-        petsc           install-3.7-mac.sh
+        petsc           install-3.12-mac.sh
         triangle        install-mac.sh
         chaco           install.sh

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

@@ -23 +23 @@
         --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 \
-        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
-        --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
+        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install
 '
 
@@ -39 +35 @@
 #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
-        triangle        install-mac.sh
-        chaco           install.sh
-        m1qn3           install.sh
-        semic           install.sh
-        shell2junit     install.sh
+        autotools               install.sh
+        cmake                   install.sh
+        petsc                   install-3.12-solid_earth.sh
+        triangle                install-mac.sh
+        chaco                   install.sh
+        m1qn3                   install.sh
+        semic                   install.sh
+        boost                   install-1.7-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
+        shell2junit             install.sh
 "
 
@@ -76 +77 @@
 # See documentation in test/NightlyRun/runme.* for more information.
 #
-# NOTE:
-# - 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."
-# - 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"
-#
-MATLAB_NROPTIONS="'exclude',[234 235 418 420 444 445],'id',[IdFromString('Dakota')]"
-PYTHON_NROPTIONS="--exclude 234 417 418 420 444 445 --include_name 'Dakota'"
+MATLAB_NROPTIONS="'benchmark','slr'"
+PYTHON_NROPTIONS="--benchmark=slr"

issm/trunk-jpl/jenkins/ross-debian_linux-binaries-solid_earth

@@ -51 +51 @@
         netcdf                  install-4.7-parallel-static.sh
         proj                    install-6.2-static.sh
-        gdal                    install-3.0-python-netcdf-static.sh
+        gdal                    install-3-python-netcdf-static.sh
         gshhg                   install.sh
         gmt                             install-6.0-linux-static.sh

issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

@@ -42 +42 @@
         netcdf                  install-4.7-parallel.sh
         proj                    install-6.2.sh
-        gdal                    install-3.0-python-netcdf.sh
+        gdal                    install-3-python-netcdf.sh
         gshhg                   install.sh
         gmt                             install-6.0-linux.sh