Merge branch 'nextRelease' of ssh://git.code.sf.net/p/openfoam-extend/OpenFOAM-1.6-ext into nextRelease
This commit is contained in:
Hrvoje Jasak
commit
87e85bcedb
31 changed files with 4 additions and 144 deletions
|
|
@ -25,6 +25,7 @@ License
|
||||||
|
|
||||||
#include "directMappedPolyPatch.H"
|
#include "directMappedPolyPatch.H"
|
||||||
#include "addToRunTimeSelectionTable.H"
|
#include "addToRunTimeSelectionTable.H"
|
||||||
|
#include "objectRegistry.H"
|
||||||
#include "Time.H"
|
#include "Time.H"
|
||||||
#include "polyMesh.H"
|
#include "polyMesh.H"
|
||||||
#include "polyBoundaryMesh.H"
|
#include "polyBoundaryMesh.H"
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ License
|
||||||
|
|
||||||
#include "directMappedWallPolyPatch.H"
|
#include "directMappedWallPolyPatch.H"
|
||||||
#include "addToRunTimeSelectionTable.H"
|
#include "addToRunTimeSelectionTable.H"
|
||||||
|
#include "objectRegistry.H"
|
||||||
#include "Time.H"
|
#include "Time.H"
|
||||||
#include "polyMesh.H"
|
#include "polyMesh.H"
|
||||||
#include "polyBoundaryMesh.H"
|
#include "polyBoundaryMesh.H"
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
XFLAGS =
|
|
||||||
XINC = $(XFLAGS) -I/usr/X11R6/include
|
|
||||||
XLIBS = -L/usr/X11R6/lib -lXext -lX11
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
.SUFFIXES: .c .h
|
|
||||||
|
|
||||||
cWARN = -Wall
|
|
||||||
|
|
||||||
cc = gcc $(WM_CXXFLAGS)
|
|
||||||
|
|
||||||
include $(RULES)/c$(WM_COMPILE_OPTION)
|
|
||||||
|
|
||||||
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC -Ddarwin
|
|
||||||
|
|
||||||
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
|
|
||||||
|
|
||||||
LINK_LIBS = $(cDBUG)
|
|
||||||
|
|
||||||
LINKLIBSO = $(cc) -dynamiclib -flat_namespace -undefined suppress
|
|
||||||
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
.SUFFIXES: .C .cxx .cc .cpp
|
|
||||||
|
|
||||||
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
|
|
||||||
|
|
||||||
CC = g++ $(WM_CXXFLAGS)
|
|
||||||
|
|
||||||
include $(RULES)/c++$(WM_COMPILE_OPTION)
|
|
||||||
|
|
||||||
ptFLAGS = -DNoRepository -ftemplate-depth-200
|
|
||||||
|
|
||||||
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -Ddarwin
|
|
||||||
|
|
||||||
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
|
|
||||||
cxxtoo = $(Ctoo)
|
|
||||||
cctoo = $(Ctoo)
|
|
||||||
cpptoo = $(Ctoo)
|
|
||||||
|
|
||||||
LINK_LIBS = $(c++DBUG) -lpthread
|
|
||||||
|
|
||||||
LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
|
|
||||||
# LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream
|
|
||||||
LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
c++DBUG = -ggdb2 -DFULLDEBUG
|
|
||||||
c++OPT = -O0 -fdefault-inline
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
c++DBUG =
|
|
||||||
c++OPT = -O3
|
|
||||||
#c++OPT = -march=nocona -O3
|
|
||||||
# -ftree-vectorize -ftree-vectorizer-verbose=3
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
c++DBUG = -pg
|
|
||||||
c++OPT = -O2
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
cDBUG = -ggdb -DFULLDEBUG
|
|
||||||
cOPT = -O1 -fdefault-inline -finline-functions
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
cDBUG =
|
|
||||||
cOPT = -O3
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
cDBUG = -pg
|
|
||||||
cOPT = -O2
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
CPP = cpp $(GFLAGS)
|
|
||||||
LD = ld
|
|
||||||
|
|
||||||
PROJECT_LIBS = -l$(WM_PROJECT)
|
|
||||||
|
|
||||||
include $(GENERAL_RULES)/standard
|
|
||||||
|
|
||||||
include $(RULES)/X
|
|
||||||
include $(RULES)/c
|
|
||||||
include $(RULES)/c++
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
PFLAGS =
|
|
||||||
PINC =
|
|
||||||
PLIBS =
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
PFLAGS = -DOMPI_SKIP_MPICXX
|
|
||||||
PINC = -I$(MPI_ARCH_PATH)/include
|
|
||||||
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
PFLAGS = -DOMPI_SKIP_MPICXX
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
cWARN = -Wall
|
cWARN = -Wall
|
||||||
|
|
||||||
cc = $(WM_CC) $(WM_CXXFLAGS) -fsignaling-nans -ftrapping-math
|
cc = $(WM_CC) $(WM_CXXFLAGS) -ftrapping-math
|
||||||
|
|
||||||
include $(RULES)/c$(WM_COMPILE_OPTION)
|
include $(RULES)/c$(WM_COMPILE_OPTION)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-c++11-extensions -Wno-unused-comparison
|
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-c++11-extensions -Wno-unused-comparison
|
||||||
|
|
||||||
CC = $(WM_CXX) $(WM_CXXFLAGS) -fsignaling-nans -ftrapping-math
|
CC = $(WM_CXX) $(WM_CXXFLAGS) -ftrapping-math
|
||||||
|
|
||||||
include $(RULES)/c++$(WM_COMPILE_OPTION)
|
include $(RULES)/c++$(WM_COMPILE_OPTION)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
XFLAGS =
|
|
||||||
XINC = $(XFLAGS) -I/usr/X11R6/include
|
|
||||||
XLIBS = -L/usr/X11R6/lib -lXext -lX11
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
.SUFFIXES: .c .h
|
|
||||||
|
|
||||||
cWARN = -Wall
|
|
||||||
|
|
||||||
cc = gcc $(WM_CXXFLAGS)
|
|
||||||
|
|
||||||
include $(RULES)/c$(WM_COMPILE_OPTION)
|
|
||||||
|
|
||||||
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC -Ddarwin
|
|
||||||
|
|
||||||
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
|
|
||||||
|
|
||||||
LINK_LIBS = $(cDBUG)
|
|
||||||
|
|
||||||
LINKLIBSO = $(cc) -dynamiclib -flat_namespace -undefined suppress
|
|
||||||
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
.SUFFIXES: .C .cxx .cc .cpp
|
|
||||||
|
|
||||||
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
|
|
||||||
|
|
||||||
CC = g++ $(WM_CXXFLAGS)
|
|
||||||
|
|
||||||
include $(RULES)/c++$(WM_COMPILE_OPTION)
|
|
||||||
|
|
||||||
ptFLAGS = -DNoRepository -ftemplate-depth-200
|
|
||||||
|
|
||||||
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -Ddarwin
|
|
||||||
|
|
||||||
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
|
|
||||||
cxxtoo = $(Ctoo)
|
|
||||||
cctoo = $(Ctoo)
|
|
||||||
cpptoo = $(Ctoo)
|
|
||||||
|
|
||||||
LINK_LIBS = $(c++DBUG) -lpthread
|
|
||||||
|
|
||||||
LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
|
|
||||||
# LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream
|
|
||||||
LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
c++DBUG = -ggdb3 -DFULLDEBUG
|
|
||||||
c++OPT = -O0 -fdefault-inline
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
c++DBUG =
|
|
||||||
c++OPT = -O3
|
|
||||||
# c++OPT = -O3 -ffast-math -fsignaling-nans
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
c++DBUG = -pg
|
|
||||||
c++OPT = -O2
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
cDBUG = -ggdb -DFULLDEBUG
|
|
||||||
cOPT = -O1 -fdefault-inline -finline-functions
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
cDBUG =
|
|
||||||
cOPT = -O3
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
cDBUG = -pg
|
|
||||||
cOPT = -O2
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
CPP = cpp $(GFLAGS)
|
|
||||||
LD = ld
|
|
||||||
|
|
||||||
PROJECT_LIBS = -l$(WM_PROJECT)
|
|
||||||
|
|
||||||
include $(GENERAL_RULES)/standard
|
|
||||||
|
|
||||||
include $(RULES)/X
|
|
||||||
include $(RULES)/c
|
|
||||||
include $(RULES)/c++
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
PFLAGS =
|
|
||||||
PINC =
|
|
||||||
PLIBS =
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
PFLAGS = -DOMPI_SKIP_MPICXX
|
|
||||||
PINC = -I$(MPI_ARCH_PATH)/include
|
|
||||||
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi
|
|
||||||
Reference in a new issue