Changeset 24325


Ignore:
Timestamp:
11/11/19 22:54:50 (5 years ago)
Author:
jdquinn
Message:

CHG: Generalizing install scripts for use on both Ubuntu and macOS.

Location:
issm/trunk-jpl
Files:
6 added
6 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/jenkins/linux64_ross

    r24322 r24325  
    1 
    21#-------------------------------#
    32# 1: ISSM general configuration #
     
    5756#-----------------#
    5857
    59 #number of cpus used in ISSM installation and compilation (one is usually
    60 #safer as some packages are very sensitive to parallel compilation)
     58# Number of CPUs used in ISSM compilation
     59#
     60# NOTE: One is usually safer as some packages are very sensitive to parallel
     61#       compilation.
     62#
    6163NUMCPUS_INSTALL=10
    6264
  • issm/trunk-jpl/jenkins/linux64_ross_se

    r24237 r24325  
    1 
    21#-------------------------------#
    32# 1: ISSM general configuration #
     
    87
    98#ISSM CONFIGURATION
    10 ISSM_CONFIG='--prefix=$ISSM_DIR \
     9ISSM_CONFIG='\
     10        --prefix=$ISSM_DIR \
    1111        --disable-static \
    1212        --with-matlab-dir=$MATLAB_PATH \
    1313        --with-python-dir=/usr \
    1414        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
     15        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
     16        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
     17        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
     18        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
     19        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     20        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
     21        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     22        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    1523        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    16         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
    17         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    18         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
    19         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
    20         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    21         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    22         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    2324        --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
    24         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
    2525        --with-numthreads=4 \
    2626        --enable-development \
    27         --enable-debugging '
     27        --enable-debugging \
     28'
    2829
    29 #PYTHON and MATLAB testing
     30# Test suites
    3031MATLAB_TEST=1
    3132PYTHON_TEST=1
     33JAVASCRIPT_TEST=0
     34EXAMPLES_TEST=0
    3235
    3336#-----------------------------------#
     
    3639
    3740#List of external packages to be installed and their installation scripts
    38 EXTERNALPACKAGES="autotools     install.sh
    39                                                 cmake         install.sh
    40                                                 mpich         install-3.2-linux64.sh
    41                                                 petsc         install-3.7-linux64.sh
    42                                                 triangle      install-linux64.sh
    43                                                 boost         install-1.55-linux.sh
    44                                                 gshhg         install.sh
    45                                                 hdf5          install.sh
    46                                                 netcdf        install.sh
    47                                                 gmt           install.sh
    48                                                 gmsh          install.sh
    49                                                 shell2junit   install.sh"
     41EXTERNALPACKAGES="
     42        autotools       install.sh
     43        cmake           install.sh
     44        mpich           install-3.2-linux64.sh
     45        petsc           install-3.7-linux64.sh
     46        triangle        install-linux64.sh
     47        boost           install-1.55-linux.sh
     48        hdf5            install-1.10.sh
     49        netcdf          install-4.7.sh
     50        proj            install-6.2-macOS_64.sh
     51        gdal            install-3.0-macOS_64-netcdf.sh
     52        gshhg           install.sh
     53        gmt                     install.sh
     54        gmsh            install.sh
     55        shell2junit     install.sh
     56"
    5057
    5158#-----------------#
     
    5360#-----------------#
    5461
    55 #number of cpus used in ISSM installation and compilation (one is usually
    56 #safer as some packages are very sensitive to parallel compilation)
    57 NUMCPUS_INSTALL=5
     62# Number of CPUs used in ISSM compilation
     63#
     64# NOTE: One is usually safer as some packages are very sensitive to parallel
     65#       compilation.
     66#
     67NUMCPUS_INSTALL=10
    5868
    5969#number of cpus used in the nightly runs. (pb of access to all_vertices.txt if more than 1)
    60 NUMCPUS_RUN=1
     70NUMCPUS_RUN=5
    6171
    6272#Nightly run options. The matlab routine runme.m will be called
  • issm/trunk-jpl/jenkins/macosx_pine-island_examples

    r24321 r24325  
    44
    55# MATLAB path
    6 MATLAB_PATH="/Applications/MATLAB_R2015b.app"
     6MATLAB_PATH="/Applications/MATLAB_R2019b.app"
    77
    88# ISSM CONFIGURATION
     
    4343        hdf5            install-1.10.sh
    4444        netcdf          install-4.7.sh
    45         proj            install-6.2-macOS_64.sh
    46         gdal            install-3.0-macOS_64-netcdf.sh
     45        proj            install-6.2.sh
     46        gdal            install-3.0-netcdf.sh
    4747        gshhg           install.sh
    4848        gmt                     install.sh
Note: See TracChangeset for help on using the changeset viewer.