zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into splitCyclic

Browse Source
This commit is contained in:
mattijs
2010-04-30 15:10:10 +01:00
parent caf974fcfb 08916e83a2
commit 7f6740a9eb
1069 changed files with 14455 additions and 8251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wmake/MakefileFiles
View File

@ -58,7 +58,7 @@ IFILES = $(WM_OPTIONS)/includeDeps
allFiles : $(FILES) $(SFILES) $(OFILES) $(DFILES) $(IFILES)
$(FILES) : files
@$(CPP) $(GFLAGS) $(FFLAGS) files > $(FILES)
@$(CPP) $(GFLAGS) $(FFLAGS) files | sed -e 's@ *@ @g' > $(FILES)
$(SFILES): files
@$(WM_SCRIPTS)/makeDerivedFiles

2
wmake/MakefileOptions
View File

@ -48,7 +48,7 @@ OPTIONS = $(WM_OPTIONS)/options
#------------------------------------------------------------------------------
$(OPTIONS) : options
@$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options > $(OPTIONS)
@$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options | sed -e 's@ *@ @g' > $(OPTIONS)
#------------------------------------------------------------------------------

4
wmake/rules/General/mplibSYSTEMOPENMPI
View File

@ -1 +1,5 @@
# use the system installed openmpi - mpicc must be installed
PFLAGS = -DOMPI_SKIP_MPICXX
PINC = $(shell mpicc --showme:compile)
PLIBS = $(shell mpicc --showme:link)

2
wmake/rules/General/standard
View File

@ -9,3 +9,5 @@ include $(GENERAL_RULES)/coco-cpp
## include $(GENERAL_RULES)/btyacc++
include $(GENERAL_RULES)/bison
include $(GENERAL_RULES)/moc
include $(GENERAL_RULES)/X

1
wmake/rules/SiCortex64Gcc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/SunOS64Gcc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/SunOS64Gcc/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linux64Gcc/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linux64Gcc/general
View File

@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linux64Gcc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linux64Gcc/mplibGAMMA
View File

@ -1 +0,0 @@
../General/mplibGAMMA

1
wmake/rules/linux64Gcc/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linux64Gcc/mplibMPICH-GM
View File

@ -1 +0,0 @@
../General/mplibMPICH-GM

1
wmake/rules/linux64Gcc/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linux64Gcc/mplibQSMPI
View File

@ -1 +0,0 @@
../General/mplibQSMPI

1
wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linux64Gcc43/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linux64Gcc43/general
View File

@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linux64Gcc43/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linux64Gcc43/mplibGAMMA
View File

@ -1 +0,0 @@
../General/mplibGAMMA

1
wmake/rules/linux64Gcc43/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linux64Gcc43/mplibMPICH-GM
View File

@ -1 +0,0 @@
../General/mplibMPICH-GM

1
wmake/rules/linux64Gcc43/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linux64Gcc43/mplibQSMPI
View File

@ -1 +0,0 @@
../General/mplibQSMPI

1
wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linux64Gcc44/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linux64Gcc44/general
View File

@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linux64Gcc44/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linux64Gcc44/mplibGAMMA
View File

@ -1 +0,0 @@
../General/mplibGAMMA

1
wmake/rules/linux64Gcc44/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linux64Gcc44/mplibMPICH-GM
View File

@ -1 +0,0 @@
../General/mplibMPICH-GM

1
wmake/rules/linux64Gcc44/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linux64Gcc44/mplibQSMPI
View File

@ -1 +0,0 @@
../General/mplibQSMPI

1
wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

16
wmake/rules/linux64Gcc45/c Normal file
View File

@ -0,0 +1,16 @@
.SUFFIXES: .c .h
cWARN = -Wall
cc = gcc -m64
include $(RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs

21
wmake/rules/linux64Gcc45/c++ Normal file
View File

@ -0,0 +1,21 @@
.SUFFIXES: .C .cxx .cc .cpp
c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
CC = g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-60
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)

2
wmake/rules/linux64Gcc45/c++Debug Normal file
View File

@ -0,0 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

4
wmake/rules/linux64Gcc45/c++Opt Normal file
View File

@ -0,0 +1,4 @@
c++DBUG =
c++OPT = -O3
#c++OPT = -march=nocona -O3
# -ftree-vectorize -ftree-vectorizer-verbose=3

2
wmake/rules/linux64Gcc45/c++Prof Normal file
View File

@ -0,0 +1,2 @@
c++DBUG = -pg
c++OPT = -O2

2
wmake/rules/linux64Gcc45/cDebug Normal file
View File

@ -0,0 +1,2 @@
cDBUG = -ggdb -DFULLDEBUG
cOPT = -O1 -fdefault-inline -finline-functions

2
wmake/rules/linux64Gcc45/cOpt Normal file
View File

@ -0,0 +1,2 @@
cDBUG =
cOPT = -O3

2
wmake/rules/linux64Gcc45/cProf Normal file
View File

@ -0,0 +1,2 @@
cDBUG = -pg
cOPT = -O2

9
wmake/rules/linux64Gcc45/general Normal file
View File

@ -0,0 +1,9 @@
# need single-line output from cpp
CPP = cpp -traditional-cpp
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/c
include $(RULES)/c++

3
wmake/rules/linux64Gcc45/mplibHPMPI Normal file
View File

@ -0,0 +1,3 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi

1
wmake/rules/linux64Icc/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linux64Icc/general
View File

@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linux64Icc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linux64Icc/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linux64Icc/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linuxGcc/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linuxGcc/general
View File

@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linuxGcc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linuxGcc/mplibGAMMA
View File

@ -1 +0,0 @@
../General/mplibGAMMA

1
wmake/rules/linuxGcc/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linuxGcc/mplibMPICH-GM
View File

@ -1 +0,0 @@
../General/mplibMPICH-GM

1
wmake/rules/linuxGcc/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linuxGcc43/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linuxGcc43/general
View File

@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linuxGcc43/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linuxGcc43/mplibGAMMA
View File

@ -1 +0,0 @@
../General/mplibGAMMA

1
wmake/rules/linuxGcc43/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linuxGcc43/mplibMPICH-GM
View File

@ -1 +0,0 @@
../General/mplibMPICH-GM

1
wmake/rules/linuxGcc43/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linuxGcc44/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linuxGcc44/general
View File

@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linuxGcc44/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linuxGcc44/mplibGAMMA
View File

@ -1 +0,0 @@
../General/mplibGAMMA

1
wmake/rules/linuxGcc44/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linuxGcc44/mplibMPICH-GM
View File

@ -1 +0,0 @@
../General/mplibMPICH-GM

1
wmake/rules/linuxGcc44/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

16
wmake/rules/linuxGcc45/c Normal file
View File

@ -0,0 +1,16 @@
.SUFFIXES: .c .h
cWARN = -Wall
cc = gcc -m32
include $(RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs

21
wmake/rules/linuxGcc45/c++ Normal file
View File

@ -0,0 +1,21 @@
.SUFFIXES: .C .cxx .cc .cpp
c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
CC = g++ -m32
include $(RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-60
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS)

2
wmake/rules/linuxGcc45/c++Debug Normal file
View File

@ -0,0 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

2
wmake/rules/linuxGcc45/c++Opt Normal file
View File

@ -0,0 +1,2 @@
c++DBUG =
c++OPT = -O3

2
wmake/rules/linuxGcc45/c++Prof Normal file
View File

@ -0,0 +1,2 @@
c++DBUG = -pg
c++OPT = -O2

2
wmake/rules/linuxGcc45/cDebug Normal file
View File

@ -0,0 +1,2 @@
cDBUG = -ggdb -DFULLDEBUG
cOPT = -O1 -fdefault-inline -finline-functions

2
wmake/rules/linuxGcc45/cOpt Normal file
View File

@ -0,0 +1,2 @@
cDBUG =
cOPT = -O3

2
wmake/rules/linuxGcc45/cProf Normal file
View File

@ -0,0 +1,2 @@
cDBUG = -pg
cOPT = -O2

10
wmake/rules/linuxGcc45/general Normal file
View File

@ -0,0 +1,10 @@
# need single-line output from cpp
CPP = cpp -traditional-cpp
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/c
include $(RULES)/c++

3
wmake/rules/linuxGcc45/mplibHPMPI Normal file
View File

@ -0,0 +1,3 @@
PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi

1
wmake/rules/linuxIA64Gcc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linuxIA64Gcc/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linuxIA64Gcc/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linuxIA64Icc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linuxIA64Icc/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linuxIA64Icc/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

1
wmake/rules/linuxIcc/X
View File

@ -1 +0,0 @@
../General/X

1
wmake/rules/linuxIcc/general
View File

@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

1
wmake/rules/linuxIcc/mplib
View File

@ -1 +0,0 @@
../General/mplib

1
wmake/rules/linuxIcc/mplibMPICH
View File

@ -1 +0,0 @@
../General/mplibMPICH

1
wmake/rules/linuxIcc/mplibOPENMPI
View File

@ -1 +0,0 @@
../General/mplibOPENMPI

1
wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
View File

@ -1 +0,0 @@
../General/mplibSYSTEMOPENMPI

Some files were not shown because too many files have changed in this diff Show More