Changeset 26246


Ignore:
Timestamp:
05/06/21 11:40:27 (4 years ago)
Author:
jdquinn
Message:

CHG: Modifications to support newer versions of GCC/GFortran

Location:
issm/trunk-jpl/externalpackages
Files:
14 added
8 edited
2 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh

    r26240 r26246  
    3434# Copy customized source and configuration files to 'src' directory
    3535cp configs/${VER}/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp ${DAK_SRC}/packages/DDACE/src/Analyzer
     36cp configs/${VER}/packages/queso/src/misc/src/1DQuadrature.C ${DAK_SRC}/packages/queso/src/misc/src
    3637cp configs/${VER}/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp ${DAK_SRC}/packages/surfpack/src/surfaces/nkm
    3738cp configs/${VER}/packages/VPISparseGrid/src/sandia_rules.cpp ${DAK_SRC}/packages/VPISparseGrid/src
    … …  
    5051        -DBUILD_STATIC_LIBS=ON \
    5152        -DCMAKE_C_COMPILER=${MPI_HOME}/bin/mpicc \
     53        -DCMAKE_C_FLAGS="-fPIC -Wno-error=implicit-function-declaration" \
    5254        -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
     55        -DCMAKE_CXX_FLAGS="-fPIC" \
    5356        -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
    54         -DCMAKE_C_FLAGS="-fPIC" \
    55         -DCMAKE_CXX_FLAGS="-fPIC" \
    56         -DCMAKE_Fortran_FLAGS="-fPIC" \
     57        -DCMAKE_Fortran_FLAGS="-fPIC -fallow-argument-mismatch" \
    5758        -DBoost_NO_BOOST_CMAKE=TRUE \
    5859        -DHAVE_ACRO=OFF \

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh

    r26240 r26246  
    3535# Copy customized source and configuration files to 'src' directory
    3636cp configs/${VER}/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp ${DAK_SRC}/packages/DDACE/src/Analyzer
     37cp configs/${VER}/packages/queso/src/misc/src/1DQuadrature.C ${DAK_SRC}/packages/queso/src/misc/src
    3738cp configs/${VER}/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp ${DAK_SRC}/packages/surfpack/src/surfaces/nkm
    3839cp configs/${VER}/packages/VPISparseGrid/src/sandia_rules.cpp ${DAK_SRC}/packages/VPISparseGrid/src
    … …  
    5152        -DBUILD_STATIC_LIBS=OFF \
    5253        -DCMAKE_C_COMPILER=${MPI_HOME}/bin/mpicc \
     54        -DCMAKE_C_FLAGS="-Wno-error=implicit-function-declaration" \
    5355        -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
    5456        -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
     57        -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \
    5558        -DBoost_NO_BOOST_CMAKE=TRUE \
    5659        -DHAVE_ACRO=OFF \

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh

    r26240 r26246  
    4848# Copy customized source and configuration files to 'src' directory
    4949cp configs/${VER}/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp ${DAK_SRC}/packages/DDACE/src/Analyzer
     50cp configs/${VER}/packages/queso/src/misc/src/1DQuadrature.C ${DAK_SRC}/packages/queso/src/misc/src
    5051cp configs/${VER}/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp ${DAK_SRC}/packages/surfpack/src/surfaces/nkm
    5152cp configs/${VER}/packages/VPISparseGrid/src/sandia_rules.cpp ${DAK_SRC}/packages/VPISparseGrid/src
    … …  
    7778        -DBUILD_STATIC_LIBS=ON \
    7879        -DCMAKE_C_COMPILER=${MPI_HOME}/bin/mpicc \
     80        -DCMAKE_C_FLAGS="-fPIC -Wno-error=implicit-function-declaration" \
    7981        -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
     82        -DCMAKE_CXX_FLAGS="-fPIC -fdelayed-template-parsing" \
    8083        -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
    81         -DCMAKE_C_FLAGS="-fPIC -Wno-error=implicit-function-declaration" \
    82         -DCMAKE_CXX_FLAGS="-fPIC -fdelayed-template-parsing" \
    83         -DCMAKE_Fortran_FLAGS="-fPIC" \
     84        -DCMAKE_Fortran_FLAGS="-fPIC -fallow-argument-mismatch" \
    8485        -DBoost_NO_BOOST_CMAKE=TRUE \
    8586        -DHAVE_ACRO=OFF \

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

    r26240 r26246  
    4545# Copy customized source and configuration files to 'src' directory
    4646cp configs/${VER}/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp ${DAK_SRC}/packages/DDACE/src/Analyzer
     47cp configs/${VER}/packages/queso/src/misc/src/1DQuadrature.C ${DAK_SRC}/packages/queso/src/misc/src
    4748cp configs/${VER}/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp ${DAK_SRC}/packages/surfpack/src/surfaces/nkm
    4849cp configs/${VER}/packages/VPISparseGrid/src/sandia_rules.cpp ${DAK_SRC}/packages/VPISparseGrid/src
    … …  
    6364        -DCMAKE_C_COMPILER=${MPI_HOME}/bin/mpicc \
    6465        -DCMAKE_CXX_COMPILER=${MPI_HOME}/bin/mpicxx \
     66        -DCMAKE_CXX_FLAGS="-fdelayed-template-parsing" \
    6567        -DCMAKE_Fortran_COMPILER=${MPI_HOME}/bin/mpif77 \
    66         -DCMAKE_CXX_FLAGS="-fdelayed-template-parsing" \
     68        -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \
    6769        -DBoost_NO_BOOST_CMAKE=TRUE \
    6870        -DHAVE_ACRO=OFF \

  • issm/trunk-jpl/externalpackages/gmt/configs/6/static/mac/cmake/ConfigUser.static.cmake

    r26245 r26246  
    109109
    110110# Set path to GSHHG Shoreline Database [auto]:
    111 set (GSHHG_ROOT "$ENV{ISSM_DIR}/externalpackages/gshhg/install")
     111set (GSHHG_ROOT "$ENV{GSHHG_ROOT}")
    112112
    113113# Copy GSHHG files to ${GMT_DATADIR}/coast [FALSE]:
    … …  
    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{NETCDF_ROOT}")
    139139
    140140# Set location of GDAL (can be root directory, path to header file or path to
    141141# gdal-config) [auto]:
    142 set (GDAL_ROOT "$ENV{ISSM_DIR}/externalpackages/gdal/install")
     142set (GDAL_ROOT "$ENV{GDAL_ROOT}")
    143143
    144144# Set location of PCRE (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/petsc/install")
     156set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
    157157
    158158# Set location of CURL (can be root directory or path to header file) [auto]:
    … …  
    167167
    168168# Set LAPACK location. Use this when want to link with LAPACK and it's not found automatically
    169 #set (LAPACK_LIBRARY "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lflapack")
    170 #set (BLAS_LIBRARY "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lfblas")
     169#set (LAPACK_LIBRARY "-L$ENV{LAPACK_ROOT} -lflapack")
     170#set (BLAS_LIBRARY "-L$ENV{BLAS_ROOT} -lfblas")
    171171
    172172##

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

    r25989 r26246  
    4545
    4646# Copy custom configuration files
    47 cp ./configs/6/static/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
     47cp ./configs/6/static/linux/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
    4848cp ./configs/6/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
    4949cp ./configs/6/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules

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

    r25989 r26246  
    2727
    2828# Copy custom configuration files
    29 cp ./configs/6/cmake/ConfigUser.cmake ./src/cmake
     29cp ./configs/6/linux/cmake/ConfigUser.cmake ./src/cmake
    3030
    3131# Configure

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

    r25868 r26246  
    4646
    4747# Copy custom configuration files
    48 cp ./configs/6/static/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
     48cp ./configs/6/static/mac/cmake/ConfigUser.static.cmake ./src/cmake/ConfigUser.cmake
    4949cp ./configs/6/static/cmake/modules/FindGDAL.cmake ./src/cmake/modules
    5050cp ./configs/6/static/cmake/modules/FindGSHHG.cmake ./src/cmake/modules

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac.sh

    r25860 r26246  
    2727
    2828# Copy custom configuration files
    29 cp ./configs/6/cmake/ConfigUser.cmake ./src/cmake
     29cp ./configs/6/mac/cmake/ConfigUser.cmake ./src/cmake
    3030
    3131# Configure
Note: See TracChangeset for help on using the changeset viewer.