Merge branch 'nextRelease' of ssh://git.code.sf.net/p/openfoam-extend/OpenFOAM-1.6-ext into nextRelease

2013-12-17 10:30:53 +00:00 · 2013-12-17 10:30:53 +00:00 · 87e85bcedb
commit 87e85bcedb
parent 9347abbb5c 7b07622f0b
31 changed files with 4 additions and 144 deletions
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
@ -25,6 +25,7 @@ License

 #include "directMappedPolyPatch.H"
 #include "addToRunTimeSelectionTable.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "polyMesh.H"
 #include "polyBoundaryMesh.H"
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
@ -25,6 +25,7 @@ License

 #include "directMappedWallPolyPatch.H"
 #include "addToRunTimeSelectionTable.H"
+#include "objectRegistry.H"
 #include "Time.H"
 #include "polyMesh.H"
 #include "polyBoundaryMesh.H"
--- a/wmake/rules/darwinIntel/ARCHITECTURE_UNTESTED
+++ b/wmake/rules/darwinIntel/ARCHITECTURE_UNTESTED
--- a/wmake/rules/darwinIntel/X
+++ b/wmake/rules/darwinIntel/X
@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
--- a/wmake/rules/darwinIntel/c
+++ b/wmake/rules/darwinIntel/c
@ -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
--- a/wmake/rules/darwinIntel/c++
+++ b/wmake/rules/darwinIntel/c++
@ -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
--- a/wmake/rules/darwinIntel/c++Debug
+++ b/wmake/rules/darwinIntel/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb2 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/darwinIntel/c++Opt
+++ b/wmake/rules/darwinIntel/c++Opt
@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-#c++OPT      = -march=nocona -O3
-# -ftree-vectorize -ftree-vectorizer-verbose=3
--- a/wmake/rules/darwinIntel/c++Prof
+++ b/wmake/rules/darwinIntel/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/darwinIntel/cDebug
+++ b/wmake/rules/darwinIntel/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/darwinIntel/cOpt
+++ b/wmake/rules/darwinIntel/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/darwinIntel/cProf
+++ b/wmake/rules/darwinIntel/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/darwinIntel/general
+++ b/wmake/rules/darwinIntel/general
@ -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++
--- a/wmake/rules/darwinIntel/mplib
+++ b/wmake/rules/darwinIntel/mplib
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
--- a/wmake/rules/darwinIntel/mplibOPENMPI
+++ b/wmake/rules/darwinIntel/mplibOPENMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
--- a/wmake/rules/darwinIntel/mplibSYSTEMOPENMPI
+++ b/wmake/rules/darwinIntel/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
--- a/wmake/rules/darwinIntel64Gcc/c
+++ b/wmake/rules/darwinIntel64Gcc/c
@ -2,7 +2,7 @@

 cWARN        = -Wall

-cc          = $(WM_CC) $(WM_CXXFLAGS) -fsignaling-nans  -ftrapping-math
+cc          = $(WM_CC) $(WM_CXXFLAGS) -ftrapping-math

 include $(RULES)/c$(WM_COMPILE_OPTION)

--- a/wmake/rules/darwinIntel64Gcc/c++
+++ b/wmake/rules/darwinIntel64Gcc/c++
@ -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

-CC          = $(WM_CXX) $(WM_CXXFLAGS) -fsignaling-nans  -ftrapping-math
+CC          = $(WM_CXX) $(WM_CXXFLAGS) -ftrapping-math

 include $(RULES)/c++$(WM_COMPILE_OPTION)

--- a/wmake/rules/darwinPpc/ARCHITECTURE_UNTESTED
+++ b/wmake/rules/darwinPpc/ARCHITECTURE_UNTESTED
--- a/wmake/rules/darwinPpc/X
+++ b/wmake/rules/darwinPpc/X
@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
--- a/wmake/rules/darwinPpc/c
+++ b/wmake/rules/darwinPpc/c
@ -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
--- a/wmake/rules/darwinPpc/c++
+++ b/wmake/rules/darwinPpc/c++
@ -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
--- a/wmake/rules/darwinPpc/c++Debug
+++ b/wmake/rules/darwinPpc/c++Debug
@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
--- a/wmake/rules/darwinPpc/c++Opt
+++ b/wmake/rules/darwinPpc/c++Opt
@ -1,3 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-# c++OPT      = -O3 -ffast-math -fsignaling-nans
--- a/wmake/rules/darwinPpc/c++Prof
+++ b/wmake/rules/darwinPpc/c++Prof
@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
--- a/wmake/rules/darwinPpc/cDebug
+++ b/wmake/rules/darwinPpc/cDebug
@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
--- a/wmake/rules/darwinPpc/cOpt
+++ b/wmake/rules/darwinPpc/cOpt
@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
--- a/wmake/rules/darwinPpc/cProf
+++ b/wmake/rules/darwinPpc/cProf
@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
--- a/wmake/rules/darwinPpc/general
+++ b/wmake/rules/darwinPpc/general
@ -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++
--- a/wmake/rules/darwinPpc/mplib
+++ b/wmake/rules/darwinPpc/mplib
@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
--- a/wmake/rules/darwinPpc/mplibOPENMPI
+++ b/wmake/rules/darwinPpc/mplibOPENMPI
@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi