Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Community
integration-cfmesh
Commits
e6ac2ba8
Commit
e6ac2ba8
authored
Oct 11, 2016
by
Franjo
Browse files
Updates for compilation on foam-extend-4.0
parent
651fcb6a
Changes
19
Hide whitespace changes
Inline
Side-by-side
executables/cartesianMesh/cartesianMesh.C
View file @
e6ac2ba8
...
...
@@ -30,8 +30,6 @@ Description
\*---------------------------------------------------------------------------*/
#include
"argList.H"
#include
"objectRegistry.H"
#include
"Time.H"
#include
"cartesianMeshGenerator.H"
using
namespace
Foam
;
...
...
meshLibrary/cartesian2DMesh/cartesian2DMeshGenerator/cartesian2DMeshGenerator.C
View file @
e6ac2ba8
...
...
@@ -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"
...
...
meshLibrary/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C
View file @
e6ac2ba8
...
...
@@ -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"
...
...
meshLibrary/tetMesh/tetMeshGenerator/tetMeshGenerator.C
View file @
e6ac2ba8
...
...
@@ -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"
...
...
meshLibrary/utilities/boundaryLayers/boundaryLayers/boundaryLayers.H
View file @
e6ac2ba8
...
...
@@ -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"
...
...
meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.H
View file @
e6ac2ba8
...
...
@@ -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"
...
...
@@ -54,51 +52,51 @@ namespace Foam
class
extrudeLayer
{
// Private data
//- Reference to the mesh
polyMeshGen
&
mesh_
;
//- thickness
const
scalar
thickness_
;
const
scalar
thickness_
;
//- number of points in the original mesh
const
label
nOrigPoints_
;
//- number of faces in the original mesh
const
label
nOrigFaces_
;
//- number of cells in the original mesh
const
label
nOrigCells_
;
//- pairs of faces making the extruded front
LongList
<
labelPair
>
extrudedFaces_
;
//- store the orientation of the extruded front
//- true if the pair has the same orientation and false otherwise
LongList
<
bool
>
pairOrientation_
;
//- original point label
labelLongList
origPointLabel_
;
// Private member functions
//- duplicate faces which will be extruded
void
createDuplicateFrontFaces
(
const
LongList
<
labelPair
>&
);
//- create new vertices and open the mesh
void
createNewVertices
();
//- move points to make space for the new cells
void
movePoints
();
//- create layer cells
void
createLayerCells
();
//- create new faces at parallel boundaries
void
createNewFacesParallel
();
//- update boundary patches
void
updateBoundary
();
// Nested classes
//- this class provides addressing data needed for generating
//- cells emerging as a consequence of self-intersecting layers
...
...
@@ -107,18 +105,18 @@ class extrudeLayer
// Private data
//- const reference to mesh faces
const
faceListPMG
&
faces_
;
//- const reference to extruded face pairs
const
LongList
<
labelPair
>&
extrudedFaces_
;
//- const reference telling the orientation of each face pair
LongList
<
bool
>
pairOrientation_
;
//- const reference to the extruded faces at points
const
VRWGraph
&
pointExtruded_
;
public:
// Construct from faces, extruded face pairs and
// point-extrudedfaces addressing
addressingCalculator
...
...
@@ -128,41 +126,41 @@ class extrudeLayer
const
LongList
<
bool
>&
pairOrientation
,
const
VRWGraph
&
pointFaces
);
// Destructor
~
addressingCalculator
();
// Member functions
//- return label of the original face for the given face
inline
label
origFaceLabel
(
const
label
extrudedI
)
const
;
//- return position of point in extruded face
inline
label
positionInFace
(
const
label
extrudedI
,
const
label
pointI
)
const
;
//- return point label in the original face
inline
label
origPointLabel
(
const
label
extrudedI
,
const
label
pos
)
const
;
inline
label
origPoint
(
const
label
extrudedI
,
const
label
pointI
)
const
;
//- find face sharing an edge with the given face
inline
label
faceSharingEdge
(
const
label
extrudedI
,
const
label
eI
)
const
;
//- find faces attached to both points
inline
void
facesSharingEdge
(
...
...
@@ -171,7 +169,7 @@ class extrudeLayer
DynList
<
label
>&
)
const
;
};
// Enumerators
enum
extrudeLayerTypes_
{
...
...
@@ -179,17 +177,17 @@ class extrudeLayer
FRONTVERTEX
=
1
,
FRONTVERTEXPROCBND
=
2
};
//- Disallow bitwise copy construct
extrudeLayer
(
const
extrudeLayer
&
);
//- Disallow bitwise assignment
void
operator
=
(
const
extrudeLayer
&
);
public:
// Constructors
//- Construct from mesh, extrusion faces, thickness and number of layers
extrudeLayer
(
...
...
@@ -197,10 +195,10 @@ class extrudeLayer
const
LongList
<
labelPair
>&
extrusionFront
,
const
scalar
thickness
=
-
1.0
);
// Destructor
~
extrudeLayer
();
// Public member functions
};
...
...
meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.H
View file @
e6ac2ba8
...
...
@@ -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"
...
...
meshLibrary/utilities/boundaryLayers/triangulateNonPlanarBaseFaces/triangulateNonPlanarBaseFaces.H
View file @
e6ac2ba8
...
...
@@ -36,8 +36,6 @@ SourceFiles
#ifndef triangulateNonPlanarBaseFaces_H
#define triangulateNonPlanarBaseFaces_H
#include
"objectRegistry.H"
#include
"Time.H"
#include
"polyMeshGenModifier.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
meshLibrary/utilities/checkMeshDict/checkMeshDict.H
View file @
e6ac2ba8
...
...
@@ -35,8 +35,6 @@ SourceFiles
#ifndef checkMeshDict_H
#define checkMeshDict_H
#include
"objectRegistry.H"
#include
"Time.H"
#include
"IOdictionary.H"
#include
<map>
...
...
meshLibrary/utilities/dataConversion/foamToFPMA/writeMeshFPMA.C
View file @
e6ac2ba8
...
...
@@ -26,8 +26,6 @@ Description
\*---------------------------------------------------------------------------*/
#include
"objectRegistry.H"
#include
"Time.H"
#include
"polyMeshGen.H"
#include
"meshSurfaceEngine.H"
#include
"OFstream.H"
...
...
meshLibrary/utilities/meshes/polyMeshGen/polyMeshGenPoints.H
View file @
e6ac2ba8
...
...
@@ -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"
...
...
@@ -53,7 +56,7 @@ namespace Foam
class
polyMeshGenPoints
{
protected:
// Protected data
//- reference to the Time registry
const
Time
&
runTime_
;
...
...
@@ -63,14 +66,14 @@ protected:
//- map of point subsets
std
::
map
<
label
,
meshSubset
>
pointSubsets_
;
// Disallow bitwise assignment
void
operator
=
(
const
polyMeshGenPoints
&
);
polyMeshGenPoints
(
const
polyMeshGenPoints
&
);
public:
friend
class
polyMeshGenModifier
;
// Constructors
...
...
@@ -83,23 +86,23 @@ public:
const
Time
&
,
const
pointField
&
points
);
// Destructor
~
polyMeshGenPoints
();
// Member functions
//- access to Time
inline
const
Time
&
returnTime
()
const
;
//- access to points
inline
const
pointFieldPMG
&
points
()
const
;
//- non-const access to points
inline
pointFieldPMG
&
points
();
//- append a vertex to the end of the list
inline
void
appendVertex
(
const
point
&
p
);
//- point subsets
label
addPointSubset
(
const
word
&
);
void
removePointSubset
(
const
label
);
...
...
@@ -113,10 +116,10 @@ public:
inline
void
pointsInSubset
(
const
label
,
ListType
&
)
const
;
template
<
class
ListType
>
inline
void
updatePointSubsets
(
const
ListType
&
);
// Read mesh
void
read
();
// Write mesh
void
write
()
const
;
};
...
...
meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.C
View file @
e6ac2ba8
...
...
@@ -26,8 +26,6 @@ Description
\*---------------------------------------------------------------------------*/
#include
"error.H"
#include
"objectRegistry.H"
#include
"Time.H"
#include
"polyMeshGenModifier.H"
#include
"edgeExtractor.H"
#include
"meshSurfaceEngine.H"
...
...
meshLibrary/utilities/surfaceTools/edgeExtraction/edgeExtractor/edgeExtractor.H
View file @
e6ac2ba8
...
...
@@ -38,8 +38,6 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"objectRegistry.H"
#include
"Time.H"
#include
"labelList.H"
#include
"labelLongList.H"
#include
"VRWGraph.H"
...
...
meshLibrary/utilities/surfaceTools/meshSurfaceCheckEdgeTypes/meshSurfaceCheckEdgeTypes.H
View file @
e6ac2ba8
...
...
@@ -37,8 +37,6 @@ SourceFiles
#ifndef meshSurfaceCheckEdgeTypes_H
#define meshSurfaceCheckEdgeTypes_H
#include
"objectRegistry.H"
#include
"Time.H"
#include
"polyMeshGenModifier.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
meshLibrary/utilities/surfaceTools/meshSurfaceCheckInvertedVertices/meshSurfaceCheckInvertedVertices.H
View file @
e6ac2ba8
...
...
@@ -37,8 +37,6 @@ SourceFiles
#ifndef meshSurfaceCheckInvertedVertices_H
#define meshSurfaceCheckInvertedVertices_H
#include
"objectRegistry.H"
#include
"Time.H"
#include
"polyMeshGenModifier.H"
#include
"HashSet.H"
...
...
@@ -59,17 +57,17 @@ class meshSurfaceCheckInvertedVertices
// Private data
//- mesh surface partitioner
const
meshSurfacePartitioner
&
surfacePartitioner_
;
//- active surface points
const
boolList
*
activePointsPtr_
;
//- set of inverted vertices
labelHashSet
invertedVertices_
;
// Private member functions
//- check vertices by calculating dot products
void
checkVertices
();
//- Disallow default bitwise copy construct
meshSurfaceCheckInvertedVertices
(
...
...
meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngine.H
View file @
e6ac2ba8
...
...
@@ -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"
...
...
meshLibrary/utilities/workflowControls/workflowControls.H
View file @
e6ac2ba8
...
...
@@ -37,8 +37,6 @@ SourceFiles
#ifndef workflowControls_H
#define workflowControls_H
#include
"objectRegistry.H"
#include
"Time.H"
#include
"IOdictionary.H"
#include
"DynList.H"
...
...
meshLibrary/voronoiMesh/voronoiMeshGenerator/voronoiMeshGenerator.C
View file @
e6ac2ba8
...
...
@@ -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"
...
...
utilities/preparePar/preparePar.C
View file @
e6ac2ba8
...
...
@@ -29,9 +29,8 @@ Description
\*---------------------------------------------------------------------------*/
#include
"objectRegistry.H"
#include
"argList.H"
#include
"
Time
.H"
#include
"
polyMeshGen
.H"
#include
<sstream>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment