Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 24633)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 24634)
@@ -186,4 +186,5 @@
 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,4 +199,9 @@
 	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