Changeset 24634

Timestamp:

03/04/20 09:05:00 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing environment.sh if MPI is installed through PETSc

File:

• issm/trunk-jpl/etc/environment.sh (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -186 +186 @@
 MPI_DIR="${ISSM_DIR}/externalpackages/mpich/install"
 if [ -d "$MPI_DIR" ]; then
+        echo "HERE"
         export MPI_DIR
         export MPI_INC_DIR="$MPI_DIR/include"
@@ -198 +199 @@
         path_prepend "${PETSC_DIR}/bin" # In case we have installed MPICH via PETSc
         ld_library_path_append "${PETSC_DIR}/lib"
+        if [ -f "$PETSC_DIR/bin/mpiexec" ]; then
+                MPI_DIR=$PETSC_DIR
+                export MPI_DIR
+                export MPI_INC_DIR="$MPI_DIR/include"
+        fi
 fi