Skip to content

Instantly share code, notes, and snippets.

@wohlbier
Created October 31, 2018 18:33
Show Gist options
  • Save wohlbier/e8bfd11bfb0e0801aa1581beae450eb8 to your computer and use it in GitHub Desktop.
Save wohlbier/e8bfd11bfb0e0801aa1581beae450eb8 to your computer and use it in GitHub Desktop.
mpich patch for foam-extend-3.2
diff --git a/etc/bashrc b/etc/bashrc
index f597336ba..2c47b61f5 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -95,7 +95,7 @@ export WM_THIRD_PARTY_USE_CMAKE_322=1
#
# For AllMake.stage2
-export WM_THIRD_PARTY_USE_OPENMPI_165=1
+#export WM_THIRD_PARTY_USE_OPENMPI_165=1
#
# For AllMake.stage3
@@ -105,7 +105,7 @@ export WM_THIRD_PARTY_USE_LIBCCMIO_261=1
export WM_THIRD_PARTY_USE_MESQUITE_212=1
export WM_THIRD_PARTY_USE_SCOTCH_604=1
export WM_THIRD_PARTY_USE_PARMETIS_403=1
-export WM_THIRD_PARTY_USE_PYFOAM_064=1
+#export WM_THIRD_PARTY_USE_PYFOAM_064=1
export WM_THIRD_PARTY_USE_HWLOC_1101=1
#
@@ -182,7 +182,8 @@ export WM_COMPILER_LIB_ARCH=
: ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI | MVAPICH2
-: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
+#: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
+: ${WM_MPLIB:=MPICH}; export WM_MPLIB
# WM_NCOMPPROCS = <number of processes to use>
# Warning: Need to use a complete path for foamGetSystemInfo because the PATH
diff --git a/etc/settings.sh b/etc/settings.sh
index 28a78bd8b..0e1d835f4 100755
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -411,9 +411,9 @@ MVAPICH2)
;;
MPICH)
- mpi_version=mpich-1.2.4
- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
+ mpi_version=mpich-3.2
+ #export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
+ export MPI_ARCH_PATH=/usr
export MPICH_ROOT=$MPI_ARCH_PATH
_foamAddPath $MPI_ARCH_PATH/bin
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
index ad53c8d44..20809598b 100644
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ b/wmake/rules/linux64Gcc/mplibMPICH
@@ -1,3 +1,3 @@
PFLAGS =
-PINC = -I$(MPI_ARCH_PATH)/include
+PINC = -I$(MPI_ARCH_PATH)/include -I$(MPI_ARCH_PATH)/include/mpich
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment