From a2778220876405acb256b6f1918e89e53d25c845 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 17 Dec 2013 09:02:35 +0000 Subject: [PATCH 1/2] PORT: Mac port headers update for Time.H --- .../directMapped/directMappedPolyPatch/directMappedPolyPatch.C | 1 + .../directMappedPolyPatch/directMappedWallPolyPatch.C | 1 + 2 files changed, 2 insertions(+) diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C index 03e601a39..e6333a42c 100644 --- 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" diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C index 3bce4e694..691ad43fe 100644 --- 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" From 7b07622f0b5b6c11da1d57950658670df94554df Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 17 Dec 2013 09:02:58 +0000 Subject: [PATCH 2/2] PORT: Update darwin rules --- wmake/rules/darwinIntel/ARCHITECTURE_UNTESTED | 0 wmake/rules/darwinIntel/X | 3 --- wmake/rules/darwinIntel/c | 16 -------------- wmake/rules/darwinIntel/c++ | 22 ------------------- wmake/rules/darwinIntel/c++Debug | 2 -- wmake/rules/darwinIntel/c++Opt | 4 ---- wmake/rules/darwinIntel/c++Prof | 2 -- wmake/rules/darwinIntel/cDebug | 2 -- wmake/rules/darwinIntel/cOpt | 2 -- wmake/rules/darwinIntel/cProf | 2 -- wmake/rules/darwinIntel/general | 10 --------- wmake/rules/darwinIntel/mplib | 3 --- wmake/rules/darwinIntel/mplibOPENMPI | 3 --- wmake/rules/darwinIntel/mplibSYSTEMOPENMPI | 1 - wmake/rules/darwinIntel64Gcc/c | 2 +- wmake/rules/darwinIntel64Gcc/c++ | 2 +- wmake/rules/darwinPpc/ARCHITECTURE_UNTESTED | 0 wmake/rules/darwinPpc/X | 3 --- wmake/rules/darwinPpc/c | 16 -------------- wmake/rules/darwinPpc/c++ | 22 ------------------- wmake/rules/darwinPpc/c++Debug | 2 -- wmake/rules/darwinPpc/c++Opt | 3 --- wmake/rules/darwinPpc/c++Prof | 2 -- wmake/rules/darwinPpc/cDebug | 2 -- wmake/rules/darwinPpc/cOpt | 2 -- wmake/rules/darwinPpc/cProf | 2 -- wmake/rules/darwinPpc/general | 10 --------- wmake/rules/darwinPpc/mplib | 3 --- wmake/rules/darwinPpc/mplibOPENMPI | 3 --- 29 files changed, 2 insertions(+), 144 deletions(-) delete mode 100644 wmake/rules/darwinIntel/ARCHITECTURE_UNTESTED delete mode 100644 wmake/rules/darwinIntel/X delete mode 100644 wmake/rules/darwinIntel/c delete mode 100644 wmake/rules/darwinIntel/c++ delete mode 100644 wmake/rules/darwinIntel/c++Debug delete mode 100644 wmake/rules/darwinIntel/c++Opt delete mode 100644 wmake/rules/darwinIntel/c++Prof delete mode 100644 wmake/rules/darwinIntel/cDebug delete mode 100644 wmake/rules/darwinIntel/cOpt delete mode 100644 wmake/rules/darwinIntel/cProf delete mode 100644 wmake/rules/darwinIntel/general delete mode 100644 wmake/rules/darwinIntel/mplib delete mode 100644 wmake/rules/darwinIntel/mplibOPENMPI delete mode 100644 wmake/rules/darwinIntel/mplibSYSTEMOPENMPI delete mode 100644 wmake/rules/darwinPpc/ARCHITECTURE_UNTESTED delete mode 100644 wmake/rules/darwinPpc/X delete mode 100644 wmake/rules/darwinPpc/c delete mode 100644 wmake/rules/darwinPpc/c++ delete mode 100644 wmake/rules/darwinPpc/c++Debug delete mode 100644 wmake/rules/darwinPpc/c++Opt delete mode 100644 wmake/rules/darwinPpc/c++Prof delete mode 100644 wmake/rules/darwinPpc/cDebug delete mode 100644 wmake/rules/darwinPpc/cOpt delete mode 100644 wmake/rules/darwinPpc/cProf delete mode 100644 wmake/rules/darwinPpc/general delete mode 100644 wmake/rules/darwinPpc/mplib delete mode 100644 wmake/rules/darwinPpc/mplibOPENMPI diff --git a/wmake/rules/darwinIntel/ARCHITECTURE_UNTESTED b/wmake/rules/darwinIntel/ARCHITECTURE_UNTESTED deleted file mode 100644 index e69de29bb..000000000 diff --git a/wmake/rules/darwinIntel/X b/wmake/rules/darwinIntel/X deleted file mode 100644 index bed8bfedd..000000000 --- a/wmake/rules/darwinIntel/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/darwinIntel/c b/wmake/rules/darwinIntel/c deleted file mode 100644 index a686d4eeb..000000000 --- a/wmake/rules/darwinIntel/c +++ /dev/null @@ -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 diff --git a/wmake/rules/darwinIntel/c++ b/wmake/rules/darwinIntel/c++ deleted file mode 100644 index 184b71896..000000000 --- a/wmake/rules/darwinIntel/c++ +++ /dev/null @@ -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 diff --git a/wmake/rules/darwinIntel/c++Debug b/wmake/rules/darwinIntel/c++Debug deleted file mode 100644 index 684957e11..000000000 --- a/wmake/rules/darwinIntel/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb2 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/darwinIntel/c++Opt b/wmake/rules/darwinIntel/c++Opt deleted file mode 100644 index 3446f7f58..000000000 --- a/wmake/rules/darwinIntel/c++Opt +++ /dev/null @@ -1,4 +0,0 @@ -c++DBUG = -c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/darwinIntel/c++Prof b/wmake/rules/darwinIntel/c++Prof deleted file mode 100644 index 3bda4dad5..000000000 --- a/wmake/rules/darwinIntel/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/darwinIntel/cDebug b/wmake/rules/darwinIntel/cDebug deleted file mode 100644 index 72b638f45..000000000 --- a/wmake/rules/darwinIntel/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/darwinIntel/cOpt b/wmake/rules/darwinIntel/cOpt deleted file mode 100644 index 17318709f..000000000 --- a/wmake/rules/darwinIntel/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/darwinIntel/cProf b/wmake/rules/darwinIntel/cProf deleted file mode 100644 index ca3ac9bf5..000000000 --- a/wmake/rules/darwinIntel/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/darwinIntel/general b/wmake/rules/darwinIntel/general deleted file mode 100644 index a69a25f37..000000000 --- a/wmake/rules/darwinIntel/general +++ /dev/null @@ -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++ diff --git a/wmake/rules/darwinIntel/mplib b/wmake/rules/darwinIntel/mplib deleted file mode 100644 index 294bd8615..000000000 --- a/wmake/rules/darwinIntel/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/darwinIntel/mplibOPENMPI b/wmake/rules/darwinIntel/mplibOPENMPI deleted file mode 100644 index 834d2d3e2..000000000 --- a/wmake/rules/darwinIntel/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi diff --git a/wmake/rules/darwinIntel/mplibSYSTEMOPENMPI b/wmake/rules/darwinIntel/mplibSYSTEMOPENMPI deleted file mode 100644 index 98fa814ce..000000000 --- a/wmake/rules/darwinIntel/mplibSYSTEMOPENMPI +++ /dev/null @@ -1 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX diff --git a/wmake/rules/darwinIntel64Gcc/c b/wmake/rules/darwinIntel64Gcc/c index b05a7379c..b91a7d24d 100644 --- 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) diff --git a/wmake/rules/darwinIntel64Gcc/c++ b/wmake/rules/darwinIntel64Gcc/c++ index c93031846..92fab6bc4 100644 --- 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) diff --git a/wmake/rules/darwinPpc/ARCHITECTURE_UNTESTED b/wmake/rules/darwinPpc/ARCHITECTURE_UNTESTED deleted file mode 100644 index e69de29bb..000000000 diff --git a/wmake/rules/darwinPpc/X b/wmake/rules/darwinPpc/X deleted file mode 100644 index bed8bfedd..000000000 --- a/wmake/rules/darwinPpc/X +++ /dev/null @@ -1,3 +0,0 @@ -XFLAGS = -XINC = $(XFLAGS) -I/usr/X11R6/include -XLIBS = -L/usr/X11R6/lib -lXext -lX11 diff --git a/wmake/rules/darwinPpc/c b/wmake/rules/darwinPpc/c deleted file mode 100644 index a686d4eeb..000000000 --- a/wmake/rules/darwinPpc/c +++ /dev/null @@ -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 diff --git a/wmake/rules/darwinPpc/c++ b/wmake/rules/darwinPpc/c++ deleted file mode 100644 index 184b71896..000000000 --- a/wmake/rules/darwinPpc/c++ +++ /dev/null @@ -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 diff --git a/wmake/rules/darwinPpc/c++Debug b/wmake/rules/darwinPpc/c++Debug deleted file mode 100644 index 19bdb9c33..000000000 --- a/wmake/rules/darwinPpc/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/darwinPpc/c++Opt b/wmake/rules/darwinPpc/c++Opt deleted file mode 100644 index 04a659fda..000000000 --- a/wmake/rules/darwinPpc/c++Opt +++ /dev/null @@ -1,3 +0,0 @@ -c++DBUG = -c++OPT = -O3 -# c++OPT = -O3 -ffast-math -fsignaling-nans diff --git a/wmake/rules/darwinPpc/c++Prof b/wmake/rules/darwinPpc/c++Prof deleted file mode 100644 index 3bda4dad5..000000000 --- a/wmake/rules/darwinPpc/c++Prof +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -pg -c++OPT = -O2 diff --git a/wmake/rules/darwinPpc/cDebug b/wmake/rules/darwinPpc/cDebug deleted file mode 100644 index 72b638f45..000000000 --- a/wmake/rules/darwinPpc/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/darwinPpc/cOpt b/wmake/rules/darwinPpc/cOpt deleted file mode 100644 index 17318709f..000000000 --- a/wmake/rules/darwinPpc/cOpt +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -cOPT = -O3 diff --git a/wmake/rules/darwinPpc/cProf b/wmake/rules/darwinPpc/cProf deleted file mode 100644 index ca3ac9bf5..000000000 --- a/wmake/rules/darwinPpc/cProf +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -pg -cOPT = -O2 diff --git a/wmake/rules/darwinPpc/general b/wmake/rules/darwinPpc/general deleted file mode 100644 index a69a25f37..000000000 --- a/wmake/rules/darwinPpc/general +++ /dev/null @@ -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++ diff --git a/wmake/rules/darwinPpc/mplib b/wmake/rules/darwinPpc/mplib deleted file mode 100644 index 294bd8615..000000000 --- a/wmake/rules/darwinPpc/mplib +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -PLIBS = diff --git a/wmake/rules/darwinPpc/mplibOPENMPI b/wmake/rules/darwinPpc/mplibOPENMPI deleted file mode 100644 index 834d2d3e2..000000000 --- a/wmake/rules/darwinPpc/mplibOPENMPI +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -DOMPI_SKIP_MPICXX -PINC = -I$(MPI_ARCH_PATH)/include -PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi