set MPICXX and MPIFC for gnu/intel compilers

sit

@@ -101,7 +101,19 @@ if [ ! -z "$MPI" ] ; then
     fi  
     echo "Loading MPI module ${MPI_MODULE}"
     module load $MPI_MODULE
-    MPICC="mpicc"
+    case $COMPILER in
+        gnu)
+           MPICC="mpicc"
+           MPICXX="mpicxx"
+           MPIFC="mpif90"
+        ;;
+        intel)
+           MPICC="mpiicc"
+           MPICXX="mpiicpc"
+           MPIFC="mpiifort"
+        ;;
+    esac
+
     MPI_DIR=${MPI_DIR:=$(dirname $(dirname $(which $MPICC)))}
 fi