diff --git a/.github/ci_scripts/github_linux_basic b/.github/ci_scripts/github_linux_basic index b191e1b2e..b73e5157b 100644 --- a/.github/ci_scripts/github_linux_basic +++ b/.github/ci_scripts/github_linux_basic @@ -10,7 +10,7 @@ ISSM_CONFIG='\ --with-matlab-dir=${MATLAB_PATH} \ --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \ --with-mpi-include="/usr/lib/x86_64-linux-gnu/openmpi/include/" \ - --with-mpi-libflags="-L/usr/lib/x86_64-linux-gnu/openmpi/lib -lmpi" \ + --with-mpi-libflags="-L/usr/lib/x86_64-linux-gnu/openmpi/lib -lmpi -lmpi_cxx" \ --with-petsc-dir="/usr/lib/petscdir/petsc-real/" \ --with-blas-lapack-dir="/usr/lib/petscdir/petsc-real/" \ --with-metis-dir="/usr/include" \ @@ -26,7 +26,6 @@ ISSM_CONFIG='\ # --with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \ # --with-blas-lapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \ # --with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \ -# --with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \ # --with-scalapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \ # --with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \ diff --git a/m4/issm_options.m4 b/m4/issm_options.m4 index 43351a87b..3a02396f9 100644 --- a/m4/issm_options.m4 +++ b/m4/issm_options.m4 @@ -1315,9 +1315,9 @@ AC_DEFUN([ISSM_OPTIONS],[ PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc" else PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc" - if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then - PETSCLIB+=" -lmetis" - fi + #if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then + # PETSCLIB+=" -lmetis" + #fi fi ;; *linux*) @@ -1325,15 +1325,12 @@ AC_DEFUN([ISSM_OPTIONS],[ PETSCLIB="-L${PETSC_ROOT}/lib -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lmpiuni -lpetsc" else PETSCLIB="-L${PETSC_ROOT}/lib -lpetsc -ldl" - if test ${PETSC_MAJOR} -gt 3 || test ${PETSC_MINOR} -ge 3; then - PETSCLIB+=" -lparmetis -lmetis" - fi fi if test "x$host_os_version" = "x3.0.101-0.31.1_1.0502.8394-cray_gem_s"; then - PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real -lmetis" + PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_gnu_real" fi if test x$HOST = "xmaui01"; then - PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_intel_real -lmetis" + PETSCLIB="-L${PETSC_ROOT}/lib -lcraypetsc_intel_real" fi ;; *mingw*) @@ -1926,10 +1923,10 @@ AC_DEFUN([ISSM_OPTIONS],[ if test "${VENDOR}" == "win-msys2"; then MUMPSLIB="-Wl,-L${MUMPS_ROOT}/lib -Wl,-lcmumps -Wl,-ldmumps -Wl,-lsmumps -Wl,-lzmumps -Wl,-lmumps_common -Wl,-lpord" else - MUMPSLIB="-L${MUMPS_ROOT}/lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis -lzmumps -lmetis" + MUMPSLIB="-L${MUMPS_ROOT}/lib -ldmumps -lcmumps -lmumps_common -lpord -lzmumps" fi else - MUMPSLIB="-L${MUMPS_ROOT}/lib -ldmumps -lmumps_common -lpord -lparmetis" + MUMPSLIB="-L${MUMPS_ROOT}/lib -ldmumps -lmumps_common -lpord" fi AC_DEFINE([_HAVE_MUMPS_], [1], [with MUMPS in ISSM src]) AC_SUBST([MUMPSINCL]) @@ -2047,7 +2044,7 @@ AC_DEFUN([ISSM_OPTIONS],[ dnl Prometheus libraries and header files if test "x${HAVE_PROMETHEUS}" == "xyes"; then PROMETHEUSINCL="-I${PROMETHEUS_ROOT}/include" - PROMETHEUSLIB="-L${PROMETHEUS_ROOT}/lib -lpromfei -lprometheus -lparmetis" + PROMETHEUSLIB="-L${PROMETHEUS_ROOT}/lib -lpromfei -lprometheus" AC_DEFINE([_HAVE_PROMETHEUS_], [1], [with Prometheus in ISSM src]) AC_SUBST([PROMETHEUSINCL]) AC_SUBST([PROMETHEUSLIB])