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 = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
......@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
$(CFMESH_LIBS) \
-L$(FOAM_USER_LIBBIN) \
-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 = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
......@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
$(CFMESH_LIBS) \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
......@@ -30,8 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "objectRegistry.H"
#include "Time.H"
#include "cartesianMeshGenerator.H"
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 = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
......@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
$(CFMESH_LIBS) \
-L$(FOAM_USER_LIBBIN) \
-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 = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
......@@ -6,9 +27,6 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \
-ltriSurface \
-lfiniteVolume \
-ledgeMesh \
$(CFMESH_LIBS) \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
......@@ -4,8 +4,30 @@ else
OMP_FLAGS =
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 = \
$(OMP_FLAGS) \
$(OMP_FLAGS) $(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = $(LIBS)
......@@ -32,7 +32,6 @@ Description
#include "triSurfacePatchManipulator.H"
#include "triSurfaceCleanupDuplicateTriangles.H"
#include "demandDrivenData.H"
#include "Time.H"
#include "meshOctreeCreator.H"
#include "cartesianMeshExtractor.H"
#include "meshSurfaceEngine.H"
......
......@@ -29,7 +29,6 @@ Description
#include "triSurf.H"
#include "triSurfacePatchManipulator.H"
#include "demandDrivenData.H"
#include "Time.H"
#include "meshOctreeCreator.H"
#include "cartesianMeshExtractor.H"
#include "meshSurfaceEngine.H"
......
......@@ -28,7 +28,6 @@ Description
#include "tetMeshGenerator.H"
#include "triSurf.H"
#include "demandDrivenData.H"
#include "Time.H"
#include "meshOctreeCreator.H"
#include "tetMeshExtractorOctree.H"
#include "meshSurfaceEngine.H"
......
......@@ -35,8 +35,6 @@ SourceFiles
#ifndef boundaryLayers_H
#define boundaryLayers_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H"
#include "meshSurfacePartitioner.H"
......
......@@ -36,8 +36,6 @@ SourceFiles
#ifndef extrudeLayer_H
#define extrudeLayer_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "VRWGraphList.H"
#include "labelPair.H"
......
......@@ -36,8 +36,6 @@ SourceFiles
#ifndef refineBoundaryLayers_H
#define refineBoundaryLayers_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H"
#include "DynList.H"
......
......@@ -36,8 +36,6 @@ SourceFiles
#ifndef triangulateNonPlanarBaseFaces_H
#define triangulateNonPlanarBaseFaces_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -35,8 +35,6 @@ SourceFiles
#ifndef checkMeshDict_H
#define checkMeshDict_H
#include "objectRegistry.H"
#include "Time.H"
#include "IOdictionary.H"
#include <map>
......
......@@ -26,8 +26,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGen.H"
#include "meshSurfaceEngine.H"
#include "OFstream.H"
......
......@@ -50,7 +50,7 @@ void sortEdgesIntoChains::createNodeLabels()
newNodeLabel_.insert(e.end(), nPoints++);
}
edgesAtPoint_.setSize(nPoints, DynList<label>());
edgesAtPoint_.setSize(nPoints);
forAll(bEdges_, eI)
{
const edge& e = bEdges_[eI];
......@@ -69,7 +69,7 @@ void sortEdgesIntoChains::createNodeLabels()
bool sortEdgesIntoChains::findPointsBelongingToTheChain
(
const label currPos,
boolList& chainEdges
DynList<bool>& chainEdges
) const
{
# ifdef DEBUGSort
......@@ -150,7 +150,7 @@ bool sortEdgesIntoChains::findPointsBelongingToTheChain
return true;
}
void sortEdgesIntoChains::shrinkEdges(const boolList& chainEdges)
void sortEdgesIntoChains::shrinkEdges(const DynList<bool>& chainEdges)
{
forAll(chainEdges, eI)
if( chainEdges[eI] )
......@@ -168,14 +168,14 @@ void sortEdgesIntoChains::shrinkEdges(const boolList& chainEdges)
}
}
void sortEdgesIntoChains::createChainFromEdges(const boolList& chainEdges)
void sortEdgesIntoChains::createChainFromEdges(const DynList<bool>& chainEdges)
{
direction i(0);
label i(0);
forAll(chainEdges, eI)
if( chainEdges[eI] )
++i;
labelList chainPoints(i);
DynList<label> chainPoints(i);
i = 0;
forAll(chainEdges, eI)
......@@ -232,7 +232,7 @@ void sortEdgesIntoChains::sortEdges()
if( !openEdges_ )
{
boolList chainEdges(bEdges_.size());
DynList<bool> chainEdges(bEdges_.size());
forAll(edgesAtPoint_, pI)
if( findPointsBelongingToTheChain(pI, chainEdges) )
{
......@@ -257,12 +257,11 @@ sortEdgesIntoChains::sortEdgesIntoChains(const DynList<edge>& bEdges)
}
sortEdgesIntoChains::~sortEdgesIntoChains()
{
}
{}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *//
// Member functions
const DynList<labelList>& sortEdgesIntoChains::sortedChains() const
const DynList<DynList<label> >& sortEdgesIntoChains::sortedChains() const
{
return createdChains_;
}
......
......@@ -39,7 +39,6 @@ SourceFiles
#include "labelList.H"
#include "edge.H"
#include "Map.H"
#include "boolList.H"
namespace Foam
{
......@@ -57,9 +56,9 @@ class sortEdgesIntoChains
Map<label> newNodeLabel_;
List<DynList<label> > edgesAtPoint_;
DynList<DynList<label> > edgesAtPoint_;
DynList<labelList> createdChains_;
DynList<DynList<label> > createdChains_;
// Private member functions
void createNodeLabels();
......@@ -67,12 +66,12 @@ class sortEdgesIntoChains
bool findPointsBelongingToTheChain
(
const label currPos,
boolList& chainEdges
DynList<bool>& chainEdges
) const;
void shrinkEdges(const boolList& chainEdges);
void shrinkEdges(const DynList<bool>& chainEdges);
void createChainFromEdges(const boolList& chainEdges);
void createChainFromEdges(const DynList<bool>& chainEdges);
void sortEdges();
......@@ -88,7 +87,7 @@ class sortEdgesIntoChains
// Member functions
//- a list of points which have not yet been resolved
const DynList<labelList>& sortedChains() const;
const DynList<DynList<label> >& sortedChains() const;
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -37,8 +37,11 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "objectRegistry.H"
# ifdef ExtendSpecific
#include "foamTime.H"
# else
#include "Time.H"
# endif
#include "meshSubset.H"
#include "pointFieldPMG.H"
#include "DynList.H"
......
......@@ -267,8 +267,8 @@ void meshUntangler::cutRegion::createPolyMeshFromRegion
fEdges.append(edges[f[eI]]);
Info << "Edges forming face " << fI << " are " << fEdges << endl;
sortEdgesIntoChains sorter(fEdges);
const DynList<labelList>& sf = sorter.sortedChains();
const DynList<DynList<label> > sf =
sortEdgesIntoChains(fEdges).sortedChains();
if( sf.size() != 1 )
FatalErrorIn
(
......@@ -276,7 +276,10 @@ void meshUntangler::cutRegion::createPolyMeshFromRegion
"cutRegion::createPolyMeshFromRegion(polyMesgGen&)"
) << "More than one face created!" << abort(FatalError);
faces[fI] = face(sf[0]);
faces[fI].setSize(sf[0].size());
forAll(sf[0], pI)
faces[fI][pI] = sf[0][pI];
cells[0][fI] = fI;
}
}
......
......@@ -62,8 +62,9 @@ void meshUntangler::cutRegion::tieBreak(const DynList<label, 8>& f)
forAll(f, eI)
faceEdges.append(edges[f[eI]]);
sortEdgesIntoChains sorter(faceEdges);
const DynList<labelList>& fvertices = sorter.sortedChains();
const DynList<DynList<label> > fvertices =
sortEdgesIntoChains(faceEdges).sortedChains();
if( fvertices.size() != 1 )
{
valid_ = false;
......@@ -77,7 +78,7 @@ void meshUntangler::cutRegion::tieBreak(const DynList<label, 8>& f)
<< fvertices.size() << abort(FatalError);
}
const labelList& fv = fvertices[0];
const DynList<label>& fv = fvertices[0];
DynList<label, 64> vertexRegion;
vertexRegion.setSize(fv.size());
......
......@@ -26,8 +26,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "edgeExtractor.H"
#include "meshSurfaceEngine.H"
......
......@@ -38,8 +38,6 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "objectRegistry.H"
#include "Time.H"
#include "labelList.H"
#include "labelLongList.H"
#include "VRWGraph.H"
......
......@@ -37,8 +37,6 @@ SourceFiles
#ifndef meshSurfaceCheckEdgeTypes_H
#define meshSurfaceCheckEdgeTypes_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -37,8 +37,6 @@ SourceFiles
#ifndef meshSurfaceCheckInvertedVertices_H
#define meshSurfaceCheckInvertedVertices_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "HashSet.H"
......
......@@ -35,8 +35,6 @@ SourceFiles
#ifndef meshSurfaceEngine_H
#define meshSurfaceEngine_H
#include "objectRegistry.H"
#include "Time.H"
#include "polyMeshGenModifier.H"
#include "SubList.H"
#include "boolList.H"
......
......@@ -37,8 +37,6 @@ SourceFiles
#ifndef workflowControls_H
#define workflowControls_H
#include "objectRegistry.H"
#include "Time.H"
#include "IOdictionary.H"
#include "DynList.H"
......
......@@ -28,8 +28,6 @@ Description
#include "voronoiMeshGenerator.H"
#include "triSurf.H"
#include "demandDrivenData.H"
#include "objectRegistry.H"
#include "Time.H"
#include "meshOctreeCreator.H"
#include "voronoiMeshExtractor.H"
#include "meshSurfaceEngine.H"
......
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 = \
-I../../meshLibrary/lnInclude \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-ltriSurface \
$(CFMESH_LIBS) \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-lmeshTools \
-ledgeMesh
-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 = \
-I../../meshLibrary/lnInclude \
-I$(FOAM_SRC)/meshTools/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_SRC)/edgeMesh/lnInclude
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-ltriSurface \
-lmeshTools \
-ledgeMesh \
$(CFMESH_LIBS) \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))