76b9563dc3
- renamed develop version from 'plus' to 'develop' - patches now prefixed by corresponding OpenFOAM version number. This makes it easier to sort and see what old/junk exists. - remove MPI_BUFFER_SIZEk env variable (for all openfoam variants). The OpenFOAM shell setup addresses this and there is no reason to pollute the module environment at this stage.
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
--- OpenFOAM-v1612+.orig/src/fvAgglomerationMethods/Allwmake 2017-01-02 09:56:17.578558265 +0100
|
|
+++ OpenFOAM-v1612+/src/fvAgglomerationMethods/Allwmake 2017-04-18 18:58:38.236795902 +0200
|
|
@@ -4,9 +4,13 @@
|
|
# Parse arguments for library compilation
|
|
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
|
|
|
|
-export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
|
|
+unset MGRIDGEN_ARCH_PATH
|
|
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/mgridgen)
|
|
+then
|
|
+ . $settings
|
|
+fi
|
|
|
|
-if [ -e "$FOAM_LIBBIN/libMGridGen.so" ]
|
|
+if [ -e "$MGRIDGEN_ARCH_PATH/include/mgridgen.h" ]
|
|
then
|
|
wmake $targetType MGridGenGamgAgglomeration
|
|
fi
|
|
--- OpenFOAM-v1612+.orig/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options 2017-01-02 09:56:17.578558265 +0100
|
|
+++ OpenFOAM-v1612+/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options 2017-04-18 18:59:16.860662811 +0200
|
|
@@ -1,15 +1,9 @@
|
|
-/* Needs ParMGridGen environment variable set. (see Allwmake script) */
|
|
-
|
|
-TYPE_REAL=
|
|
-#if defined(WM_SP)
|
|
-TYPE_REAL=-DTYPE_REAL
|
|
-#endif
|
|
-
|
|
EXE_INC = \
|
|
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
|
- -I$(ParMGridGen)/MGridGen/Lib/lnInclude \
|
|
- -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \
|
|
- $(TYPE_REAL)
|
|
+ -I$(MGRIDGEN_ARCH_PATH)/include
|
|
|
|
LIB_LIBS = \
|
|
- -L$(FOAM_EXT_LIBBIN) -lMGridGen
|
|
+ -L$(FOAM_EXT_LIBBIN) \
|
|
+ -L$(MGRIDGEN_ARCH_PATH)/lib \
|
|
+ -L$(MGRIDGEN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
|
|
+ -lmgrid
|