Changeset 24632


Ignore:
Timestamp:
03/03/20 13:58:31 (5 years ago)
Author:
jdquinn
Message:

CHG: Using PETSc 3.12 for Debian Linux builds; clean up

Location:
issm/trunk-jpl
Files:
2 added
12 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/etc/environment.sh

    r24611 r24632  
    196196if [ -d "$PETSC_DIR" ]; then
    197197        export PETSC_DIR
     198        path_prepend "${PETSC_DIR}/bin" # In case we have installed MPICH via PETSc
    198199        ld_library_path_append "${PETSC_DIR}/lib"
    199200fi
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh

    r24593 r24632  
    66#
    77DAK_ROOT=${ISSM_DIR}/externalpackages/dakota
    8 MPI_INSTALL=${ISSM_DIR}/externalpackages/mpich/install
     8MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install
    99VER="6.2"
    1010
    1111## Environment
    1212#
    13 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
     13export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
    1414export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
    1515export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
     
    1818export DAK_INSTALL=${DAK_ROOT}/install
    1919export DAK_SRC=${DAK_ROOT}/src
    20 export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
     20export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack -L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
    2121export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples
    2222
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh

    r24593 r24632  
    66#
    77DAK_ROOT=${ISSM_DIR}/externalpackages/dakota
    8 MPI_INSTALL=${ISSM_DIR}/externalpackages/mpich/install
     8MPI_INSTALL=${ISSM_DIR}/externalpackages/petsc/install
    99VER="6.2"
    1010
    1111## Environment
    1212#
    13 export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
     13export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2cblas" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
    1414export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
    1515export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
     
    1818export DAK_INSTALL=${DAK_ROOT}/install
    1919export DAK_SRC=${DAK_ROOT}/src
    20 export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
     20export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lf2clapack" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
    2121export MPIHOME=${MPI_INSTALL} # This appears to only be used by certain external packages and examples
    2222
  • issm/trunk-jpl/jenkins/ross-debian_linux

    r24593 r24632  
    1212        --with-matlab-dir=${MATLAB_PATH} \
    1313        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    14         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    15         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    16         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     14        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     15        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     16        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    1717        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    1818        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    3232        autotools       install-debian-linux.sh
    3333        cmake           install.sh
    34         mpich           install-3.3.sh
    35         lapack          install-3.8-linux.sh
    36         petsc           install-3.7-linux.sh
     34        petsc           install-3.12-linux.sh
    3735        triangle        install-linux.sh
    3836        chaco           install.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampioff

    r24593 r24632  
    1818        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    1919        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    20         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include  \
    21         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
     20        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
     21        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
    2222        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    23         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     23        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2424        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2525        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    4040        autotools       install-debian-linux.sh
    4141        cmake           install.sh
    42         mpich           install-3.3.sh
    43         lapack          install-3.8-linux.sh
    44         petsc           install-3.7-linux.sh
     42        petsc           install-3.12-linux.sh
    4543        triangle        install-linux.sh
    4644        gsl                     install-linux64.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion

    r24593 r24632  
    1818        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    1919        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    20         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include  \
    21         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
     20        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
     21        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
    2222        --with-ampi-dir=${ISSM_DIR}/externalpackages/adjoinablempi/install \
    2323        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    24         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     24        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2525        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2626        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    4141        autotools               install-debian-linux.sh
    4242        cmake                   install.sh
    43         mpich                   install-3.3.sh
    44         lapack                  install-3.8-linux.sh
    45         petsc                   install-3.7-linux.sh
     43        petsc                   install-3.12-linux.sh
    4644        triangle                install-linux.sh
    4745        gsl                             install-linux64.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-binaries

    r24593 r24632  
    1818        --with-matlab-dir=${MATLAB_PATH} \
    1919        --with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \
    20         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    21         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    22         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     20        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     21        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     22        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2323        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2424        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    3737        autotools       install-debian-linux.sh
    3838        cmake           install.sh
    39         mpich           install-3.3-static.sh
    40         lapack          install-3.8-linux-static.sh
    41         petsc           install-3.7-linux-static.sh
     39        petsc           install-3.12-linux-static.sh
    4240        triangle        install-linux-static.sh
    4341        chaco           install.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-binaries-with_dakota

    r24593 r24632  
    2121        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    2222        --with-fortran-lib="-L${ISSM_DIR}/lib -lgfortran" \
    23         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    24         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    25         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     23        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     24        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     25        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2626        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2727        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    4343        autotools       install-debian-linux.sh
    4444        cmake           install.sh
    45         mpich           install-3.3-static.sh
    46         lapack          install-3.8-linux-static.sh
    47         petsc           install-3.7-linux-static.sh
     45        petsc           install-3.12-linux-static.sh
    4846        boost           install-1.55-linux-static.sh
    4947        dakota          install-6.2-linux-static.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-codipack

    r24593 r24632  
    1616        --with-matlab-dir=${MATLAB_PATH} \
    1717        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    18         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    19         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    20         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     18        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     19        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     20        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2121        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2222        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    3838        autotools       install-debian-linux.sh
    3939        cmake           install.sh
    40         mpich           install-3.3.sh
    41         lapack          install-3.8-linux.sh
    42         petsc           install-3.7-linux.sh
     40        petsc           install-3.12-linux.sh
    4341        triangle        install-linux.sh
    4442        chaco           install.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-dakota

    r24593 r24632  
    1616        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    1717        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    18         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    19         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    20         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     18        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     19        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     20        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2121        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2222        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    3838        autotools       install-debian-linux.sh
    3939        cmake           install.sh
    40         mpich           install-3.3.sh
    41         lapack          install-3.8-linux.sh
    42         petsc           install-3.7-linux.sh
     40        petsc           install-3.12-linux.sh
    4341        boost           install-1.55-linux.sh
    4442        dakota          install-6.2-linux.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-gia

    r24593 r24632  
    1515        --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
    1616        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    17         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    18         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    19         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     17        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     18        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     19        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2020        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2121        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    3333        autotools       install-debian-linux.sh
    3434        cmake           install.sh
    35         mpich           install-3.3.sh
    36         lapack          install-3.8-linux.sh
    37         petsc           install-3.7-linux.sh
     35        petsc           install-3.12-linux.sh
    3836        triangle        install-linux.sh
    3937        math77          install.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-iceocean

    r24593 r24632  
    1313        --with-matlab-dir=${MATLAB_PATH} \
    1414        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    15         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    16         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    17         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     15        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     16        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     17        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    1818        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    1919        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    3333        autotools       install-debian-linux.sh
    3434        cmake           install.sh
    35         mpich           install-3.3.sh
    36         lapack          install-3.8-linux.sh
    37         petsc           install-3.7-linux.sh
     35        petsc           install-3.12-linux.sh
    3836        triangle        install-linux.sh
    3937        chaco           install.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-javascript

    r24599 r24632  
    44
    55ISSM_CONFIG='\
    6     --prefix=${ISSM_DIR} \
    7     --disable-shared \
    8     --enable-development \
    9     --enable-debugging \
    10     --with-javascript \
    11     --without-fortran \
    12     --without-GiaIvins \
    13     --without-Love \
    14     --without-kml \
    15     --without-kriging \
    16     --with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install-javascript" \
    17     --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install-javascript" \
     6        --prefix=${ISSM_DIR} \
     7        --disable-shared \
     8        --enable-development \
     9        --enable-debugging \
     10        --with-javascript \
     11        --without-fortran \
     12        --without-GiaIvins \
     13        --without-Love \
     14        --without-kml \
     15        --without-kriging \
     16        --with-gsl-dir="${ISSM_DIR}/externalpackages/gsl/install-javascript" \
     17        --with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install-javascript" \
    1818'
    1919
     
    2323
    2424EXTERNALPACKAGES="
    25     autotools   install-debian-linux.sh
    26     cmake       install.sh
    27     emscripten  install.sh
    28     gsl         install-javascript.sh
    29     triangle    install-linux-javascript.sh
    30     shell2junit install.sh
     25        autotools       install-debian-linux.sh
     26        cmake           install.sh
     27        emscripten      install.sh
     28        gsl                     install-javascript.sh
     29        triangle        install-linux-javascript.sh
     30        shell2junit     install.sh
    3131"
    3232
     
    4444#
    4545# NOTE: One is usually safer as some packages are very sensitive to parallel
    46 #       compilation.
     46#               compilation.
    4747#
    4848NUMCPUS_INSTALL=8
  • issm/trunk-jpl/jenkins/ross-debian_linux-python

    r24593 r24632  
    1212        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    1313        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
    14         --with-mpi-include=${ISSM_DIR}/externalpackages/mpich/install/include \
    15         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    16         --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     14        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     15        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     16        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    1717        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    1818        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    2929#-------------------#
    3030
    31 # TODO:
    32 # - After upgrading Jenkins nodes to Ubuntu 18, use MPICH 3.3 and PETSc 3.11
    33 #       (which will install zlib, HDF5, and NetCDF).
    34 #
    3531EXTERNALPACKAGES="
    3632        autotools       install-debian-linux.sh
    3733        cmake           install.sh
    38         mpich           install-3.3.sh
    39         lapack          install-3.8-linux.sh
    40         petsc           install-3.7-linux.sh
     34        petsc           install-3.12-linux.sh
    4135        triangle        install-linux.sh
    4236        chaco           install.sh
  • issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

    r24593 r24632  
    1414        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    1515        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -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-blas-lapack-dir=${ISSM_DIR}/externalpackages/lapack/install \
     16        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
     17        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     18        --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    1919        --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2020        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
     
    3232        autotools       install-debian-linux.sh
    3333        cmake           install.sh
    34         mpich           install-3.3.sh
    35         lapack          install-3.8-linux.sh
    36         petsc           install-3.7-linux.sh
     34        petsc           install-3.12-linux.sh
    3735        triangle        install-linux.sh
    3836        chaco           install.sh
  • issm/trunk-jpl/m4/issm_options.m4

    r24620 r24632  
    585585                                                if test "${BOOST_VERSION_MINOR}" == "55"; then
    586586                                                        DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    587                                                         DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L$BOOST_ROOT/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
     587                                                        DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
    588588                                                elif test "${BOOST_VERSION_MINOR}" = "72"; then
    589589                                                        DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    590590                                                        dnl See $ISSM_DIR/dakota/build/src/Makefile.export.Dakota -> Dakota_LIBRARIES
    591                                                         DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
     591                                                        DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system ${BLASLAPACKLIB}"
    592592                                                fi
    593593                                        fi
     
    598598                                                if test "${BOOST_VERSION_MINOR}" == "55"; then
    599599                                                        DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    600                                                         DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L$BOOST_ROOT/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
     600                                                        DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -L$BOOST_ROOT/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
    601601                                                elif test "${BOOST_VERSION_MINOR}" == "72"; then
    602602                                                        DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
    603                                                         DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system -L${BLASLAPACK_ROOT}/lib -llapack -lblas"
     603                                                        DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchosremainder -lteuchosnumerics -lteuchoscomm -lteuchosparameterlist -lteuchosparser -lteuchoscore -lpecos_util -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lapproxnn -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system ${BLASLAPACKLIB}"
    604604                                                fi
    605605                                        fi
     
    11021102        fi
    11031103        AM_CONDITIONAL([MEDIPACK], [test "x${HAVE_MEDIPACK}" == "xyes"])
     1104        dnl }}}
     1105        dnl PETSc{{{
     1106        AC_ARG_WITH(
     1107                [petsc-dir],
     1108                AS_HELP_STRING([--with-petsc-dir=DIR], [PETSc root directory, necessary for parallel build]),
     1109                [PETSC_ROOT=${withval}],
     1110                [PETSC_ROOT="no"]
     1111        )
     1112        AC_MSG_CHECKING([for PETSc])
     1113        if test "x${PETSC_ROOT}" == "xno"; then
     1114                HAVE_PETSC=no
     1115        else
     1116                HAVE_PETSC=yes
     1117                if ! test -d "${PETSC_ROOT}"; then
     1118                        AC_MSG_ERROR([PETSc directory provided (${PETSC_ROOT}) does not exist!]);
     1119                fi
     1120        fi
     1121        AC_MSG_RESULT([${HAVE_PETSC}])
     1122        AM_CONDITIONAL([PETSC], [test "x${HAVE_PETSC}" == "xyes"])
     1123
     1124        dnl PETSc libraries and header files
     1125        if test "x${HAVE_PETSC}" == "xyes"; then
     1126                AC_MSG_CHECKING(for PETSc version)
     1127                if ! test -f "${PETSC_ROOT}/include/petscversion.h"; then
     1128                        AC_MSG_ERROR([PETSc not instaled correctly: file (${PETSC_ROOT}/include/petscversion.h) does not exist!]);
     1129                fi
     1130                PETSC_MAJOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
     1131                PETSC_MINOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
     1132                AC_DEFINE_UNQUOTED(_PETSC_MAJOR_, $PETSC_MAJOR, [PETSc version major])
     1133                AC_DEFINE_UNQUOTED(_PETSC_MINOR_, $PETSC_MINOR, [PETSc version minor])
     1134                AC_MSG_RESULT([${PETSC_MAJOR}.${PETSC_MINOR}])
     1135
     1136                dnl PETSC_VERSION_DATE_HG=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `
     1137                PETSC_RELEASE=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_RELEASE" | sed 's/#define PETSC_VERSION_RELEASE//' | sed 's/ //g'`
     1138
     1139                AC_MSG_CHECKING(whether PETSc is the development version)
     1140                dnl if test "x${PETSC_VERSION_DATE_HG}" == "xunknown"; then
     1141                if test "${PETSC_RELEASE}" == "0"; then
     1142                        AC_DEFINE([_HAVE_PETSCDEV_], [1], [with PETSc-dev])
     1143                        AC_MSG_RESULT([yes])
     1144                else
     1145                        AC_MSG_RESULT([no])
     1146                fi
     1147
     1148                AC_ARG_WITH(
     1149                        [petsc-arch],
     1150                        AS_HELP_STRING([--with-petsc-arch=DIR], [PETSc arch, necessary for PETSc < 3.0]),
     1151                        [PETSC_ARCH=${withval}],
     1152                        [PETSC_ARCH=""]
     1153                )
     1154
     1155                AC_MSG_CHECKING(for PETSc libraries and header files in ${PETSC_ROOT})
     1156                dnl To get PETSc's libraries,
     1157                dnl
     1158                dnl             cd $ISSM_DIR/externalpackages/petsc/src
     1159                dnl             make getlinklibs
     1160                dnl
     1161                PETSCINCL=" -I${PETSC_ROOT}/include"
     1162                dnl Add other location (not needed anymore since at least PETSc 3.0)
     1163                if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/${PETSC_ARCH}/include"; then
     1164                        PETSCINCL+=" ${PETSC_ROOT}/${PETSC_ARCH}/include"
     1165                fi
     1166                if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/include/${PETSC_ARCH}"; then
     1167                        PETSCINCL+=" ${PETSC_ROOT}/include/${PETSC_ARCH}"
     1168                fi
     1169
     1170                case "${host_os}" in
     1171                        *cygwin*)
     1172                                if test ${PETSC_MAJOR} -lt 3; then
     1173                                        PETSCLIB=-Wl,/LIBPATH:`cygpath -w ${PETSC_ROOT}/lib` -Wl,libpetscksp.lib  -Wl,libpetscdm.lib -Wl,libpetscmat.lib -Wl,libpetscvec.lib -Wl,libpetscsnes.lib  -Wl,libpetscts.lib -Wl,libmpiuni.lib -Wl,libpetsc.lib
     1174                                else
     1175                                        PETSCLIB="/link -Wl,/LIBPATH:`cygpath -m ${PETSC_ROOT}/lib` -Wl,libpetsc.lib"
     1176                                        PETSCINCL="/I`cygpath -m ${PETSC_ROOT}/include`"
     1177                                fi
     1178                        ;;
     1179                        *linux*)
     1180                                if test ${PETSC_MAJOR} -lt 3; then
     1181                                        PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc"
     1182                                else
     1183                                        PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc -ldl"
     1184                                        if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
     1185                                                PETSCLIB+=" -lparmetis -lmetis"
     1186                                        fi
     1187                                fi
     1188                                if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s"; then
     1189                                        PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real -lmetis"
     1190                                fi
     1191                        ;;
     1192                        *darwin*)
     1193                                if test ${PETSC_MAJOR} -lt 3; then
     1194                                        PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
     1195                                else
     1196                                        PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc"
     1197                                        if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
     1198                                                PETSCLIB+=" -lmetis"
     1199                                        fi
     1200                                fi
     1201                        ;;
     1202                esac
     1203                AC_MSG_RESULT([done])
     1204                AC_DEFINE([_HAVE_PETSC_], [1], [with PETSc in ISSM src])
     1205                AC_SUBST([PETSCINCL])
     1206                AC_SUBST([PETSCLIB])
     1207        fi
    11041208        dnl }}}
    11051209        dnl MPI{{{
     
    11671271        AM_CONDITIONAL([MPI], [test "x${HAVE_MPI}" == "xyes"])
    11681272        AC_MSG_RESULT([${HAVE_MPI}])
    1169         dnl }}}
    1170         dnl PETSc{{{
    1171         AC_ARG_WITH(
    1172                 [petsc-dir],
    1173                 AS_HELP_STRING([--with-petsc-dir=DIR], [PETSc root directory, necessary for parallel build]),
    1174                 [PETSC_ROOT=${withval}],
    1175                 [PETSC_ROOT="no"]
    1176         )
    1177         AC_MSG_CHECKING([for PETSc])
    1178         if test "x${PETSC_ROOT}" == "xno"; then
    1179                 HAVE_PETSC=no
    1180         else
    1181                 HAVE_PETSC=yes
    1182                 if ! test -d "${PETSC_ROOT}"; then
    1183                         AC_MSG_ERROR([PETSc directory provided (${PETSC_ROOT}) does not exist!]);
    1184                 fi
    1185         fi
    1186         AC_MSG_RESULT([${HAVE_PETSC}])
    1187         AM_CONDITIONAL([PETSC], [test "x${HAVE_PETSC}" == "xyes"])
    1188 
    1189         dnl PETSc libraries and header files
    1190         if test "x${HAVE_PETSC}" == "xyes"; then
    1191                 AC_MSG_CHECKING(for PETSc version)
    1192                 if ! test -f "${PETSC_ROOT}/include/petscversion.h"; then
    1193                         AC_MSG_ERROR([PETSc not instaled correctly: file (${PETSC_ROOT}/include/petscversion.h) does not exist!]);
    1194                 fi
    1195                 PETSC_MAJOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
    1196                 PETSC_MINOR=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
    1197                 AC_DEFINE_UNQUOTED(_PETSC_MAJOR_, $PETSC_MAJOR, [PETSc version major])
    1198                 AC_DEFINE_UNQUOTED(_PETSC_MINOR_, $PETSC_MINOR, [PETSc version minor])
    1199                 AC_MSG_RESULT([${PETSC_MAJOR}.${PETSC_MINOR}])
    1200 
    1201                 dnl PETSC_VERSION_DATE_HG=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `
    1202                 PETSC_RELEASE=`cat ${PETSC_ROOT}/include/petscversion.h | grep "#define PETSC_VERSION_RELEASE" | sed 's/#define PETSC_VERSION_RELEASE//' | sed 's/ //g'`
    1203 
    1204                 AC_MSG_CHECKING(whether PETSc is the development version)
    1205                 dnl if test "x${PETSC_VERSION_DATE_HG}" == "xunknown"; then
    1206                 if test "${PETSC_RELEASE}" == "0"; then
    1207                         AC_DEFINE([_HAVE_PETSCDEV_], [1], [with PETSc-dev])
    1208                         AC_MSG_RESULT([yes])
    1209                 else
    1210                         AC_MSG_RESULT([no])
    1211                 fi
    1212 
    1213                 AC_ARG_WITH(
    1214                         [petsc-arch],
    1215                         AS_HELP_STRING([--with-petsc-arch=DIR], [PETSc arch, necessary for PETSc < 3.0]),
    1216                         [PETSC_ARCH=${withval}],
    1217                         [PETSC_ARCH=""]
    1218                 )
    1219 
    1220                 AC_MSG_CHECKING(for PETSc libraries and header files in ${PETSC_ROOT})
    1221                 dnl To get PETSc's libraries,
    1222                 dnl
    1223                 dnl             cd $ISSM_DIR/externalpackages/petsc/src
    1224                 dnl             make getlinklibs
    1225                 dnl
    1226                 PETSCINCL=" -I${PETSC_ROOT}/include"
    1227                 dnl Add other location (not needed anymore since at least PETSc 3.0)
    1228                 if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/${PETSC_ARCH}/include"; then
    1229                         PETSCINCL+=" ${PETSC_ROOT}/${PETSC_ARCH}/include"
    1230                 fi
    1231                 if test -n "${PETSC_ARCH}" && test -d "${PETSC_ROOT}/include/${PETSC_ARCH}"; then
    1232                         PETSCINCL+=" ${PETSC_ROOT}/include/${PETSC_ARCH}"
    1233                 fi
    1234 
    1235                 case "${host_os}" in
    1236                         *cygwin*)
    1237                                 if test ${PETSC_MAJOR} -lt 3; then
    1238                                         PETSCLIB=-Wl,/LIBPATH:`cygpath -w ${PETSC_ROOT}/lib` -Wl,libpetscksp.lib  -Wl,libpetscdm.lib -Wl,libpetscmat.lib -Wl,libpetscvec.lib -Wl,libpetscsnes.lib  -Wl,libpetscts.lib -Wl,libmpiuni.lib -Wl,libpetsc.lib
    1239                                 else
    1240                                         PETSCLIB="/link -Wl,/LIBPATH:`cygpath -m ${PETSC_ROOT}/lib` -Wl,libpetsc.lib"
    1241                                         PETSCINCL="/I`cygpath -m ${PETSC_ROOT}/include`"
    1242                                 fi
    1243                         ;;
    1244                         *linux*)
    1245                                 if test ${PETSC_MAJOR} -lt 3; then
    1246                                         PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc"
    1247                                 else
    1248                                         PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc -ldl"
    1249                                         if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
    1250                                                 PETSCLIB+=" -lparmetis -lmetis"
    1251                                         fi
    1252                                 fi
    1253                                 if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s"; then
    1254                                         PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real -lmetis"
    1255                                 fi
    1256                         ;;
    1257                         *darwin*)
    1258                                 if test ${PETSC_MAJOR} -lt 3; then
    1259                                         PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
    1260                                 else
    1261                                         PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc"
    1262                                         if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then
    1263                                                 PETSCLIB+=" -lmetis"
    1264                                         fi
    1265                                 fi
    1266                         ;;
    1267                 esac
    1268                 AC_MSG_RESULT([done])
    1269                 AC_DEFINE([_HAVE_PETSC_], [1], [with PETSc in ISSM src])
    1270                 AC_SUBST([PETSCINCL])
    1271                 AC_SUBST([PETSCLIB])
    1272         fi
    12731273        dnl }}}
    12741274        dnl SCOTCH{{{
     
    15991599                                if ls ${BLASLAPACK_ROOT}/lib/libopenblas.* 1> /dev/null 2>&1; then
    16001600                                        BLASLAPACKLIB+=" -lopenblas"
    1601                                 elif ls ${BLASLAPACK_ROOT}/lib/liblapack.* 1> /dev/null 2>&1; then
     1601                                elif ls ${BLASLAPACK_ROOT}/lib/libf2clapack.* 1> /dev/null 2>&1; then
     1602                                        BLASLAPACKLIB+=" -lf2clapack -lf2cblas"
     1603                                elif ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then
     1604                                        BLASLAPACKLIB+=" -lflapack -lfblas"
     1605                                else
    16021606                                        BLASLAPACKLIB+=" -llapack -lblas"
    1603                                 else
    1604                                         BLASLAPACKLIB+=" -lflapack -lfblas"
    16051607                                fi
    16061608                        ;;
     
    16091611                                if ls ${BLASLAPACK_ROOT}/lib/libopenblas.* 1> /dev/null 2>&1; then
    16101612                                        BLASLAPACKLIB+=" -lopenblas"
    1611                                 elif ls ${BLASLAPACK_ROOT}/lib/liblapack.* 1> /dev/null 2>&1; then
     1613                                elif ls ${BLASLAPACK_ROOT}/lib/libf2clapack.* 1> /dev/null 2>&1; then
     1614                                        BLASLAPACKLIB+=" -lf2clapack -lf2cblas"
     1615                                elif ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then
     1616                                        BLASLAPACKLIB+=" -lflapack -lfblas"
     1617                                else
    16121618                                        BLASLAPACKLIB+=" -llapack -lblas"
    1613                                 else
    1614                                         BLASLAPACKLIB+=" -lflapack -lfblas"
    16151619                                fi
    16161620                        ;;
  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh

    r24593 r24632  
    3434
    3535echo "Moving MPICH binaries to bin/"
    36 if [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
     36if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then
     37        cp ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec .
     38        cp ${ISSM_DIR}/externalpackages/petsc/install/bin/hydra_pmi_proxy .
     39elif [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
    3740        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec .
    3841        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy .
    3942else
    4043        echo "MPICH not found"
     44        exit 1
    4145fi
    4246
     
    127131python -m compileall ${PACKAGE}/bin # Precompile all Python scripts to bytecode
    128132rm -f ${PACKAGE}/bin/*.py # Remove all Python scripts
     133rm -f ${PACKAGE}/bin/generic_static.* # Remove static versions of generic cluster classes
    129134rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package
    130135rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package
  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

    r24593 r24632  
    2323echo "Modify generic"
    2424cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
    25 rm generic_static.m
    2625
    2726echo "Moving MPICH binaries to bin/"
    28 if [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
     27if [ -f ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec ]; then
     28        cp ${ISSM_DIR}/externalpackages/petsc/install/bin/mpiexec .
     29        cp ${ISSM_DIR}/externalpackages/petsc/install/bin/hydra_pmi_proxy .
     30elif [ -f ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec ]; then
    2931        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/mpiexec .
    30         cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy
     32        cp ${ISSM_DIR}/externalpackages/mpich/install/bin/hydra_pmi_proxy .
    3133else
    3234        echo "MPICH not found"
     35        exit 1
    3336fi
    3437
     
    8083cp -rf bin examples lib scripts test ${PACKAGE}/
    8184echo "Cleaning up unneeded/unwanted files"
     85rm -f ${PACKAGE}/bin/generic_static.* # Remove static versions of generic cluster classes
    8286rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package
    8387rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package
Note: See TracChangeset for help on using the changeset viewer.