Changeset 25244


Ignore:
Timestamp:
07/09/20 20:28:15 (5 years ago)
Author:
jdquinn
Message:

CHG: New macOS Solid-Earth binaries packaging script; clean up; minor bug fix

Location:
issm/trunk-jpl
Files:
7 edited
2 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/boost/install-1.7-mac.sh

    r25224 r25244  
    3939
    4040# Set install_name for all shared libraries
     41#
     42# NOTE: The install_name_tool prints an error message on some installations,
     43#               but this is not a shell error, and it does not seem to affect the
     44#               Boost libraries called by ISSM. For now, we are simply redirecting the
     45#               error to null.
     46#
     47# TODO:
     48# - Modify the source to apply absolute paths to the library ids so that
     49#       patching it after the fact with install_name_tool is not necessary.
     50#
    4151cd ${BOOST_ROOT}/install/lib
    4252for name in *.dylib; do
    43         install_name_tool -id ${BOOST_ROOT}/install/lib/${name} ${name}
     53        install_name_tool -id ${BOOST_ROOT}/install/lib/${name} ${name} 2>/dev/null
    4454done

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

    r25243 r25244  
    2828        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2929        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
     30        --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
    3031        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
    31         --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
    32         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
    33         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
    3432        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
    35         --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
    36         --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
    37         --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
     33        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install
    3834'
     35
     36#-------------------#
     37# External Packages #
     38#-------------------#
     39
     40#List of external pakages to be installed and their installation scripts
     41EXTERNALPACKAGES="
     42        autotools               install.sh
     43        cmake                   install.sh
     44        petsc                   install-3.12-mac-solid_earth-static.sh
     45        boost                   install-1.7-mac-static.sh
     46        triangle                install-mac-static.sh
     47        chaco                   install.sh
     48        m1qn3                   install.sh
     49        semic                   install.sh
     50        curl                    install-7.67-static.sh
     51        netcdf                  install-4.7-mac-parallel-static.sh
     52        proj                    install-6.2-static.sh
     53        gdal                    install-3-python-netcdf-static.sh
     54        gshhg                   install.sh
     55        gmt                             install-6.0-mac-static.sh
     56        gmsh                    install-4-static.sh
     57        shell2junit             install.sh
     58"
     59
     60#---------#
     61# Testing #
     62#---------#
    3963
    4064# Test suites
    … …  
    4468EXAMPLES_TEST=0
    4569
    46 #-------------------#
    47 # External Packages #
    48 #-------------------#
    49 
    50 EXTERNALPACKAGES="
    51         autotools       install.sh
    52         cmake           install.sh
    53         petsc           install-3.12-mac-static.sh
    54         gsl                     install-static.sh
    55         boost           install-1.7-mac-static.sh
    56         dakota          install-6.2-mac-static.sh
    57         triangle        install-mac-static.sh
    58         chaco           install.sh
    59         m1qn3           install.sh
    60         semic           install.sh
    61         shell2junit     install.sh
    62 "
    63 
    64 #---------#
    65 # Testing #
    66 #---------#
    67 
    6870# Number of CPUs used in ISSM compilation
    6971#
    … …  
    7173#               compilation
    7274#
    73 NUMCPUS_INSTALL=1
     75NUMCPUS_INSTALL=4
    7476
    7577# Number of CPUs used in the nightly runs
    … …  
    8082# See documentation in test/NightlyRun/runme.* for more information.
    8183#
     84MATLAB_NROPTIONS=""
    8285PYTHON_NROPTIONS=""
    83 MATLAB_NROPTIONS=""

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-solid_earth.sh

    r25196 r25244  
    11#!/bin/bash
    22
     3
     4# Script to test, package, and transfer distributable to ISSM Web site.
     5# Corresponds with build generated by configuration in
     6# $ISSM_DIR/jenkins/ross-debian_linux-binaries-solid_earth.
     7#
    38
    49## Constants
    … …  
    1217TARBALL_NAME="issm-linux-solid_earth"
    1318TARBALL="${TARBALL_NAME}.tar.gz"
     19
     20## Environment
     21#
     22export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
    1423
    1524# Check if MATLAB exists
    … …  
    8897# Check that MATLAB did not exit in error
    8998matlabExitCode=`echo $?`
    90 matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     99matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
    91100
    92101if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh

    r25196 r25244  
    11#!/bin/bash
    22
     3
     4# Script to test, package, and transfer distributable to ISSM Web site.
     5# Corresponds with build generated by configuration in
     6# $ISSM_DIR/jenkins/ross-debian_linux-binaries-with_dakota.
     7#
    38
    49## Constants
    … …  
    1217TARBALL_NAME="issm-linux-with_dakota"
    1318TARBALL="${TARBALL_NAME}.tar.gz"
     19
     20## Environment
     21#
     22export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
    1423
    1524# Check if MATLAB exists
    … …  
    6271# Check that MATLAB did not exit in error
    6372matlabExitCode=`echo $?`
    64 matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     73matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
    6574
    6675if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

    r25196 r25244  
    11#!/bin/bash
    22
     3
     4# Script to test, package, and transfer distributable to ISSM Web site.
     5# Corresponds with build generated by configuration in
     6# $ISSM_DIR/jenkins/ross-debian_linux-binaries.
     7#
    38
    49## Constants
    … …  
    1116TARBALL_NAME="issm-linux"
    1217TARBALL="${TARBALL_NAME}.tar.gz"
     18
     19## Environment
     20#
     21export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
    1322
    1423# Check if MATLAB exists
    … …  
    5968# Check that MATLAB did not exit in error
    6069matlabExitCode=`echo $?`
    61 matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     70matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
    6271
    6372if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-solid_earth.sh

    r25242 r25244  
    22
    33
     4# Script to test, package, and transfer distributable to ISSM Web site.
     5# Corresponds with build generated by configuration in
     6# $ISSM_DIR/jenkins/pine_island-mac-binaries-solid_earth.
     7#
     8
    49## Constants
    510#
    6 MATLAB_NROPTIONS="'id',[IdFromString('Dakota')],'exclude',[234,235,418,420,444,445]"
     11MATLAB_NROPTIONS="'benchmark','slr'"
    712MATLAB_PATH="/Applications/MATLAB_R2018a.app"
    8 PACKAGE="ISSM" # Name of directory to copy distributable files to
    9 PYTHON_NROPTIONS="--include_name 'Dakota' --exclude 234 417 418 420 444 445"
    10 TARBALL_NAME="issm-mac-with_dakota"
     13PACKAGE="ISSM-Solid_Earth" # Name of directory to copy distributable files to
     14PYTHON_NROPTIONS="--benchmark slr"
     15TARBALL_NAME="issm-linux-solid_earth"
    1116TARBALL="${TARBALL_NAME}.tar.gz"
     17
     18## Environment
     19#
     20export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
    1221
    1322# Check if MATLAB exists
    … …  
    4251fi
    4352
     53echo "Moving GDAL binaries to bin/"
     54if [ -f ${ISSM_DIR}/externalpackages/gdal/install/bin/gdal-config ]; then
     55        cp ${ISSM_DIR}/externalpackages/gdal/install/bin/gdalsrsinfo .
     56        cp ${ISSM_DIR}/externalpackages/gdal/install/bin/gdaltransform .
     57else
     58        echo "GDAL not found"
     59        exit 1
     60fi
     61
     62echo "Moving GMT binaries to bin/"
     63if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
     64        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
     65        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
     66else
     67        echo "GMT not found"
     68        exit 1
     69fi
     70
     71echo "Moving Gmsh binaries to bin/"
     72if [ -f ${ISSM_DIR}/externalpackages/gmsh/install/bin/gmsh ]; then
     73        cp ${ISSM_DIR}/externalpackages/gmsh/install/bin/gmsh .
     74else
     75        echo "Gmsh not found"
     76        exit 1
     77fi
     78
    4479# Run tests
    4580echo "Running tests"
    … …  
    5691# Check that MATLAB did not exit in error
    5792matlabExitCode=`echo $?`
    58 matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     93matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
    5994
    6095if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh

    r25196 r25244  
    11#!/bin/bash
    22
     3
     4# Script to test, package, and transfer distributable to ISSM Web site.
     5# Corresponds with build generated by configuration in
     6# $ISSM_DIR/jenkins/pine_island-mac-binaries-with_dakota.
     7#
    38
    49## Constants
    … …  
    1015TARBALL_NAME="issm-mac-with_dakota"
    1116TARBALL="${TARBALL_NAME}.tar.gz"
     17
     18## Environment
     19#
     20export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
    1221
    1322# Check if MATLAB exists
    … …  
    5665# Check that MATLAB did not exit in error
    5766matlabExitCode=`echo $?`
    58 matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     67matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
    5968
    6069if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries.sh

    r25196 r25244  
    11#!/bin/bash
    22
     3
     4# Script to test, package, and transfer distributable to ISSM Web site.
     5# Corresponds with build generated by configuration in
     6# $ISSM_DIR/jenkins/pine_island-mac-binaries.
     7#
    38
    49## Constants
    … …  
    914TARBALL_NAME="issm-mac"
    1015TARBALL="${TARBALL_NAME}.tar.gz"
     16
     17## Environment
     18#
     19export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
    1120
    1221# Check if MATLAB exists
    … …  
    5463# Check that MATLAB did not exit in error
    5564matlabExitCode=`echo $?`
    56 matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     65matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
    5766
    5867if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then

  • issm/trunk-jpl/src/m/boundaryconditions/getlovenumbers.m

    r25166 r25244  
    3737
    3838        love_numbers=[...
    39      0           0          0          0          0          0          0
    40         -1.28740059 -1.00000000 -0.89858519 1.28740059 0.42519882 0.89858519 0.00000000
     39     0           0          0          0          0          0          0;
     40        -1.28740059 -1.00000000 -0.89858519 1.28740059 0.42519882 0.89858519 0.00000000;
    4141        -1.00025365 -0.30922675 0.02060926 1.69102690 0.46358648 0.67016399 0.61829668;
    4242        -1.06243501 -0.19927948 0.06801636 1.86315553 0.55741597 0.73270416 0.56270589;
Note: See TracChangeset for help on using the changeset viewer.