--- OpenFOAM-1.6-ext/etc/settings.sh.orig	2013-09-13 16:29:27.571292096 +0200
+++ OpenFOAM-1.6-ext/etc/settings.sh	2013-09-13 16:27:25.159778606 +0200
@@ -307,6 +307,16 @@
     unset mpi_version
     ;;
 
+IMPI)
+    export MPI_HOME=$EBROOTIMPI/intel64
+    export MPI_ARCH_PATH=$EBROOTIMPI/intel64
+
+    _foamAddPath $MPI_ARCH_PATH/bin
+    _foamAddLib $MPI_ARCH_PATH/lib
+
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/impi
+    ;; 
+
 MPICH)
     mpi_version=mpich-1.2.4
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
diff -ruN OpenFOAM-1.6-ext.orig/wmake/rules/linux64Icc/mplibIMPI OpenFOAM-1.6-ext/wmake/rules/linux64Icc/mplibIMPI
--- OpenFOAM-1.6-ext.orig/wmake/rules/linux64Icc/mplibIMPI  1970-01-01 01:00:00.000000000 +0100
+++ OpenFOAM-1.6-ext/wmake/rules/linux64Icc/mplibIMPI   2013-09-13 18:20:06.000000000 +0200
@@ -0,0 +1,3 @@
+PFLAGS     = -DMPICH_IGNORE_CXX_SEEK
+PINC       = -I$(MPI_ARCH_PATH)/include -DMPICH_SKIP_MPICXX
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
--- OpenFOAM-1.6-ext/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options.orig	2013-09-13 11:44:11.000000000 +0200
+++ OpenFOAM-1.6-ext/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options	2013-09-19 06:56:01.125747000 +0200
@@ -7,9 +7,8 @@
 
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(PARMGRIDGEN_INCLUDE_DIR)/Lib    \
-    -I$(PARMGRIDGEN_INCLUDE_DIR)/IMlib  \
+    -I$(PARMGRIDGEN_INCLUDE_DIR)    \
     $(TYPE_REAL)
 
 LIB_LIBS = \
-    -L$(PARMGRIDGEN_LIB_DIR) -lMGridGen
+    -L$(PARMGRIDGEN_LIB_DIR) -lmgrid
--- OpenFOAM-1.6-ext/src/decompositionMethods/metisDecomp/Make/options.orig	2013-09-13 11:44:11.000000000 +0200
+++ OpenFOAM-1.6-ext/src/decompositionMethods/metisDecomp/Make/options	2013-09-19 22:13:56.956372258 +0200
@@ -1,10 +1,13 @@
+include $(RULES)/mplib$(WM_MPLIB)
+
 EXE_INC = \
+    $(PINC) $(PFLAGS) \
     -I$(METIS_INCLUDE_DIR) \
     -I../decompositionMethods/lnInclude \
     -I../scotchDecomp/lnInclude
 
 LIB_LIBS = \
+    $(PLIBS) \
     -L$(FOAM_LIBBIN)/dummy \
-    -L$(METIS_LIB_DIR) -lmetis \
-    -L$(METIS_LIB_DIR) -lGKlib
+    -L$(METIS_LIB_DIR) -lmetis
 
--- OpenFOAM-1.6-ext/src/decompositionMethods/parMetisDecomp/Make/options.orig	2013-09-13 11:44:11.000000000 +0200
+++ OpenFOAM-1.6-ext/src/decompositionMethods/parMetisDecomp/Make/options	2013-09-20 07:09:45.114891103 +0200
@@ -10,5 +10,4 @@
 
 LIB_LIBS = \
     -L$(FOAM_MPI_LIBBIN) \
-    -L$(PARMETIS_LIB_DIR) -lmetis-parmetis \
-    -L$(PARMETIS_LIB_DIR) -lparmetis
+    -L$(PARMETIS_LIB_DIR) -lparmetis -lmetis 
