Index: sm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64-netcdf.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64-netcdf.sh (revision 24324) +++ (revision ) @@ -1,37 +1,0 @@ -#!/bin/bash -set -eu - - -# Constants -# -VER="3.0.2" -PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" - -# Cleanup -rm -rf install src -mkdir install src - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" - -# Unpack source -tar -zxvf gdal-$VER.tar.gz - -# Move source into 'src' directory -mv gdal-$VER/* src -rm -rf gdal-$VER - -# Configure -cd src -./configure \ - --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ - --with-proj="${PROJ_ROOT}" - -# Compile and install -if [ $# -eq 0 ]; then - make - make install -else - make -j $1 - make -j $1 install -fi Index: sm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64-python-netcdf.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64-python-netcdf.sh (revision 24324) +++ (revision ) @@ -1,42 +1,0 @@ -#!/bin/bash -set -eu - - -## TODO -# - May want to supply path to Python instead of, effectively, using result of `which python` -# - -## Constants -# -VER="3.0.2" -PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" - -# Cleanup -rm -rf install src -mkdir install src - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" - -# Unpack source -tar -zxvf gdal-$VER.tar.gz - -# Move source into 'src' directory -mv gdal-$VER/* src -rm -rf gdal-$VER - -# Configure -cd src -./configure \ - --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ - --with-python \ - --with-proj="${PROJ_ROOT}" - -# Compile and install -if [ $# -eq 0 ]; then - make - make install -else - make -j $1 - make -j $1 install -fi Index: sm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64-python.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64-python.sh (revision 24324) +++ (revision ) @@ -1,44 +1,0 @@ -#!/bin/bash -set -eu - - -## TODO -# - May want to supply path to Python instead of, effectively, using result of `which python` -# - -## Constants -# -VER="3.0.2" -PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" - -# Cleanup -rm -rf install src -mkdir install src - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" - -# Unpack source -tar -zxvf gdal-$VER.tar.gz - -# Move source into 'src' directory -mv gdal-$VER/* src -rm -rf gdal-$VER - -# Configure -cd src -./configure \ - --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ - --with-python \ - --without-hdf5 \ - --without-netcdf \ - --with-proj="${PROJ_ROOT}" - -# Compile and install -if [ $# -eq 0 ]; then - make - make install -else - make -j $1 - make -j $1 install -fi Index: sm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0-macOS_64.sh (revision 24324) +++ (revision ) @@ -1,39 +1,0 @@ -#!/bin/bash -set -eu - - -# Constants -# -VER="3.0.2" -PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" - -# Cleanup -rm -rf install src -mkdir install src - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" - -# Unpack source -tar -zxvf gdal-$VER.tar.gz - -# Move source into 'src' directory -mv gdal-$VER/* src -rm -rf gdal-$VER - -# Configure -cd src -./configure \ - --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ - --without-hdf5 \ - --without-netcdf \ - --with-proj="${PROJ_ROOT}" - -# Compile and install -if [ $# -eq 0 ]; then - make - make install -else - make -j $1 - make -j $1 install -fi Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh (revision 24325) +++ /issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh (revision 24325) @@ -0,0 +1,37 @@ +#!/bin/bash +set -eu + + +# Constants +# +VER="3.0.2" +PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" + +# Cleanup +rm -rf install src +mkdir install src + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" + +# Unpack source +tar -zxvf gdal-$VER.tar.gz + +# Move source into 'src' directory +mv gdal-$VER/* src +rm -rf gdal-$VER + +# Configure +cd src +./configure \ + --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ + --with-proj="${PROJ_ROOT}" + +# Compile and install +if [ $# -eq 0 ]; then + make + make install +else + make -j $1 + make -j $1 install +fi Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh (revision 24325) +++ /issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh (revision 24325) @@ -0,0 +1,42 @@ +#!/bin/bash +set -eu + + +## TODO +# - May want to supply path to Python instead of, effectively, using result of `which python` +# + +## Constants +# +VER="3.0.2" +PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" + +# Cleanup +rm -rf install src +mkdir install src + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" + +# Unpack source +tar -zxvf gdal-$VER.tar.gz + +# Move source into 'src' directory +mv gdal-$VER/* src +rm -rf gdal-$VER + +# Configure +cd src +./configure \ + --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ + --with-python \ + --with-proj="${PROJ_ROOT}" + +# Compile and install +if [ $# -eq 0 ]; then + make + make install +else + make -j $1 + make -j $1 install +fi Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0-python.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0-python.sh (revision 24325) +++ /issm/trunk-jpl/externalpackages/gdal/install-3.0-python.sh (revision 24325) @@ -0,0 +1,44 @@ +#!/bin/bash +set -eu + + +## TODO +# - May want to supply path to Python instead of, effectively, using result of `which python` +# + +## Constants +# +VER="3.0.2" +PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" + +# Cleanup +rm -rf install src +mkdir install src + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" + +# Unpack source +tar -zxvf gdal-$VER.tar.gz + +# Move source into 'src' directory +mv gdal-$VER/* src +rm -rf gdal-$VER + +# Configure +cd src +./configure \ + --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ + --with-python \ + --without-hdf5 \ + --without-netcdf \ + --with-proj="${PROJ_ROOT}" + +# Compile and install +if [ $# -eq 0 ]; then + make + make install +else + make -j $1 + make -j $1 install +fi Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install-3.0.sh (revision 24325) +++ /issm/trunk-jpl/externalpackages/gdal/install-3.0.sh (revision 24325) @@ -0,0 +1,39 @@ +#!/bin/bash +set -eu + + +# Constants +# +VER="3.0.2" +PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install" + +# Cleanup +rm -rf install src +mkdir install src + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/gdal-${VER}.tar.gz" "gdal-${VER}.tar.gz" + +# Unpack source +tar -zxvf gdal-$VER.tar.gz + +# Move source into 'src' directory +mv gdal-$VER/* src +rm -rf gdal-$VER + +# Configure +cd src +./configure \ + --prefix="${ISSM_DIR}/externalpackages/gdal/install" \ + --without-hdf5 \ + --without-netcdf \ + --with-proj="${PROJ_ROOT}" + +# Compile and install +if [ $# -eq 0 ]; then + make + make install +else + make -j $1 + make -j $1 install +fi Index: sm/trunk-jpl/externalpackages/proj/install-6.2-macOS_64-with_tests.sh =================================================================== --- /issm/trunk-jpl/externalpackages/proj/install-6.2-macOS_64-with_tests.sh (revision 24324) +++ (revision ) @@ -1,41 +1,0 @@ -#!/bin/bash -set -eu - - -# Constants -# -VER="6.2.1" - -## Environnment -# -export SQLITE3_LIBS="-lsqlite3" # SQLite3 ships with macOS - -# Cleanup -rm -rf install src -mkdir install src - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/proj-${VER}.tar.gz" "proj-${VER}.tar.gz" - -# Unpack source -tar -zxvf proj-$VER.tar.gz - -# Move source into 'src' directory -mv proj-$VER/* src -rm -rf proj-$VER - -# Configure -cd src -./configure \ - --prefix="${ISSM_DIR}/externalpackages/proj/install" - -# Compile and install -if [ $# -eq 0 ]; then - make - make check - make install -else - make -j $1 - make -j $1 check - make -j $1 install -fi Index: sm/trunk-jpl/externalpackages/proj/install-6.2-macOS_64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/proj/install-6.2-macOS_64.sh (revision 24324) +++ (revision ) @@ -1,39 +1,0 @@ -#!/bin/bash -set -eu - - -# Constants -# -VER="6.2.1" - -## Environnment -# -export SQLITE3_LIBS="-lsqlite3" # SQLite3 ships with macOS - -# Cleanup -rm -rf install src -mkdir install src - -# Download source -$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/proj-${VER}.tar.gz" "proj-${VER}.tar.gz" - -# Unpack source -tar -zxvf proj-$VER.tar.gz - -# Move source into 'src' directory -mv proj-$VER/* src -rm -rf proj-$VER - -# Configure -cd src -./configure \ - --prefix="${ISSM_DIR}/externalpackages/proj/install" - -# Compile and install -if [ $# -eq 0 ]; then - make - make install -else - make -j $1 - make -j $1 install -fi Index: /issm/trunk-jpl/externalpackages/proj/install-6.2-with_tests.sh =================================================================== --- /issm/trunk-jpl/externalpackages/proj/install-6.2-with_tests.sh (revision 24325) +++ /issm/trunk-jpl/externalpackages/proj/install-6.2-with_tests.sh (revision 24325) @@ -0,0 +1,52 @@ +#!/bin/bash +set -eu + + +# Constants +# +VER="6.2.1" + +## Environnment +# + +# NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently +# requires, +# +# SQLITE3_LIBS="-lsqlite3". +# +# On Ubuntu Linux, install the SQLite3 binary, libraries and headers +# with, +# +# `apt-get install sqlite3 libsqlite3-dev` +# +export SQLITE3_LIBS="-lsqlite3" + +# Cleanup +rm -rf install src +mkdir install src + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/proj-${VER}.tar.gz" "proj-${VER}.tar.gz" + +# Unpack source +tar -zxvf proj-$VER.tar.gz + +# Move source into 'src' directory +mv proj-$VER/* src +rm -rf proj-$VER + +# Configure +cd src +./configure \ + --prefix="${ISSM_DIR}/externalpackages/proj/install" + +# Compile and install +if [ $# -eq 0 ]; then + make + make check + make install +else + make -j $1 + make -j $1 check + make -j $1 install +fi Index: /issm/trunk-jpl/externalpackages/proj/install-6.2.sh =================================================================== --- /issm/trunk-jpl/externalpackages/proj/install-6.2.sh (revision 24325) +++ /issm/trunk-jpl/externalpackages/proj/install-6.2.sh (revision 24325) @@ -0,0 +1,50 @@ +#!/bin/bash +set -eu + + +# Constants +# +VER="6.2.1" + +## Environnment +# + +# NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently +# requires, +# +# SQLITE3_LIBS="-lsqlite3". +# +# On Ubuntu Linux, install the SQLite3 binary, libraries and headers +# with, +# +# `apt-get install sqlite3 libsqlite3-dev` +# +export SQLITE3_LIBS="-lsqlite3" + +# Cleanup +rm -rf install src +mkdir install src + +# Download source +$ISSM_DIR/scripts/DownloadExternalPackage.sh "http://issm.jpl.nasa.gov/files/externalpackages/proj-${VER}.tar.gz" "proj-${VER}.tar.gz" + +# Unpack source +tar -zxvf proj-$VER.tar.gz + +# Move source into 'src' directory +mv proj-$VER/* src +rm -rf proj-$VER + +# Configure +cd src +./configure \ + --prefix="${ISSM_DIR}/externalpackages/proj/install" + +# Compile and install +if [ $# -eq 0 ]; then + make + make install +else + make -j $1 + make -j $1 install +fi Index: /issm/trunk-jpl/jenkins/linux64_ross =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross (revision 24324) +++ /issm/trunk-jpl/jenkins/linux64_ross (revision 24325) @@ -1,3 +1,2 @@ - #-------------------------------# # 1: ISSM general configuration # @@ -57,6 +56,9 @@ #-----------------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) +# Number of CPUs used in ISSM compilation +# +# NOTE: One is usually safer as some packages are very sensitive to parallel +# compilation. +# NUMCPUS_INSTALL=10 Index: /issm/trunk-jpl/jenkins/linux64_ross_se =================================================================== --- /issm/trunk-jpl/jenkins/linux64_ross_se (revision 24324) +++ /issm/trunk-jpl/jenkins/linux64_ross_se (revision 24325) @@ -1,3 +1,2 @@ - #-------------------------------# # 1: ISSM general configuration # @@ -8,26 +7,30 @@ #ISSM CONFIGURATION -ISSM_CONFIG='--prefix=$ISSM_DIR \ +ISSM_CONFIG='\ + --prefix=$ISSM_DIR \ --disable-static \ --with-matlab-dir=$MATLAB_PATH \ --with-python-dir=/usr \ --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \ + --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \ + --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ + --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \ + --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ + --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ - --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \ - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \ - --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ - --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \ --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \ - --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \ --with-numthreads=4 \ --enable-development \ - --enable-debugging ' + --enable-debugging \ +' -#PYTHON and MATLAB testing +# Test suites MATLAB_TEST=1 PYTHON_TEST=1 +JAVASCRIPT_TEST=0 +EXAMPLES_TEST=0 #-----------------------------------# @@ -36,16 +39,20 @@ #List of external packages to be installed and their installation scripts -EXTERNALPACKAGES="autotools install.sh - cmake install.sh - mpich install-3.2-linux64.sh - petsc install-3.7-linux64.sh - triangle install-linux64.sh - boost install-1.55-linux.sh - gshhg install.sh - hdf5 install.sh - netcdf install.sh - gmt install.sh - gmsh install.sh - shell2junit install.sh" +EXTERNALPACKAGES=" + autotools install.sh + cmake install.sh + mpich install-3.2-linux64.sh + petsc install-3.7-linux64.sh + triangle install-linux64.sh + boost install-1.55-linux.sh + hdf5 install-1.10.sh + netcdf install-4.7.sh + proj install-6.2-macOS_64.sh + gdal install-3.0-macOS_64-netcdf.sh + gshhg install.sh + gmt install.sh + gmsh install.sh + shell2junit install.sh +" #-----------------# @@ -53,10 +60,13 @@ #-----------------# -#number of cpus used in ISSM installation and compilation (one is usually -#safer as some packages are very sensitive to parallel compilation) -NUMCPUS_INSTALL=5 +# Number of CPUs used in ISSM compilation +# +# NOTE: One is usually safer as some packages are very sensitive to parallel +# compilation. +# +NUMCPUS_INSTALL=10 #number of cpus used in the nightly runs. (pb of access to all_vertices.txt if more than 1) -NUMCPUS_RUN=1 +NUMCPUS_RUN=5 #Nightly run options. The matlab routine runme.m will be called Index: /issm/trunk-jpl/jenkins/macosx_pine-island_examples =================================================================== --- /issm/trunk-jpl/jenkins/macosx_pine-island_examples (revision 24324) +++ /issm/trunk-jpl/jenkins/macosx_pine-island_examples (revision 24325) @@ -4,5 +4,5 @@ # MATLAB path -MATLAB_PATH="/Applications/MATLAB_R2015b.app" +MATLAB_PATH="/Applications/MATLAB_R2019b.app" # ISSM CONFIGURATION @@ -43,6 +43,6 @@ hdf5 install-1.10.sh netcdf install-4.7.sh - proj install-6.2-macOS_64.sh - gdal install-3.0-macOS_64-netcdf.sh + proj install-6.2.sh + gdal install-3.0-netcdf.sh gshhg install.sh gmt install.sh