Changeset 24641


Ignore:
Timestamp:
03/05/20 13:46:11 (5 years ago)
Author:
jdquinn
Message:

CHG: Reconfiguration of Solid Earth build; updated archives; changed path to libgfortran for all Linux builds; cleanup

Location:
issm/trunk-jpl
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r24321 r24641  
    1515
    1616# Untar source
    17 tar -xvzf gmsh-$VER-source.tgz
     17tar -xvzf gmsh-${VER}-source.tgz
    1818
    19 # Move source to src directory
    20 mv gmsh-$VER-source/* src
    21 rm -rf gmsh-$VER-source
     19# Move source to 'src' directory
     20mv gmsh-${VER}-source/* src
     21rm -rf gmsh-${VER}-source
    2222
    2323# Configure
    2424cd install
    2525cmake ../src \
    26         -DCMAKE_INSTALL_PREFIX="$ISSM_DIR/externalpackages/gmsh/install" \
     26        -DCMAKE_INSTALL_PREFIX="${ISSM_DIR}/externalpackages/gmsh/install" \
    2727        -DENABLE_MPI=1
    2828
    … …  
    3535        make -j $1 install
    3636fi
    37 
    38 # Return to initial directory
    39 cd ..
    40 

  • issm/trunk-jpl/externalpackages/gmt/configs/6.0/linux/cmake/ConfigUser.cmake

    r24640 r24641  
    136136# Set location of NetCDF (can be root directory, path to header file or path
    137137# to nc-config) [auto]:
    138 set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/netcdf/install")
     138set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/petsc/install")
    139139
    140140# Set location of GDAL (can be root directory, path to header file or path to
    … …  
    154154
    155155# Set location of ZLIB (can be root directory or path to header file) [auto]:
    156 set (ZLIB_ROOT "$ENV{ISSM_DIR}/externalpackages/zlib/install")
     156set (ZLIB_ROOT "$ENV{ISSM_DIR}/externalpackages/petsc/install")
    157157
    158158# Set location of CURL (can be root directory or path to header file) [auto]:

  • issm/trunk-jpl/externalpackages/gmt/install-6.0-linux.sh

    r24454 r24641  
    1515
    1616# Unpack source
    17 tar -zxvf gmt-$VER.tar.gz
     17tar -zxvf gmt-${VER}.tar.gz
    1818
    1919# Cleanup
    … …  
    2222
    2323# Move source to 'src' directory
    24 mv gmt-$VER/* src
    25 rm -rf gmt-$VER
     24mv gmt-${VER}/* src
     25rm -rf gmt-${VER}
    2626
    2727# Copy custom configuration files
    … …  
    5151        make -j $1 install
    5252fi
    53 
    54 # Return to initial directory
    55 cd ../..

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh

    r24454 r24641  
    1515VER="4.7.2"
    1616CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
    17 HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
    18 ZLIB_ROOT="${ISSM_DIR}/externalpackages/zlib/install"
     17HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
     18ZLIB_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
    1919
    2020# Environment
    … …  
    2727
    2828# Unpack source
    29 tar -zxvf netcdf-c-$VER.tar.gz
     29tar -zxvf netcdf-c-${VER}.tar.gz
    3030
    3131# Cleanup
    … …  
    3434
    3535# Move source to 'src' directory
    36 mv netcdf-c-$VER/* src/
    37 rm -rf netcdf-c-$VER
     36mv netcdf-c-${VER}/* src/
     37rm -rf netcdf-c-${VER}
    3838
    3939# Configure
    … …  
    5151        make -j $1 install
    5252fi
    53 
    54 # Return to initial directory
    55 cd ..

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

    r24637 r24641  
    2626        --prefix="${ISSM_DIR}/externalpackages/petsc/install" \
    2727        --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
     28        --COPTFLAGS="-O2" \
     29        --CXXOPTFLAGS="-O2" \
     30        --FOPTFLAGS="-O2" \
    2831        --with-debugging=0 \
    2932        --with-valgrind=0 \
    … …  
    3639        --download-parmetis=1 \
    3740        --download-scalapack=1 \
    38         --download-mumps=1
     41        --download-mumps=1 \
     42        --download-zlib=1 \
     43        --download-hdf5=1
    3944
    4045# Compile and install

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

    r24637 r24641  
    2626        --prefix="${ISSM_DIR}/externalpackages/petsc/install" \
    2727        --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
     28        --COPTFLAGS="-O2" \
     29        --CXXOPTFLAGS="-O2" \
     30        --FOPTFLAGS="-O2" \
    2831        --with-debugging=0 \
    2932        --with-valgrind=0 \

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

    r24639 r24641  
    1111        --with-numthreads=4 \
    1212        --with-matlab-dir=${MATLAB_PATH} \
    13         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     13        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    1414        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    1515        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

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

    r24639 r24641  
    1717        --with-python-dir=/usr \
    1818        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    19         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     19        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    2020        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
    2121        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

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

    r24639 r24641  
    1717        --with-python-dir=/usr \
    1818        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    19         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     19        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    2020        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
    2121        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

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

    r24639 r24641  
    1515        --without-Love \
    1616        --with-matlab-dir=${MATLAB_PATH} \
    17         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     17        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    1818        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
    1919        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \

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

    r24639 r24641  
    1515        --with-python-dir=/usr \
    1616        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    17         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     17        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    1818        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    1919        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

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

    r24639 r24641  
    1414        --with-python-dir=/usr \
    1515        --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
    16         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     16        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    1717        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    1818        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

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

    r24639 r24641  
    1212        --with-numthreads=4 \
    1313        --with-matlab-dir=${MATLAB_PATH} \
    14         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     14        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    1515        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    1616        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

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

    r24639 r24641  
    1111        --with-python-dir=/usr \
    1212        --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    13         --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/8 -lgfortran" \
     13        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    1414        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    1515        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \

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

    r24639 r24641  
    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/8 -lgfortran" \
     15        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    1616        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    1717        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
    … …  
    3232        autotools       install-debian-linux.sh
    3333        cmake           install.sh
    34         petsc           install-3.11-linux.sh
     34        petsc           install-3.11-linux-solid_earth.sh
    3535        triangle        install-linux.sh
    3636        chaco           install.sh
    … …  
    3838        semic           install.sh
    3939        boost           install-1.55-linux.sh
    40         zlib            install-1.2.sh
    41         hdf5            install-1.10.sh
    4240        curl            install-7.67.sh
    4341        netcdf          install-4.7.sh
Note: See TracChangeset for help on using the changeset viewer.