Merge remote-tracking branch 'origin/develop' into develop-pre-release

This commit is contained in:
mattijs
2018-05-31 17:34:16 +01:00
1098 changed files with 4845 additions and 3834 deletions

View File

@ -374,7 +374,7 @@ void Foam::cellSplitter::setRefinement
const cell& cFaces = mesh_.cells()[celli];
faceUpToDate.unsetMany(cFaces);
faceUpToDate.unset(cFaces);
}
forAll(faceUpToDate, facei)

View File

@ -91,11 +91,11 @@ class cellSplitter
const Map<labelList>& cellToCells
) const;
//- Disallow default bitwise copy construct
cellSplitter(const cellSplitter&);
//- No copy construct
cellSplitter(const cellSplitter&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSplitter&);
//- No copy assignment
void operator=(const cellSplitter&) = delete;
public:

View File

@ -120,7 +120,7 @@ int main(int argc, char *argv[])
{
const labelList& pCells = mesh.pointCells()[meshPointi];
cutCells.insertMany(pCells);
cutCells.insert(pCells);
}
}
@ -153,7 +153,7 @@ int main(int argc, char *argv[])
const polyPatch& pp = mesh.boundaryMesh()[patchi];
const labelList& meshPoints = pp.meshPoints();
vertOnPatch.setMany(meshPoints);
vertOnPatch.set(meshPoints);
}
for (const label patchi : patchSet)

View File

@ -184,7 +184,7 @@ int main(int argc, char *argv[])
const DynamicList<label>& bin = bins[binI];
cellSet cells(mesh, "vol" + name(binI), bin.size());
cells.insertMany(bin);
cells.insert(bin);
Info<< " " << lowerLimits[binI] << " .. " << upperLimits[binI]
<< " : writing " << bin.size() << " cells to cellSet "

View File

@ -68,11 +68,11 @@ class edgeStats
direction getNormalDir(const twoDPointCorrector*) const;
//- Disallow default bitwise copy construct
edgeStats(const edgeStats&);
//- No copy construct
edgeStats(const edgeStats&) = delete;
//- Disallow default bitwise assignment
void operator=(const edgeStats&);
//- No copy assignment
void operator=(const edgeStats&) = delete;
public:

View File

@ -633,7 +633,7 @@ int main(int argc, char *argv[])
);
cellSet cutSet(mesh, "cutSet", cutCells.size());
cutSet.insertMany(cutCells);
cutSet.insert(cutCells);
// Gets cuts across cells from cuts through edges.
Info<< "Writing " << cutSet.size() << " cells to cut to cellSet "

View File

@ -74,11 +74,11 @@ class hexBlock
// Private Member Functions
//- Disallow default bitwise copy construct
hexBlock(const hexBlock&);
//- No copy construct
hexBlock(const hexBlock&) = delete;
//- Disallow default bitwise assignment
void operator=(const hexBlock&);
//- No copy assignment
void operator=(const hexBlock&) = delete;
//- Vertex addressing inside the block
inline label vtxLabel(label i, label j, label k) const;

View File

@ -961,7 +961,7 @@ int main(int argc, char *argv[])
forAll(dofVertIndices, patchi)
{
const labelList& foamVerts = dofVertIndices[patchi];
dofGroups[patchi].insertMany(foamVerts);
dofGroups[patchi].insert(foamVerts);
}
List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());

View File

@ -67,11 +67,11 @@ class hexBlock
// Private Member Functions
//- Disallow default bitwise copy construct
hexBlock(const hexBlock&);
//- No copy construct
hexBlock(const hexBlock&) = delete;
//- Disallow default bitwise assignment
void operator=(const hexBlock&);
//- No copy assignment
void operator=(const hexBlock&) = delete;
//- Vertex addressing inside the block
inline label vtxLabel(label i, label j, label k) const;

View File

@ -344,7 +344,7 @@ void writePointCells
{
const labelList& cEdges = mesh.cellEdges()[pCells[i]];
allEdges.insertMany(cEdges);
allEdges.insert(cEdges);
}

View File

@ -795,7 +795,7 @@ int main(int argc, char *argv[])
forAll(addedCells, facei)
{
const labelList& aCells = addedCells[facei];
addedCellsSet.insertMany(aCells);
addedCellsSet.insert(aCells);
}
}
}

View File

@ -86,10 +86,10 @@ class extrudedMesh
);
//- Disallow default bitwise copy construct
//- No copy construct
extrudedMesh(const extrudedMesh&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const extrudedMesh&) = delete;

View File

@ -527,7 +527,7 @@ label findUncoveredPatchFace
{
// Make set of extruded faces.
labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
extrudeFaceSet.insertMany(extrudeMeshFaces);
extrudeFaceSet.insert(extrudeMeshFaces);
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];
@ -561,7 +561,7 @@ label findUncoveredCyclicPatchFace
{
// Make set of extruded faces.
labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
extrudeFaceSet.insertMany(extrudeMeshFaces);
extrudeFaceSet.insert(extrudeMeshFaces);
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];

View File

@ -87,11 +87,11 @@ class extrude2DMesh
//- Find extrusion direction
//void findExtrudeDirection();
//- Disallow default bitwise copy construct
extrude2DMesh(const extrude2DMesh&);
//- No copy construct
extrude2DMesh(const extrude2DMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const extrude2DMesh&);
//- No copy assignment
void operator=(const extrude2DMesh&) = delete;
public:

View File

@ -85,11 +85,11 @@ class patchToPoly2DMesh
void createPolyMeshComponents();
//- Disallow default bitwise copy construct
patchToPoly2DMesh(const patchToPoly2DMesh&);
//- No copy construct
patchToPoly2DMesh(const patchToPoly2DMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const patchToPoly2DMesh&);
//- No copy assignment
void operator=(const patchToPoly2DMesh&) = delete;
public:

View File

@ -70,11 +70,11 @@ class cv2DControls
// Private Member Functions
//- Disallow default bitwise copy construct
cv2DControls(const cv2DControls&);
//- No copy construct
cv2DControls(const cv2DControls&) = delete;
//- Disallow default bitwise assignment
void operator=(const cv2DControls&);
//- No copy assignment
void operator=(const cv2DControls&) = delete;
public:

View File

@ -142,11 +142,11 @@ private:
const List<DynamicList<label>>& patchOwners
) const;
//- Disallow default bitwise copy construct
DelaunayMesh(const DelaunayMesh<Triangulation>&);
//- No copy construct
DelaunayMesh(const DelaunayMesh<Triangulation>&) = delete;
//- Disallow default bitwise assignment
void operator=(const DelaunayMesh<Triangulation>&);
//- No copy assignment
void operator=(const DelaunayMesh<Triangulation>&) = delete;
public:

View File

@ -119,11 +119,14 @@ private:
labelPairHashSet& receivedVertices
);
//- Disallow default bitwise copy construct
DistributedDelaunayMesh(const DistributedDelaunayMesh<Triangulation>&);
//- No copy construct
DistributedDelaunayMesh
(
const DistributedDelaunayMesh&
) = delete;
//- Disallow default bitwise assignment
void operator=(const DistributedDelaunayMesh<Triangulation>&);
//- No copy assignment
void operator=(const DistributedDelaunayMesh<Triangulation>&) = delete;
public:

View File

@ -193,22 +193,4 @@ void Foam::PrintTable<KeyType, DataType>::print
}
// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
template<class KeyType, class DataType>
void Foam::PrintTable<KeyType, DataType>::operator=
(
const PrintTable<KeyType, DataType>& rhs
)
{
// Check for assignment to self
if (this == &rhs)
{
FatalErrorInFunction
<< "Attempted assignment to self"
<< abort(FatalError);
}
}
// ************************************************************************* //

View File

@ -82,8 +82,8 @@ class PrintTable
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const PrintTable<KeyType, DataType>&);
//- No copy assignment
void operator=(const PrintTable<KeyType, DataType>&) = delete;
public:
@ -107,7 +107,7 @@ public:
// Member Functions
//- Add an entry (D) to the given key(K)
void add(const KeyType& K, const DataType& D);
inline void add(const KeyType& K, const DataType& D);
//- Print the table
void print

View File

@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class KeyType, class DataType>
void Foam::PrintTable<KeyType, DataType>::add
inline void Foam::PrintTable<KeyType, DataType>::add
(
const KeyType& K,
const DataType& D
@ -35,8 +35,4 @@ void Foam::PrintTable<KeyType, DataType>::add
table_.set(K, D);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //

View File

@ -177,11 +177,14 @@ class backgroundMeshDecomposition
//- Build the surface patch and search tree
void buildPatchAndTree();
//- Disallow default bitwise copy construct
backgroundMeshDecomposition(const backgroundMeshDecomposition&);
//- No copy construct
backgroundMeshDecomposition
(
const backgroundMeshDecomposition&
) = delete;
//- Disallow default bitwise assignment
void operator=(const backgroundMeshDecomposition&);
//- No copy assignment
void operator=(const backgroundMeshDecomposition&) = delete;
public:

View File

@ -61,11 +61,11 @@ class cellAspectRatioControl
// Private Member Functions
//- Disallow default bitwise copy construct
cellAspectRatioControl(const cellAspectRatioControl&);
//- No copy construct
cellAspectRatioControl(const cellAspectRatioControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellAspectRatioControl&);
//- No copy assignment
void operator=(const cellAspectRatioControl&) = delete;
public:

View File

@ -85,11 +85,11 @@ class cellShapeControl
// Private Member Functions
//- Disallow default bitwise copy construct
cellShapeControl(const cellShapeControl&);
//- No copy construct
cellShapeControl(const cellShapeControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellShapeControl&);
//- No copy assignment
void operator=(const cellShapeControl&) = delete;
public:

View File

@ -83,11 +83,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellShapeControlMesh(const cellShapeControlMesh&);
//- No copy construct
cellShapeControlMesh(const cellShapeControlMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellShapeControlMesh&);
//- No copy assignment
void operator=(const cellShapeControlMesh&) = delete;
public:

View File

@ -71,11 +71,14 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellSizeAndAlignmentControl(const cellSizeAndAlignmentControl&);
//- No copy construct
cellSizeAndAlignmentControl
(
const cellSizeAndAlignmentControl&
) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeAndAlignmentControl&);
//- No copy assignment
void operator=(const cellSizeAndAlignmentControl&) = delete;
public:

View File

@ -68,11 +68,14 @@ class cellSizeAndAlignmentControls
label& maxPriority
) const;
//- Disallow default bitwise copy construct
cellSizeAndAlignmentControls(const cellSizeAndAlignmentControls&);
//- No copy construct
cellSizeAndAlignmentControls
(
const cellSizeAndAlignmentControls&
) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeAndAlignmentControls&);
//- No copy assignment
void operator=(const cellSizeAndAlignmentControls&) = delete;
public:

View File

@ -63,11 +63,11 @@ class fileControl
// Private Member Functions
//- Disallow default bitwise copy construct
fileControl(const fileControl&);
//- No copy construct
fileControl(const fileControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const fileControl&);
//- No copy assignment
void operator=(const fileControl&) = delete;
public:

View File

@ -88,11 +88,11 @@ class searchableSurfaceControl
// const vectorField& ptNormals
// ) const;
//- Disallow default bitwise copy construct
searchableSurfaceControl(const searchableSurfaceControl&);
//- No copy construct
searchableSurfaceControl(const searchableSurfaceControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchableSurfaceControl&);
//- No copy assignment
void operator=(const searchableSurfaceControl&) = delete;
public:

View File

@ -99,11 +99,11 @@ class controlMeshRefinement
pointHit findDiscontinuities(const linePointRef& l) const;
//- Disallow default bitwise copy construct
controlMeshRefinement(const controlMeshRefinement&);
//- No copy construct
controlMeshRefinement(const controlMeshRefinement&) = delete;
//- Disallow default bitwise assignment
void operator=(const controlMeshRefinement&);
//- No copy assignment
void operator=(const controlMeshRefinement&) = delete;
public:

View File

@ -91,11 +91,11 @@ class smoothAlignmentSolver
triad& t
) const;
//- Disallow default bitwise copy construct
smoothAlignmentSolver(const smoothAlignmentSolver&);
//- No copy construct
smoothAlignmentSolver(const smoothAlignmentSolver&) = delete;
//- Disallow default bitwise assignment
void operator=(const smoothAlignmentSolver&);
//- No copy assignment
void operator=(const smoothAlignmentSolver&) = delete;
public:

View File

@ -110,11 +110,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellSizeFunction(const cellSizeFunction&);
//- No copy construct
cellSizeFunction(const cellSizeFunction&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeFunction&);
//- No copy assignment
void operator=(const cellSizeFunction&) = delete;
public:

View File

@ -67,11 +67,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellSizeCalculationType(const cellSizeCalculationType&);
//- No copy construct
cellSizeCalculationType(const cellSizeCalculationType&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeCalculationType&);
//- No copy assignment
void operator=(const cellSizeCalculationType&) = delete;
public:

View File

@ -75,11 +75,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
surfaceCellSizeFunction(const surfaceCellSizeFunction&);
//- No copy construct
surfaceCellSizeFunction(const surfaceCellSizeFunction&) = delete;
//- Disallow default bitwise assignment
void operator=(const surfaceCellSizeFunction&);
//- No copy assignment
void operator=(const surfaceCellSizeFunction&) = delete;
public:

View File

@ -850,11 +850,11 @@ private:
void writePointPairs(const fileName& fName) const;
//- Disallow default bitwise copy construct
conformalVoronoiMesh(const conformalVoronoiMesh&);
//- No copy construct
conformalVoronoiMesh(const conformalVoronoiMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const conformalVoronoiMesh&);
//- No copy assignment
void operator=(const conformalVoronoiMesh&) = delete;
public:

View File

@ -1053,7 +1053,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
nInvalidPolyhedra++;
wrongFaces.insertMany(cells[cI]);
wrongFaces.insert(cells[cI]);
}
}
@ -1093,7 +1093,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
if (nInternalFaces[cI] <= 1)
{
oneInternalFaceCells++;
wrongFaces.insertMany(cells[cI]);
wrongFaces.insert(cells[cI]);
}
}
@ -1109,7 +1109,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
{
const face f = pMesh.faces()[facei];
ptToBeLimited.setMany(f);
ptToBeLimited.set(f);
}
// // Limit connected cells
@ -1126,7 +1126,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
// {
// label ptI = f[fPtI];
// const labelList& pC = ptCells[ptI];
// limitCells.insertMany(pC);
// limitCells.insert(pC);
// }
// }
@ -1136,7 +1136,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
// {
// const labelList& cP = cellPts[celli];
// ptToBeLimited.setMany(cP);
// ptToBeLimited.set(cP);
// }
@ -2542,7 +2542,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
{
const face& f = faces[fI];
ptUsed.setMany(f);
ptUsed.set(f);
}
label pointi = 0;
@ -2592,8 +2592,8 @@ Foam::labelList Foam::conformalVoronoiMesh::removeUnusedCells
// Scan all faces to find all of the cells that are used
cellUsed.setMany(owner);
cellUsed.setMany(neighbour);
cellUsed.set(owner);
cellUsed.set(neighbour);
label celli = 0;

View File

@ -1351,7 +1351,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
for (const label pointi : protrudingBoundaryPoints)
{
const labelList& pCells = mesh.pointCells()[pointi];
protrudingCells.insertMany(pCells);
protrudingCells.insert(pCells);
}
label protrudingCellsSize = protrudingCells.size();

View File

@ -133,11 +133,11 @@ class featurePointConformer
//- Create the points that will conform to the feature
void createFeaturePoints(DynamicList<Vb>& pts);
//- Disallow default bitwise copy construct
featurePointConformer(const featurePointConformer&);
//- No copy construct
featurePointConformer(const featurePointConformer&) = delete;
//- Disallow default bitwise assignment
void operator=(const featurePointConformer&);
//- No copy assignment
void operator=(const featurePointConformer&) = delete;
public:

View File

@ -125,11 +125,11 @@ class conformationSurfaces
label& featureIndex
);
//- Disallow default bitwise copy construct
conformationSurfaces(const conformationSurfaces&);
//- No copy construct
conformationSurfaces(const conformationSurfaces&) = delete;
//- Disallow default bitwise assignment
void operator=(const conformationSurfaces&);
//- No copy assignment
void operator=(const conformationSurfaces&) = delete;
public:

View File

@ -209,11 +209,11 @@ class cvControls
// Private Member Functions
//- Disallow default bitwise copy construct
cvControls(const cvControls&);
//- No copy construct
cvControls(const cvControls&) = delete;
//- Disallow default bitwise assignment
void operator=(const cvControls&);
//- No copy assignment
void operator=(const cvControls&) = delete;
public:

View File

@ -68,11 +68,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
faceAreaWeightModel(const faceAreaWeightModel&);
//- No copy construct
faceAreaWeightModel(const faceAreaWeightModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const faceAreaWeightModel&);
//- No copy assignment
void operator=(const faceAreaWeightModel&) = delete;
public:

View File

@ -87,11 +87,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
initialPointsMethod(const initialPointsMethod&);
//- No copy construct
initialPointsMethod(const initialPointsMethod&) = delete;
//- Disallow default bitwise assignment
void operator=(const initialPointsMethod&);
//- No copy assignment
void operator=(const initialPointsMethod&) = delete;
public:

View File

@ -70,11 +70,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
relaxationModel(const relaxationModel&);
//- No copy construct
relaxationModel(const relaxationModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const relaxationModel&);
//- No copy assignment
void operator=(const relaxationModel&) = delete;
public:

View File

@ -59,11 +59,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
searchableBoxFeatures(const searchableBoxFeatures&);
//- No copy construct
searchableBoxFeatures(const searchableBoxFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchableBoxFeatures&);
//- No copy assignment
void operator=(const searchableBoxFeatures&) = delete;
public:

View File

@ -63,11 +63,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
searchablePlateFeatures(const searchablePlateFeatures&);
//- No copy construct
searchablePlateFeatures(const searchablePlateFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchablePlateFeatures&);
//- No copy assignment
void operator=(const searchablePlateFeatures&) = delete;
public:

View File

@ -60,11 +60,11 @@ class searchableSurfaceFeatures
// Private Member Functions
//- Disallow default bitwise copy construct
searchableSurfaceFeatures(const searchableSurfaceFeatures&);
//- No copy construct
searchableSurfaceFeatures(const searchableSurfaceFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchableSurfaceFeatures&);
//- No copy assignment
void operator=(const searchableSurfaceFeatures&) = delete;
public:

View File

@ -61,11 +61,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
triSurfaceMeshFeatures(const triSurfaceMeshFeatures&);
//- No copy construct
triSurfaceMeshFeatures(const triSurfaceMeshFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const triSurfaceMeshFeatures&);
//- No copy assignment
void operator=(const triSurfaceMeshFeatures&) = delete;
public:

View File

@ -199,11 +199,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
CV2D(const CV2D&);
//- No copy construct
CV2D(const CV2D&) = delete;
//- Disallow default bitwise assignment
void operator=(const CV2D&);
//- No copy assignment
void operator=(const CV2D&) = delete;
//- Insert point and return it's index

View File

@ -144,8 +144,8 @@ void Foam::CV2D::insertSurfaceNearestPointPairs()
label nSurfacePointsEst =
min
(
number_of_vertices(),
size_t(10*sqrt(scalar(number_of_vertices())))
label(number_of_vertices()),
label(10*sqrt(scalar(number_of_vertices())))
);
DynamicList<point2D> nearSurfacePoints(nSurfacePointsEst);

View File

@ -90,11 +90,11 @@ class shortEdgeFilter2D
labelList& patchSizes
) const;
//- Disallow default bitwise copy construct
shortEdgeFilter2D(const shortEdgeFilter2D&);
//- No copy construct
shortEdgeFilter2D(const shortEdgeFilter2D&) = delete;
//- Disallow default bitwise assignment
void operator=(const shortEdgeFilter2D&);
//- No copy assignment
void operator=(const shortEdgeFilter2D&) = delete;
public:

View File

@ -314,8 +314,9 @@ castellatedMeshControls
// refinement (from features, refinementSurfaces, refinementRegions)
// in a given geometric region. The syntax is exactly the same as for the
// refinementRegions; the cell level now specifies the upper limit
// for any cell. Note that it does not override the refinement constraints
// given by the nCellsBetweenLevels setting.
// for any cell. (a special setting is cell level -1 which will remove
// any cells inside the region). Note that it does not override the
// refinement constraints given by the nCellsBetweenLevels setting.
limitRegions
{
}

View File

@ -76,10 +76,10 @@ class mergePolyMesh
// Private Member Functions
//- Disallow default bitwise copy construct
//- No copy construct
mergePolyMesh(const mergePolyMesh&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const mergePolyMesh&) = delete;

View File

@ -66,10 +66,10 @@ class mirrorFvMesh
// Private Member Functions
//- Disallow copy construct
//- No copy construct
mirrorFvMesh(const mirrorFvMesh&) = delete;
//- Disallow copy assignment
//- No copy assignment
void operator=(const mirrorFvMesh&) = delete;

View File

@ -891,7 +891,7 @@ void Foam::meshDualiser::setRefinement
{
const labelList& fEdges = mesh_.faceEdges()[facei];
isBoundaryEdge.setMany(fEdges);
isBoundaryEdge.set(fEdges);
}

View File

@ -168,11 +168,11 @@ class meshDualiser
boolList& donePFaces // pFaces visited
) const;
//- Disallow default bitwise copy construct
meshDualiser(const meshDualiser&);
//- No copy construct
meshDualiser(const meshDualiser&) = delete;
//- Disallow default bitwise assignment
void operator=(const meshDualiser&);
//- No copy assignment
void operator=(const meshDualiser&) = delete;
public:

View File

@ -349,7 +349,7 @@ int main(int argc, char *argv[])
forAll(oldToNew, oldCelli)
{
const labelList& added = oldToNew[oldCelli];
newCells.insertMany(added);
newCells.insert(added);
}
Info<< "Writing refined cells ("

View File

@ -300,7 +300,7 @@ void Foam::regionSide::walkAllPointConnectedFaces
{
const labelList& fEdges = mesh.faceEdges()[facei];
regionEdges.insertMany(fEdges);
regionEdges.insert(fEdges);
}

View File

@ -0,0 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/sysFunctions
#------------------------------------------------------------------------------
if isDarwin
then
echo "==> Darwin-specific utilities"
wmake addr2line
fi
#------------------------------------------------------------------------------

View File

@ -0,0 +1,3 @@
addr2line.C
EXE = $(FOAM_APPBIN)/addr2line

View File

@ -0,0 +1,3 @@
EXE_INC =
EXE_LIBS =

View File

@ -0,0 +1,208 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 Alexey Matveichev
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
addr2line
Description
A simple, partial emulation of addr2line utility for Mac-OS.
\*---------------------------------------------------------------------------*/
#include <getopt.h>
#include <cstdlib>
#include <string>
#include <vector>
#include <iostream>
#include "regExp.H"
#include "SubStrings.H"
static void usage();
static void version();
static std::string getLine(const std::string&, const std::string&);
static std::string pOpen(const std::string&, int line=0);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
int optHelp = 0, optFunctions = 0, optVersion = 0;
int ch;
std::string filename = "a.out";
std::vector<std::string> addresses;
static struct option opts[] =
{
{ "target", required_argument, nullptr, 'b' },
{ "demangle", required_argument, nullptr, 'C' },
{ "exe", required_argument, nullptr, 'e' },
{ "functions", no_argument, &optFunctions, 1 },
{ "version", no_argument, &optVersion, 1 },
{ "basename", no_argument, nullptr, 's' },
{ "inlines", no_argument, nullptr, 'i' },
{ "section", required_argument, nullptr, 'j' },
{ "help", no_argument, &optHelp, 1 },
{ nullptr, 0, nullptr, 0 }
};
while ((ch = getopt_long(argc, argv, "b:C:e:fVsij:H", opts, nullptr)) != -1)
{
switch (ch)
{
case 'e':
filename = std::string(optarg);
break;
case 'C':
// Ignoring this flag for now
break;
case 'f':
// Functions are demangled in printStack
break;
case 0:
if (optHelp) usage();
if (optVersion) version();
break;
default:
usage();
break;
}
}
if (optind >= argc)
{
usage();
}
argc -= optind;
argv += optind;
while (argc > 0)
{
addresses.push_back(std::string(*argv));
++argv;
--argc;
}
for (const auto& addr : addresses)
{
std::cout<< '\n' << getLine(filename, addr).c_str() << '\n';
}
return 0;
}
void usage()
{
std::cout
<< "usage: addr2line [-e filename|--exe=filename]"
" address [address...]\n" << std::endl;
::exit(1);
}
void version()
{
std::cout<< "OpenFOAM addr2line emulator\n" << std::endl;
::exit(0);
}
std::string pOpen(const std::string& cmd, int line)
{
std::string res;
FILE* cmdPipe = popen(cmd.c_str(), "r");
if (!cmdPipe) return res;
char* buf = nullptr;
// Read line number of lines
for (int cnt = 0; cnt <= line; ++cnt)
{
size_t linecap = 0;
ssize_t linelen = ::getline(&buf, &linecap, cmdPipe);
if (linelen < 0)
{
break;
}
if (cnt == line)
{
res = std::string(buf);
// Trim trailing newline
if (res.size())
{
res.resize(res.size()-1);
}
break;
}
}
if (buf) free(buf);
pclose(cmdPipe);
return res;
}
std::string getLine(const std::string& filename, const std::string& addr)
{
std::string line =
pOpen
(
"echo 'image lookup -va " + addr
+ "'"
+ " | xcrun lldb "
+ "-O 'target create --no-dependents -a x86_64 "
+ filename
+ "' -o '"
+ "target module load -f "
+ filename
+ " __TEXT 0x0' 2> /dev/null"
+ " | grep LineEntry"
);
Foam::regExp re(".+LineEntry: .+: (.+):([0-9]+):[0-9]+");
Foam::regExp::results_type groups;
if (!re.match(line, groups))
{
line = "??:0";
}
else
{
line = groups[1].str() + ":" + groups[2].str();
}
return line;
}
// ************************************************************************* //

View File

@ -311,7 +311,7 @@ int main(int argc, char *argv[])
wordHashSet names;
forAllConstIters(rp, iter)
{
names.insertMany(iter.object());
names.insert(iter.object());
}
regionNames = names.sortedToc();

View File

@ -71,11 +71,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
dimFieldDecomposer(const dimFieldDecomposer&);
//- No copy construct
dimFieldDecomposer(const dimFieldDecomposer&) = delete;
//- Disallow default bitwise assignment
void operator=(const dimFieldDecomposer&);
//- No copy assignment
void operator=(const dimFieldDecomposer&) = delete;
public:

View File

@ -451,7 +451,7 @@ void Foam::domainDecomposition::decomposeMesh()
const labelList& facePoints = fcs[mag(facei) - 1];
// Mark the face points as being used
pointsInUse.setMany(facePoints);
pointsInUse.set(facePoints);
}
procPointAddressing_[proci] = pointsInUse.sortedToc();

View File

@ -252,11 +252,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
faFieldDecomposer(const faFieldDecomposer&);
//- No copy construct
faFieldDecomposer(const faFieldDecomposer&) = delete;
//- Disallow default bitwise assignment
void operator=(const faFieldDecomposer&);
//- No copy assignment
void operator=(const faFieldDecomposer&) = delete;
public:

View File

@ -68,11 +68,11 @@ class lagrangianFieldDecomposer
// Private Member Functions
//- Disallow default bitwise copy construct
lagrangianFieldDecomposer(const lagrangianFieldDecomposer&);
//- No copy construct
lagrangianFieldDecomposer(const lagrangianFieldDecomposer&) = delete;
//- Disallow default bitwise assignment
void operator=(const lagrangianFieldDecomposer&);
//- No copy assignment
void operator=(const lagrangianFieldDecomposer&) = delete;
public:

View File

@ -125,11 +125,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
pointFieldDecomposer(const pointFieldDecomposer&);
//- No copy construct
pointFieldDecomposer(const pointFieldDecomposer&) = delete;
//- Disallow default bitwise assignment
void operator=(const pointFieldDecomposer&);
//- No copy assignment
void operator=(const pointFieldDecomposer&) = delete;
public:

View File

@ -80,11 +80,11 @@ class faFieldReconstructor
// Private Member Functions
//- Disallow default bitwise copy construct
faFieldReconstructor(const faFieldReconstructor&);
//- No copy construct
faFieldReconstructor(const faFieldReconstructor&) = delete;
//- Disallow default bitwise assignment
void operator=(const faFieldReconstructor&);
//- No copy assignment
void operator=(const faFieldReconstructor&) = delete;
public:

View File

@ -84,11 +84,11 @@ class processorFaMeshes
//- Read all meshes
void read();
//- Disallow default bitwise copy construct
processorFaMeshes(const processorFaMeshes&);
//- No copy construct
processorFaMeshes(const processorFaMeshes&) = delete;
//- Disallow default bitwise assignment
void operator=(const processorFaMeshes&);
//- No copy assignment
void operator=(const processorFaMeshes&) = delete;
public:

View File

@ -186,7 +186,7 @@ int main(int argc, char *argv[])
wordHashSet names;
forAllConstIters(rp, iter)
{
names.insertMany(iter.object());
names.insert(iter.object());
}
regionNames = names.sortedToc();

View File

@ -80,11 +80,11 @@ class parFvFieldReconstructor
//- Construct per-patch addressing
void createPatchFaceMaps();
//- Disallow default bitwise copy construct
parFvFieldReconstructor(const parFvFieldReconstructor&);
//- No copy construct
parFvFieldReconstructor(const parFvFieldReconstructor&) = delete;
//- Disallow default bitwise assignment
void operator=(const parFvFieldReconstructor&);
//- No copy assignment
void operator=(const parFvFieldReconstructor&) = delete;
public:

View File

@ -77,11 +77,11 @@ class parLagrangianRedistributor
// Private Member Functions
//- Disallow default bitwise copy construct
parLagrangianRedistributor(const parLagrangianRedistributor&);
//- No copy construct
parLagrangianRedistributor(const parLagrangianRedistributor&) = delete;
//- Disallow default bitwise assignment
void operator=(const parLagrangianRedistributor&);
//- No copy assignment
void operator=(const parLagrangianRedistributor&) = delete;
public:

View File

@ -53,11 +53,14 @@ class passivePositionParticleCloud
{
// Private Member Functions
//- Disallow default bitwise copy construct
passivePositionParticleCloud(const passivePositionParticleCloud&);
//- No copy construct
passivePositionParticleCloud
(
const passivePositionParticleCloud&
) = delete;
//- Disallow default bitwise assignment
void operator=(const passivePositionParticleCloud&);
//- No copy assignment
void operator=(const passivePositionParticleCloud&) = delete;
public:

View File

@ -92,10 +92,10 @@ class lagrangianWriter
void writeVerts();
//- Disallow default bitwise copy construct
//- No copy construct
lagrangianWriter(const lagrangianWriter&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const lagrangianWriter&) = delete;

View File

@ -82,10 +82,10 @@ class pqFoamReaderControls
void fireCommand(vtkSMIntVectorProperty* prop, int val);
//- Disallow default bitwise copy construct
//- No copy construct
pqFoamReaderControls(const pqFoamReaderControls&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const pqFoamReaderControls&) = delete;

View File

@ -222,10 +222,10 @@ protected:
private:
//- Disallow default bitwise copy construct
//- No copy construct
vtkPVFoamReader(const vtkPVFoamReader&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const vtkPVFoamReader&) = delete;
//- Add/remove patch names to/from the view

View File

@ -78,10 +78,10 @@ class pqFoamBlockMeshControls
void updateParts();
//- Disallow default bitwise copy construct
//- No copy construct
pqFoamBlockMeshControls(const pqFoamBlockMeshControls&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const pqFoamBlockMeshControls&) = delete;

View File

@ -148,10 +148,10 @@ protected:
private:
//- Disallow default bitwise copy construct
//- No copy construct
vtkPVblockMeshReader(const vtkPVblockMeshReader&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const vtkPVblockMeshReader&) = delete;
//- Add/remove patch names to/from the view

View File

@ -227,7 +227,7 @@ void Foam::vtkPVFoam::updateInfoLagrangian
for (const instant& t : dbPtr_().times())
{
names.insertMany
names.insert
(
readDir
(

View File

@ -141,10 +141,10 @@ class vtkPVblockMesh
void convertMeshCorners(vtkMultiBlockDataSet*, int& blockNo);
//- Disallow default bitwise copy construct
//- No copy construct
vtkPVblockMesh(const vtkPVblockMesh&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const vtkPVblockMesh&) = delete;

View File

@ -93,9 +93,11 @@ class channelIndex
const labelList& startFaces
);
//- Disallow default bitwise copy construct and assignment
channelIndex(const channelIndex&);
void operator=(const channelIndex&);
//- No copy construct
channelIndex(const channelIndex&) = delete;
//- No copy assignment
void operator=(const channelIndex&) = delete;
public:

View File

@ -123,7 +123,7 @@ Foam::boundaryInfo::boundaryInfo(const Time& runTime, const word& regionName)
if (dict.found("inGroups"))
{
dict.lookup("inGroups") >> groups_[patchI];
allGroupNames_.insertMany(groups_[patchI]);
allGroupNames_.insert(groups_[patchI]);
}
}
}

View File

@ -67,11 +67,11 @@ class PolyhedronReader
// Private Member Functions
//- Disallow default bitwise copy construct
PolyhedronReader(const PolyhedronReader&);
//- No copy construct
PolyhedronReader(const PolyhedronReader&) = delete;
//- Disallow default bitwise assignment
void operator=(const PolyhedronReader&);
//- No copy assignment
void operator=(const PolyhedronReader&) = delete;
public:

View File

@ -202,7 +202,7 @@ int main(int argc, char *argv[])
for (const wordRe& zoneName : zoneNames)
{
labelList zoneIDs = findStrings(zoneName, allZoneNames);
includeFaceZones.insertMany(zoneIDs);
includeFaceZones.insert(zoneIDs);
if (zoneIDs.empty())
{