lukasplevac/easyconfigs-it4i
1
0
Fork 0
mirror of https://code.it4i.cz/sccs/easyconfigs-it4i.git synced 2025-04-07 23:42:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
easyconfigs-it4i/o/OpenFOAM/cleanup-OpenFOAM-2.2.2.patch
Lukas Krupcik 24bfd69f16 .add code.it4i.cz backup
2017-03-09 11:57:40 +01:00

238 lines
9.1 KiB
Diff
Raw Blame History

patch to avoid hardcoding of settings, so defaults can be set on the outside by defining environment variables
author: Kenneth Hoste (Ghent University)
diff -ru OpenFOAM-2.2.2.orig/etc/bashrc OpenFOAM-2.2.2/etc/bashrc
--- OpenFOAM-2.2.2.orig/etc/bashrc 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/etc/bashrc 2015-03-03 10:39:07.817538712 +0100
@@ -63,7 +63,7 @@
#- Compiler:
# WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Gcc46 | Clang | Icc (Intel icc)
-export WM_COMPILER=Gcc
+: ${WM_COMPILER:=Gcc}; export WM_COMPILER
unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
#- Architecture:
@@ -81,7 +81,7 @@
#- MPI implementation:
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI
# | GAMMA | MPI | QSMPI | SGIMPI
-export WM_MPLIB=OPENMPI
+: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
#- Operating System:
# WM_OSTYPE = POSIX | ???
@@ -115,7 +115,7 @@
# Location of third-party software
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
+: ${WM_THIRD_PARTY_DIR:=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR
# Location of site-specific templates etc
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -ru OpenFOAM-2.2.2.orig/etc/config/scotch.sh OpenFOAM-2.2.2/etc/config/scotch.sh
--- OpenFOAM-2.2.2.orig/etc/config/scotch.sh 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/etc/config/scotch.sh 2015-03-03 10:39:07.817538712 +0100
@@ -33,7 +33,11 @@
# during the wmake process
#------------------------------------------------------------------------------
-export SCOTCH_VERSION=scotch_6.0.0
-export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
+if [ -n "${SCOTCH_ROOT}" ] ; then
+ export SCOTCH_ARCH_PATH="${SCOTCH_ROOT}"
+else
+ export SCOTCH_VERSION=scotch_6.0.0
+ export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
+fi
# -----------------------------------------------------------------------------
diff -ru OpenFOAM-2.2.2.orig/etc/config/settings.csh OpenFOAM-2.2.2/etc/config/settings.csh
--- OpenFOAM-2.2.2.orig/etc/config/settings.csh 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/etc/config/settings.csh 2015-03-03 10:39:07.817538712 +0100
@@ -373,7 +373,7 @@
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
-unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+#unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
switch ("$WM_MPLIB")
case SYSTEMOPENMPI:
diff -ru OpenFOAM-2.2.2.orig/etc/config/settings.sh OpenFOAM-2.2.2/etc/config/settings.sh
--- OpenFOAM-2.2.2.orig/etc/config/settings.sh 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/etc/config/settings.sh 2015-03-03 10:39:07.817538712 +0100
@@ -395,7 +395,7 @@
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
-unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+#unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
case "$WM_MPLIB" in
SYSTEMOPENMPI)
@@ -563,6 +563,11 @@
_foamAddPath $MPI_ARCH_PATH/bin64
_foamAddLib $MPI_ARCH_PATH/lib64
;;
+
+EASYBUILDMPI)
+ export FOAM_MPI=mpi
+ ;;
+
*)
export FOAM_MPI=dummy
;;
diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C
--- OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/lnInclude/ptscotchDecomp.C 2015-03-03 10:39:07.827538901 +0100
@@ -112,6 +112,8 @@
\*---------------------------------------------------------------------------*/
+#include "mpi.h"
+
#include "ptscotchDecomp.H"
#include "addToRunTimeSelectionTable.H"
#include "Time.H"
@@ -121,8 +123,8 @@
extern "C"
{
-#include <stdio.h>
#include "mpi.h"
+#include <stdio.h>
#include "ptscotch.h"
}
diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/Make/options OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/Make/options
--- OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/Make/options 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/Make/options 2015-03-03 10:39:07.827538901 +0100
@@ -3,10 +3,8 @@
EXE_INC = \
$(PFLAGS) $(PINC) \
- -I$(SCOTCH_ROOT)/include \
-I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \
- -I/usr/include/scotch \
-I../decompositionMethods/lnInclude
LIB_LIBS = \
- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit ${LINK_FLAGS} -lrt
+ -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit ${LINK_FLAGS} -lrt
diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
--- OpenFOAM-2.2.2.orig/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C 2015-03-03 10:39:07.827538901 +0100
@@ -112,6 +112,8 @@
\*---------------------------------------------------------------------------*/
+#include "mpi.h"
+
#include "ptscotchDecomp.H"
#include "addToRunTimeSelectionTable.H"
#include "Time.H"
@@ -121,8 +123,8 @@
extern "C"
{
-#include <stdio.h>
#include "mpi.h"
+#include <stdio.h>
#include "ptscotch.h"
}
diff -ru OpenFOAM-2.2.2.orig/src/parallel/decompose/scotchDecomp/Make/options OpenFOAM-2.2.2/src/parallel/decompose/scotchDecomp/Make/options
--- OpenFOAM-2.2.2.orig/src/parallel/decompose/scotchDecomp/Make/options 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/src/parallel/decompose/scotchDecomp/Make/options 2015-03-03 10:39:07.827538901 +0100
@@ -7,10 +7,8 @@
EXE_INC = \
$(PFLAGS) $(PINC) \
- -I$(SCOTCH_ROOT)/include \
-I$(SCOTCH_ARCH_PATH)/include \
- -I/usr/include/scotch \
-I../decompositionMethods/lnInclude
LIB_LIBS = \
- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
+ -L$(SCOTCH_ARCH_PATH)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c 2015-03-03 10:39:07.827538901 +0100
@@ -2,7 +2,7 @@
cWARN = -Wall
-cc = gcc -m64
+cc = $(MPICC)
include $(RULES)/c$(WM_COMPILE_OPTION)
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++ 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++ 2015-03-03 10:39:07.827538901 +0100
@@ -2,7 +2,7 @@
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
-CC = g++ -m64
+CC = $(MPICXX)
include $(RULES)/c++$(WM_COMPILE_OPTION)
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/cOpt OpenFOAM-2.2.2/wmake/rules/linux64Gcc/cOpt
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/cOpt 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/cOpt 2015-03-03 10:39:07.827538901 +0100
@@ -1,3 +1,3 @@
cDBUG =
-cOPT = -O3
+cOPT = $(CFLAGS)
# -fprefetch-loop-arrays
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++Opt OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++Opt
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Gcc/c++Opt 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Gcc/c++Opt 2015-03-03 10:39:07.827538901 +0100
@@ -1,3 +1,3 @@
c++DBUG =
-c++OPT = -O3
+c++OPT = $(CXXFLAGS)
# -fprefetch-loop-arrays
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c OpenFOAM-2.2.2/wmake/rules/linux64Icc/c
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c 2015-03-03 10:39:07.827538901 +0100
@@ -2,7 +2,7 @@
cWARN =
-cc = icc
+cc = $(MPICC)
include $(RULES)/c$(WM_COMPILE_OPTION)
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++ 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++ 2015-03-03 10:39:07.827538901 +0100
@@ -2,7 +2,7 @@
c++WARN = -wd327,654,819,1125,1476,1505,1572
-CC = icpc -std=c++0x
+CC = $(MPICXX)
include $(RULES)/c++$(WM_COMPILE_OPTION)
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/cOpt OpenFOAM-2.2.2/wmake/rules/linux64Icc/cOpt
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/cOpt 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/cOpt 2015-03-03 10:39:07.827538901 +0100
@@ -1,2 +1,2 @@
cDBUG =
-cOPT = -O3 -no-prec-div
+cOPT = $(CFLAGS)
diff -ru OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++Opt OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++Opt
--- OpenFOAM-2.2.2.orig/wmake/rules/linux64Icc/c++Opt 2013-10-03 12:28:16.000000000 +0200
+++ OpenFOAM-2.2.2/wmake/rules/linux64Icc/c++Opt 2015-03-03 10:39:45.158231466 +0100
@@ -1,2 +1,2 @@
c++DBUG =
-c++OPT = -xHost -O2 -no-prec-div
+c++OPT = $(CXXFLAGS)
Reference in New Issue View Git Blame Copy Permalink