Commit fbad999d authored by Franjo's avatar Franjo

Merge branch 'defect-compilationWithOpenFOAM-4.x' into development

parents 5f501575 e6ac2ba8
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
...@@ -6,9 +27,6 @@ EXE_INC = \ ...@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ $(CFMESH_LIBS) \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
-L$(FOAM_USER_LIBBIN) \ -L$(FOAM_USER_LIBBIN) \
-lmeshLibrary -lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
...@@ -6,9 +27,6 @@ EXE_INC = \ ...@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ $(CFMESH_LIBS) \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
-L$(FOAM_USER_LIBBIN) \ -L$(FOAM_USER_LIBBIN) \
-lmeshLibrary -lmeshLibrary
...@@ -30,8 +30,6 @@ Description ...@@ -30,8 +30,6 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "objectRegistry.H"
#include "Time.H"
#include "cartesianMeshGenerator.H" #include "cartesianMeshGenerator.H"
using namespace Foam; using namespace Foam;
......
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
...@@ -6,9 +27,6 @@ EXE_INC = \ ...@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ $(CFMESH_LIBS) \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
-L$(FOAM_USER_LIBBIN) \ -L$(FOAM_USER_LIBBIN) \
-lmeshLibrary -lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
CFMESH_MACROS = -DExtendSpecific
else
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
...@@ -6,9 +27,6 @@ EXE_INC = \ ...@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lmeshTools \ $(CFMESH_LIBS) \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
-L$(FOAM_USER_LIBBIN) \ -L$(FOAM_USER_LIBBIN) \
-lmeshLibrary -lmeshLibrary
...@@ -4,8 +4,30 @@ else ...@@ -4,8 +4,30 @@ else
OMP_FLAGS = OMP_FLAGS =
endif endif
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
LIBS =
else
CFMESH_MACROS =
LIBS =
endif
endif
ifeq ($(WM_PROJECT), foam)
VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
ifeq ($(VER), 1)
CFMESH_MACROS = -DExtendSpecific
LIBS = -lmeshTools -ledgeMesh
else
CFMESH_MACROS =
endif
endif
EXE_INC = \ EXE_INC = \
$(OMP_FLAGS) \ $(OMP_FLAGS) $(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = $(LIBS)
...@@ -32,7 +32,6 @@ Description ...@@ -32,7 +32,6 @@ Description
#include "triSurfacePatchManipulator.H" #include "triSurfacePatchManipulator.H"
#include "triSurfaceCleanupDuplicateTriangles.H" #include "triSurfaceCleanupDuplicateTriangles.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"
#include "Time.H"
#include "meshOctreeCreator.H" #include "meshOctreeCreator.H"
#include "cartesianMeshExtractor.H" #include "cartesianMeshExtractor.H"
#include "meshSurfaceEngine.H" #include "meshSurfaceEngine.H"
......
...@@ -29,7 +29,6 @@ Description ...@@ -29,7 +29,6 @@ Description
#include "triSurf.H" #include "triSurf.H"
#include "triSurfacePatchManipulator.H" #include "triSurfacePatchManipulator.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"
#include "Time.H"
#include "meshOctreeCreator.H" #include "meshOctreeCreator.H"
#include "cartesianMeshExtractor.H" #include "cartesianMeshExtractor.H"
#include "meshSurfaceEngine.H" #include "meshSurfaceEngine.H"
......
...@@ -28,7 +28,6 @@ Description ...@@ -28,7 +28,6 @@ Description
#include "tetMeshGenerator.H" #include "tetMeshGenerator.H"
#include "triSurf.H" #include "triSurf.H"
#include "demandDrivenData.H" #include "demandDrivenData.H"
#include "Time.H"
#include "meshOctreeCreator.H" #include "meshOctreeCreator.H"
#include "tetMeshExtractorOctree.H" #include "tetMeshExtractorOctree.H"
#include "meshSurfaceEngine.H" #include "meshSurfaceEngine.H"
......
...@@ -35,8 +35,6 @@ SourceFiles ...@@ -35,8 +35,6 @@ SourceFiles
#ifndef boundaryLayers_H #ifndef boundaryLayers_H
#define boundaryLayers_H #define boundaryLayers_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H" #include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H" #include "meshSurfaceEngine.H"
#include "meshSurfacePartitioner.H" #include "meshSurfacePartitioner.H"
......
...@@ -36,8 +36,6 @@ SourceFiles ...@@ -36,8 +36,6 @@ SourceFiles
#ifndef extrudeLayer_H #ifndef extrudeLayer_H
#define extrudeLayer_H #define extrudeLayer_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H" #include "polyMeshGenModifier.H"
#include "VRWGraphList.H" #include "VRWGraphList.H"
#include "labelPair.H" #include "labelPair.H"
...@@ -54,51 +52,51 @@ namespace Foam ...@@ -54,51 +52,51 @@ namespace Foam
class extrudeLayer class extrudeLayer
{ {
// Private data // Private data
//- Reference to the mesh //- Reference to the mesh
polyMeshGen& mesh_; polyMeshGen& mesh_;
//- thickness //- thickness
const scalar thickness_; const scalar thickness_;
//- number of points in the original mesh //- number of points in the original mesh
const label nOrigPoints_; const label nOrigPoints_;
//- number of faces in the original mesh //- number of faces in the original mesh
const label nOrigFaces_; const label nOrigFaces_;
//- number of cells in the original mesh //- number of cells in the original mesh
const label nOrigCells_; const label nOrigCells_;
//- pairs of faces making the extruded front //- pairs of faces making the extruded front
LongList<labelPair> extrudedFaces_; LongList<labelPair> extrudedFaces_;
//- store the orientation of the extruded front //- store the orientation of the extruded front
//- true if the pair has the same orientation and false otherwise //- true if the pair has the same orientation and false otherwise
LongList<bool> pairOrientation_; LongList<bool> pairOrientation_;
//- original point label //- original point label
labelLongList origPointLabel_; labelLongList origPointLabel_;
// Private member functions // Private member functions
//- duplicate faces which will be extruded //- duplicate faces which will be extruded
void createDuplicateFrontFaces(const LongList<labelPair>&); void createDuplicateFrontFaces(const LongList<labelPair>&);
//- create new vertices and open the mesh //- create new vertices and open the mesh
void createNewVertices(); void createNewVertices();
//- move points to make space for the new cells //- move points to make space for the new cells
void movePoints(); void movePoints();
//- create layer cells //- create layer cells
void createLayerCells(); void createLayerCells();
//- create new faces at parallel boundaries //- create new faces at parallel boundaries
void createNewFacesParallel(); void createNewFacesParallel();
//- update boundary patches //- update boundary patches
void updateBoundary(); void updateBoundary();
// Nested classes // Nested classes
//- this class provides addressing data needed for generating //- this class provides addressing data needed for generating
//- cells emerging as a consequence of self-intersecting layers //- cells emerging as a consequence of self-intersecting layers
...@@ -107,18 +105,18 @@ class extrudeLayer ...@@ -107,18 +105,18 @@ class extrudeLayer
// Private data // Private data
//- const reference to mesh faces //- const reference to mesh faces
const faceListPMG& faces_; const faceListPMG& faces_;
//- const reference to extruded face pairs //- const reference to extruded face pairs
const LongList<labelPair>& extrudedFaces_; const LongList<labelPair>& extrudedFaces_;
//- const reference telling the orientation of each face pair //- const reference telling the orientation of each face pair
LongList<bool> pairOrientation_; LongList<bool> pairOrientation_;
//- const reference to the extruded faces at points //- const reference to the extruded faces at points
const VRWGraph& pointExtruded_; const VRWGraph& pointExtruded_;
public: public:
// Construct from faces, extruded face pairs and // Construct from faces, extruded face pairs and
// point-extrudedfaces addressing // point-extrudedfaces addressing
addressingCalculator addressingCalculator
...@@ -128,41 +126,41 @@ class extrudeLayer ...@@ -128,41 +126,41 @@ class extrudeLayer
const LongList<bool>& pairOrientation, const LongList<bool>& pairOrientation,
const VRWGraph& pointFaces const VRWGraph& pointFaces
); );
// Destructor // Destructor
~addressingCalculator(); ~addressingCalculator();
// Member functions // Member functions
//- return label of the original face for the given face //- return label of the original face for the given face
inline label origFaceLabel(const label extrudedI) const; inline label origFaceLabel(const label extrudedI) const;
//- return position of point in extruded face //- return position of point in extruded face
inline label positionInFace inline label positionInFace
( (
const label extrudedI, const label extrudedI,
const label pointI const label pointI
) const; ) const;
//- return point label in the original face //- return point label in the original face
inline label origPointLabel inline label origPointLabel
( (
const label extrudedI, const label extrudedI,
const label pos const label pos
) const; ) const;
inline label origPoint inline label origPoint
( (
const label extrudedI, const label extrudedI,
const label pointI const label pointI
) const; ) const;
//- find face sharing an edge with the given face //- find face sharing an edge with the given face
inline label faceSharingEdge inline label faceSharingEdge
( (
const label extrudedI, const label extrudedI,
const label eI const label eI
) const; ) const;
//- find faces attached to both points //- find faces attached to both points
inline void facesSharingEdge inline void facesSharingEdge
( (
...@@ -171,7 +169,7 @@ class extrudeLayer ...@@ -171,7 +169,7 @@ class extrudeLayer
DynList<label>& DynList<label>&
) const; ) const;
}; };
// Enumerators // Enumerators
enum extrudeLayerTypes_ enum extrudeLayerTypes_
{ {
...@@ -179,17 +177,17 @@ class extrudeLayer ...@@ -179,17 +177,17 @@ class extrudeLayer
FRONTVERTEX = 1, FRONTVERTEX = 1,
FRONTVERTEXPROCBND = 2 FRONTVERTEXPROCBND = 2
}; };
//- Disallow bitwise copy construct //- Disallow bitwise copy construct
extrudeLayer(const extrudeLayer&); extrudeLayer(const extrudeLayer&);
//- Disallow bitwise assignment //- Disallow bitwise assignment
void operator=(const extrudeLayer&); void operator=(const extrudeLayer&);
public: public:
// Constructors // Constructors
//- Construct from mesh, extrusion faces, thickness and number of layers //- Construct from mesh, extrusion faces, thickness and number of layers
extrudeLayer extrudeLayer
( (
...@@ -197,10 +195,10 @@ class extrudeLayer ...@@ -197,10 +195,10 @@ class extrudeLayer
const LongList<labelPair>& extrusionFront, const LongList<labelPair>& extrusionFront,
const scalar thickness = -1.0 const scalar thickness = -1.0
); );
// Destructor // Destructor
~extrudeLayer(); ~extrudeLayer();
// Public member functions // Public member functions
}; };
......
...@@ -36,8 +36,6 @@ SourceFiles ...@@ -36,8 +36,6 @@ SourceFiles
#ifndef refineBoundaryLayers_H #ifndef refineBoundaryLayers_H
#define refineBoundaryLayers_H #define refineBoundaryLayers_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H" #include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H" #include "meshSurfaceEngine.H"
#include "DynList.H" #include "DynList.H"
......
...@@ -36,8 +36,6 @@ SourceFiles ...@@ -36,8 +36,6 @@ SourceFiles
#ifndef triangulateNonPlanarBaseFaces_H #ifndef triangulateNonPlanarBaseFaces_H
#define triangulateNonPlanarBaseFaces_H #define triangulateNonPlanarBaseFaces_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H" #include "polyMeshGenModifier.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
...@@ -35,8 +35,6 @@ SourceFiles ...@@ -35,8 +35,6 @@ SourceFiles
#ifndef checkMeshDict_H #ifndef checkMeshDict_H
#define checkMeshDict_H #define checkMeshDict_H
#include "objectRegistry.H"
#include "Time.H"
#include "IOdictionary.H" #include "IOdictionary.H"
#include <map>