Changeset 24637


Ignore:
Timestamp:
03/04/20 16:38:00 (5 years ago)
Author:
jdquinn
Message:

CHG: Updated configuration for Mac to use PETSc 3.12

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

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/etc/environment.sh

    r24635 r24637  
    187187if [ -d "${MPI_DIR}" ]; then
    188188        export MPI_DIR
     189        export MPI_HOME=${MPI_DIR} # Needed by Dakota
    189190        export MPI_INC_DIR="$MPI_DIR/include"
    190191        path_prepend "${MPI_DIR}/bin"
    … …  
    202203                MPI_DIR=${PETSC_DIR}
    203204                export MPI_DIR
     205                export MPI_HOME=${MPI_DIR} # Needed by Dakota
    204206                export MPI_INC_DIR="${MPI_DIR}/include"
    205207                path_prepend "${MPI_DIR}/bin"

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

    r24418 r24637  
    1111
    1212# Unpack source
    13 tar -zxvf  petsc-$VER.tar.gz
     13tar -zxvf petsc-${VER}.tar.gz
    1414
    1515# Cleanup
    … …  
    1818
    1919# Move source to 'src' directory
    20 mv petsc-$VER/* src/
    21 rm -rf petsc-$VER
     20mv petsc-${VER}/* src/
     21rm -rf petsc-${VER}
    2222
    2323# Configure
    … …  
    2626        --prefix="${ISSM_DIR}/externalpackages/petsc/install" \
    2727        --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
    28         --with-mpi-dir="${ISSM_DIR}/externalpackages/mpich/install" \
    29         --with-blas-lib="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" \
    30         --with-lapack-lib="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" \
    3128        --with-debugging=0 \
    3229        --with-valgrind=0 \
    3330        --with-x=0 \
    3431        --with-ssl=0 \
    35         --with-shared-libraries=1 \
    36         --download-zlib=1 \
    37         --download-hdf5=1 \
    38         --download-netcdf=1 \
     32        --with-pic=1 \
     33        --download-fblaslapack=1 \
     34        --download-mpich=1 \
    3935        --download-metis=1 \
    4036        --download-parmetis=1 \
    … …  
    4339
    4440# Compile and install
    45 if [ $# -eq 0 ]; then
    46         make
    47         make install
    48 else
    49         make -j $1
    50         make -j $1 install
    51 fi
    52 
    53 # Return to initial directory
    54 cd ..
     41make
     42make install

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

    r24632 r24637  
    77VER="3.12.3"
    88
    9 ## Environment
    10 #
    11 
    129# Download source
    1310$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz"
    1411
    1512# Unpack source
    16 tar -zxvf  petsc-${VER}.tar.gz
     13tar -zxvf petsc-${VER}.tar.gz
    1714
    1815# Cleanup
    … …  
    4037        --CXXFLAGS="-fPIC" \
    4138        --FFLAGS="-fPIC" \
    42         --COPTFLAGS="-O3" \
    43         --CXXOPTFLAGS="-O3" \
    44         --FOPTFLAGS="-O3" \
     39        --COPTFLAGS="-O2" \
     40        --CXXOPTFLAGS="-O2" \
     41        --FOPTFLAGS="-O2" \
    4542        --with-debugging=0 \
    4643        --with-valgrind=0 \
    4744        --with-x=0 \
    4845        --with-ssl=0 \
    49         --download-f2cblaslapack=1 \
     46        --download-fblaslapack=1 \
    5047        --download-mpich=1 \
    5148        --download-metis=1 \
    … …  
    5552
    5653# Compile and install
    57 if [ $# -eq 0 ]; then
    58         make
    59         make install
    60 else
    61         make -j $1
    62         make -j $1 install
    63 fi
     54make
     55make install

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

    r24632 r24637  
    77VER="3.12.3"
    88
    9 ## Environment
    10 #
    11 
    129# Download source
    1310$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz"
    1411
    1512# Unpack source
    16 tar -zxvf  petsc-${VER}.tar.gz
     13tar -zxvf petsc-${VER}.tar.gz
    1714
    1815# Cleanup
    … …  
    2926        --prefix="${ISSM_DIR}/externalpackages/petsc/install" \
    3027        --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
    31         --COPTFLAGS="-O3" \
    32         --CXXOPTFLAGS="-O3" \
    33         --FOPTFLAGS="-O3" \
     28        --COPTFLAGS="-O2" \
     29        --CXXOPTFLAGS="-O2" \
     30        --FOPTFLAGS="-O2" \
    3431        --with-debugging=0 \
    3532        --with-valgrind=0 \
    … …  
    3734        --with-ssl=0 \
    3835        --with-pic=1 \
    39         --download-f2cblaslapack=1 \
     36        --download-fblaslapack=1 \
    4037        --download-mpich=1 \
    4138        --download-metis=1 \
    … …  
    4542
    4643# Compile and install
    47 if [ $# -eq 0 ]; then
    48         make
    49         make install
    50 else
    51         make -j $1
    52         make -j $1 install
    53 fi
     44make
     45make install

  • issm/trunk-jpl/jenkins/macosx_pine-island

    r24604 r24637  
    44
    55# MATLAB path
    6 MATLAB_PATH="/Applications/MATLAB_R2015b.app"
     6MATLAB_PATH="/Applications/MATLAB_R2019b.app"
    77
    88# ISSM CONFIGURATION
    … …  
    1111        --disable-static \
    1212        --with-matlab-dir=$MATLAB_PATH \
    13         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
    14         --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    15         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
     13        --with-mpi-include=$ISSM_DIR/externalpackages/petsc/install/include \
     14        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     15        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    1616        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
    1717        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    … …  
    4141        autotools       install.sh
    4242        cmake           install.sh
    43         mpich           install-3.3.sh
    44         lapack          install-3.8-mac.sh
    45         petsc           install-3.7-mac.sh
     43        petsc           install-3.12-mac.sh
    4644        triangle        install-mac.sh
    4745        chaco           install.sh
Note: See TracChangeset for help on using the changeset viewer.