Changeset 25959


Ignore:
Timestamp:
01/28/21 01:01:03 (4 years ago)
Author:
jdquinn
Message:

CHG: Various pending minor fixes

Location:
issm/trunk-jpl
Files:
1 added
1 deleted
24 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/examples/ISMIP/runme.m

    r25915 r25959  
    66
    77% parameter file to be used, choose between IsmipA.par or IsmipF.par
    8 ParamFile='IsmipA.par'
     8ParamFile='IsmipA.par';
    99
    1010%Run Steps

  • issm/trunk-jpl/externalpackages/cmake/install.sh

    r25860 r25959  
    55## Constants
    66#
    7 VER="3.19.1"
     7VER="3.19.3"
    88
    9 PREFIX="${ISSM_DIR}/externalpackages/cmake/install" # Set to location where external package should be installed
     9PREFIX="${ISSM_DIR}/cmake/install" # Set to location where external package should be installed
    1010
    1111# Download source
    … …  
    1616
    1717# Cleanup
    18 rm -rf ${PREFIX}
     18rm -rf ${PREFIX} src
     19mkdir -p ${PREFIX}
    1920
    20 # Move source into target directory
    21 mv cmake-${VER} ${PREFIX}
     21# Move source into 'src' directory
     22mv cmake-${VER} src
    2223
    2324# Configure
    24 cd ${PREFIX}
     25cd src
    2526#./bootstrap \
    2627#       --prefix=${PREFIX} # Breaks on ronne
    2728./configure \
    28         --prefix=${PREFIX}
     29        --prefix="${PREFIX}"
    2930
    30 # Compile
     31# Compile and install
    3132if [ $# -eq 0 ]; then
    3233        make
     34        make install
    3335else
    34         make -j $1;
     36        make -j $1
     37        make install -j $1
    3538fi

  • issm/trunk-jpl/externalpackages/petsc/install-3.12-linux-static.sh

    r25860 r25959  
    1818# Cleanup
    1919rm -rf ${PREFIX} ${PETSC_DIR}
    20 mkdir -p ${PREFIX} ${PETSC_DIR}
     20mkdir -p ${PETSC_DIR}
    2121
    2222# Move source to $PETSC_DIR

  • issm/trunk-jpl/externalpackages/petsc/install-3.12-linux.sh

    r25860 r25959  
    77VER="3.12.3"
    88
    9 PETSC_DIR=${ISSM_DIR}/externalpackages/petsc/src # DO NOT CHANGE THIS
     9PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
    1010PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
    1111
    … …  
    1818# Cleanup
    1919rm -rf ${PREFIX} ${PETSC_DIR}
    20 mkdir -p ${PREFIX} ${PETSC_DIR}
     20mkdir ${PETSC_DIR}
    2121
    2222# Move source to $PETSC_DIR

  • issm/trunk-jpl/externalpackages/petsc/install-3.12-mac-static.sh

    r25860 r25959  
    1818# Cleanup
    1919rm -rf ${PREFIX} ${PETSC_DIR}
    20 mkdir -p ${PREFIX} ${PETSC_DIR}
     20mkdir -p ${PETSC_DIR}
    2121
    2222# Move source to $PETSC_DIR

  • issm/trunk-jpl/externalpackages/petsc/install-3.12-mac.sh

    r25860 r25959  
    77VER="3.12.3"
    88
    9 PETSC_DIR=${ISSM_DIR}/externalpackages/petsc/src # DO NOT CHANGE THIS
     9PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" # DO NOT CHANGE THIS
    1010PREFIX="${ISSM_DIR}/externalpackages/petsc/install" # Set to location where external package should be installed
    1111
    … …  
    1818# Cleanup
    1919rm -rf ${PREFIX} ${PETSC_DIR}
    20 mkdir -p ${PREFIX} ${PETSC_DIR}
     20mkdir ${PETSC_DIR}
    2121
    2222# Move source to $PETSC_DIR

  • issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth

    r25860 r25959  
    3131
    3232EXTERNALPACKAGES="
    33         autotools               install-debian-linux.sh
     33        autotools               install-linux.sh
    3434        cmake                   install.sh
    3535        petsc                   install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/jenkins.sh

    r25927 r25959  
    447447
    448448        # Check that MATLAB did not exit in error
    449         matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run" matlab_log.log | wc -l`
     449        matlabExitedInError=`grep -E "Activation cannot proceed|Error in matlab_run|Illegal use of reserved keyword" matlab_log.log | wc -l`
    450450
    451451        if [ $matlabExitedInError -ne 0 ]; then

  • issm/trunk-jpl/jenkins/pine_island-mac-examples

    r25922 r25959  
    1717        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
    1818        --with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.0/lib/gcc/10 -lgfortran" \
    19         --with-mpi-include=${ISSM_EXT_DIR}/externalpackages/petsc/install/include \
    20         --with-mpi-libflags="-L${ISSM_EXT_DIR}/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
    21         --with-blas-lapack-dir=${ISSM_EXT_DIR}/petsc/install \
    22         --with-metis-dir=${ISSM_EXT_DIR}/petsc/install \
    23         --with-scalapack-dir=${ISSM_EXT_DIR}/petsc/install \
    24         --with-mumps-dir=${ISSM_EXT_DIR}/petsc/install \
    25         --with-hdf5-dir=${ISSM_EXT_DIR}/petsc/install \
    26         --with-petsc-dir=${ISSM_EXT_DIR}/petsc/install \
    27         --with-gsl-dir=${ISSM_EXT_DIR}/gsl/install \
    28         --with-boost-dir=${ISSM_EXT_DIR}/boost/install \
    29         --with-dakota-dir=${ISSM_EXT_DIR}/dakota/install \
    30         --with-triangle-dir=${ISSM_EXT_DIR}/triangle/install \
    31         --with-chaco-dir=${ISSM_EXT_DIR}/chaco/install \
    32         --with-m1qn3-dir=${ISSM_EXT_DIR}/m1qn3/install \
    33         --with-semic-dir=${ISSM_EXT_DIR}/semic/install \
     19        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     20        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     21        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     22        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
     23        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     24        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
     25        --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
     26        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
     27        --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
     28        --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
     29        --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
     30        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
     31        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
     32        --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
     33        --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
    3434'
    3535

  • issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff

    r25765 r25959  
    3838#
    3939EXTERNALPACKAGES="
    40         autotools       install-debian-linux.sh
     40        autotools       install-linux.sh
    4141        cmake           install.sh
    4242        petsc           install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion

    r25801 r25959  
    3939#
    4040EXTERNALPACKAGES="
    41         autotools               install-debian-linux.sh
     41        autotools               install-linux.sh
    4242        cmake                   install.sh
    4343        petsc                   install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-basic

    r25820 r25959  
    3030
    3131EXTERNALPACKAGES="
    32         autotools       install-debian-linux.sh
     32        autotools       install-linux.sh
    3333        cmake           install.sh
    3434        petsc           install-3.12-linux.sh

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

    r25765 r25959  
    3838
    3939EXTERNALPACKAGES="
    40         autotools       install-debian-linux.sh
     40        autotools       install-linux.sh
    4141        cmake           install.sh
    4242        petsc           install-3.12-linux-static.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab

    r25860 r25959  
    4141
    4242EXTERNALPACKAGES="
    43         autotools       install-debian-linux.sh
     43        autotools       install-linux.sh
    4444        cmake           install.sh
    4545        petsc           install-3.12-linux-static.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python

    r25881 r25959  
    4040
    4141EXTERNALPACKAGES="
    42         autotools       install-debian-linux.sh
     42        autotools       install-linux.sh
    4343        cmake           install.sh
    4444        petsc           install-3.12-linux-static.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-codipack

    r25765 r25959  
    3636
    3737EXTERNALPACKAGES="
    38         autotools       install-debian-linux.sh
     38        autotools       install-linux.sh
    3939        cmake           install.sh
    4040        petsc           install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-dakota

    r25860 r25959  
    3939
    4040EXTERNALPACKAGES="
    41         autotools               install-debian-linux.sh
     41        autotools               install-linux.sh
    4242        cmake                   install.sh
    4343        petsc                   install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full

    r25860 r25959  
    4040
    4141EXTERNALPACKAGES="
    42         autotools       install-debian-linux.sh
     42        autotools       install-linux.sh
    4343        cmake           install.sh
    4444        petsc           install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind

    r25860 r25959  
    4040
    4141EXTERNALPACKAGES="
    42         autotools       install-debian-linux.sh
     42        autotools       install-linux.sh
    4343        cmake           install.sh
    4444        petsc           install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-gia

    r25765 r25959  
    3131
    3232EXTERNALPACKAGES="
    33         autotools       install-debian-linux.sh
     33        autotools       install-linux.sh
    3434        cmake           install.sh
    3535        petsc           install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-iceocean

    r25765 r25959  
    3131
    3232EXTERNALPACKAGES="
    33         autotools       install-debian-linux.sh
     33        autotools       install-linux.sh
    3434        cmake           install.sh
    3535        petsc           install-3.12-linux.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-javascript

    r25865 r25959  
    2323
    2424EXTERNALPACKAGES="
    25         autotools       install-debian-linux.sh
     25        autotools       install-linux.sh
    2626        cmake           install.sh
    2727        emscripten      install.sh

  • issm/trunk-jpl/jenkins/ross-debian_linux-python

    r25862 r25959  
    3434
    3535EXTERNALPACKAGES="
    36         autotools       install-debian-linux.sh
     36        autotools       install-linux.sh
    3737        cmake           install.sh
    3838        petsc           install-3.12-linux.sh

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

    r25862 r25959  
    3737
    3838EXTERNALPACKAGES="
    39         autotools               install-debian-linux.sh
     39        autotools               install-linux.sh
    4040        cmake                   install.sh
    4141        petsc                   install-3.12-linux.sh
Note: See TracChangeset for help on using the changeset viewer.