diff --git a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C
index b462bc0ef..5c10fd65f 100644
--- a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C
+++ b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C
@@ -1,25 +1,25 @@
/*---------------------------------------------------------------------------*\
========= |
- \\ / F ield | foam-extend: Open Source CFD
- \\ / O peration | Version: 3.2
- \\ / A nd | Web: http://www.foam-extend.org
- \\/ M anipulation | For copyright notice see file Copyright
+ \\ / F ield | cfMesh: A library for mesh generation
+ \\ / O peration |
+ \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com)
+ \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
-------------------------------------------------------------------------------
License
- This file is part of foam-extend.
+ This file is part of cfMesh.
- foam-extend is free software: you can redistribute it and/or modify it
+ cfMesh 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
+ Free Software Foundation; either version 3 of the License, or (at your
option) any later version.
- foam-extend 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.
+ cfMesh 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 foam-extend. If not, see & points
)
{
xmlTag xmlRoot("VTKFile");
xmlRoot.addAttribute("type", "PolyData");
-
+
xmlTag& xmlPolyData = xmlRoot.addChild("PolyData");
-
+
xmlTag& xmlPiece = xmlPolyData.addChild("Piece");
xmlPiece.addAttribute("NumberOfPoints", points.size());
-
+
xmlTag& xmlPoints = xmlPiece.addChild("Points");
-
+
xmlTag& xmlPointData = xmlPoints.addChild("DataArray");
xmlPointData.addAttribute("type", "Float32");
xmlPointData.addAttribute("NumberOfComponents", 3);
xmlPointData.addAttribute("format", "ascii");
xmlPointData << points;
-
+
OFstream os(fn);
os << xmlRoot << endl;
-
+
Info << "Created " << fn << endl;
}
@@ -78,17 +78,17 @@ void writePointsToVTK
const fileName& fn,
const string& title,
const UList& points,
- unallocLabelList& addr
+ UList& addr
)
{
// Create subaddressed points
pointField newPoints(addr.size());
-
+
forAll(addr, i)
{
newPoints[i] = points[addr[i]];
}
-
+
writePointsToVTK
(
fn,
@@ -102,29 +102,29 @@ void writePointsToVTK
void writeEdgesToVTK
(
const fileName& fn,
- const string& title,
+ const string& /*title*/,
const UList& points,
const LongList& edges
)
{
labelList connectivity(edges.size());
-
+
forAll(edges, edgeI)
{
connectivity[edgeI] = 2*(edgeI+1);
}
-
+
xmlTag xmlRoot("VTKFile");
xmlRoot.addAttribute("type", "PolyData");
-
+
xmlTag& xmlPolyData = xmlRoot.addChild("PolyData");
-
+
xmlTag& xmlPiece = xmlPolyData.addChild("Piece");
xmlPiece.addAttribute("NumberOfPoints", points.size());
xmlPiece.addAttribute("NumberOfLines", edges.size());
-
+
xmlTag& xmlPoints = xmlPiece.addChild("Points");
-
+
xmlTag& xmlPointData = xmlPoints.addChild("DataArray");
xmlPointData.addAttribute("type", "Float32");
xmlPointData.addAttribute("NumberOfComponents", 3);
@@ -144,7 +144,7 @@ void writeEdgesToVTK
xmlConnectData.addAttribute("Name", "offsets");
xmlConnectData.addAttribute("format", "ascii");
xmlConnectData << connectivity;
-
+
OFstream os(fn);
os << xmlRoot << endl;
@@ -158,35 +158,35 @@ void writeEdgesToVTK
const string& title,
const UList& points,
const LongList& edges,
- const unallocLabelList& addr
+ const UList& addr
)
{
// Remove unused points and create subaddressed edges
DynamicList newPoints;
labelList newPointAddr(points.size(), -1);
LongList newEdges(addr.size());
-
+
forAll(addr, addrI)
{
label edgeI = addr[addrI];
-
+
const edge& curEdge = edges[edgeI];
edge& newEdge = newEdges[addrI];
-
+
forAll(curEdge, i)
{
label pointId = curEdge[i];
-
+
if (newPointAddr[pointId] == -1)
{
newPoints.append(points[pointId]);
newPointAddr[pointId] = newPoints.size()-1;
}
-
+
newEdge[i] = newPointAddr[pointId];
}
}
-
+
writeEdgesToVTK
(
fn,
@@ -201,36 +201,36 @@ void writeEdgesToVTK
void writeFacetsToVTK
(
const fileName& fn,
- const string& title,
+ const string& /*title*/,
const UList& points,
const LongList& facets
)
{
labelList connectivity(facets.size());
-
+
forAll(facets, faceI)
{
connectivity[faceI] = 3*(faceI+1);
}
-
+
labelList regionData(facets.size());
-
+
forAll(facets, faceI)
{
regionData[faceI] = facets[faceI].region();
}
-
+
xmlTag xmlRoot("VTKFile");
xmlRoot.addAttribute("type", "PolyData");
-
+
xmlTag& xmlPolyData = xmlRoot.addChild("PolyData");
-
+
xmlTag& xmlPiece = xmlPolyData.addChild("Piece");
xmlPiece.addAttribute("NumberOfPoints", points.size());
xmlPiece.addAttribute("NumberOfPolys", facets.size());
-
+
xmlTag& xmlPoints = xmlPiece.addChild("Points");
-
+
xmlTag& xmlPointData = xmlPoints.addChild("DataArray");
xmlPointData.addAttribute("type", "Float32");
xmlPointData.addAttribute("NumberOfComponents", 3);
@@ -250,18 +250,18 @@ void writeFacetsToVTK
xmlConnectData.addAttribute("Name", "offsets");
xmlConnectData.addAttribute("format", "ascii");
xmlConnectData << connectivity;
-
+
xmlTag& xmlCellData = xmlPiece.addChild("CellData");
-
+
xmlTag& xmlCellDataArray = xmlCellData.addChild("DataArray");
xmlCellDataArray.addAttribute("type", "Int32");
xmlCellDataArray.addAttribute("Name", "region");
xmlCellDataArray.addAttribute("format", "ascii");
xmlCellDataArray << regionData;
-
+
OFstream os(fn);
os << xmlRoot << endl;
-
+
Info << "Created " << fn << endl;
}
@@ -274,35 +274,35 @@ void writeFacetsToVTK
const string& title,
const pointField& points,
const LongList& facets,
- const unallocLabelList& addr
+ const UList& addr
)
-{
+{
// Remove unused points and create subaddressed facets
DynamicList newPoints;
labelList newPointAddr(points.size(), -1);
LongList newFacets(addr.size());
-
+
forAll(addr, addrI)
{
label faceI = addr[addrI];
-
+
const labelledTri& facet = facets[faceI];
const FixedList& pointIds = facet;
FixedList newPointIds;
-
+
forAll(pointIds, i)
{
label pointId = pointIds[i];
-
+
if (newPointAddr[pointId] == -1)
{
newPoints.append(points[pointId]);
newPointAddr[pointId] = newPoints.size()-1;
}
-
+
newPointIds[i] = newPointAddr[pointId];
}
-
+
newFacets[addrI] = labelledTri
(
newPointIds[0],
@@ -311,7 +311,7 @@ void writeFacetsToVTK
facet.region()
);
}
-
+
writeFacetsToVTK
(
fn,
@@ -334,36 +334,36 @@ int main(int argc, char *argv[])
// Process commandline arguments
fileName inFileName(args.args()[1]);
fileName outPrefix(args.args()[2]);
-
+
// Read original surface
triSurf origSurf(inFileName);
-
+
const pointField& points = origSurf.points();
const LongList& facets = origSurf.facets();
const LongList& edges = origSurf.featureEdges();
const geometricSurfacePatchList& patches = origSurf.patches();
-
+
label index = 0;
-
+
// Create file structure for multiblock dataset
mkDir(outPrefix);
mkDir(outPrefix + "/patches");
mkDir(outPrefix + "/pointSubsets");
mkDir(outPrefix + "/edgeSubsets");
mkDir(outPrefix + "/faceSubsets");
-
+
// Create VTK multiblock dataset file
xmlTag xmlRoot("VTKFile");
xmlRoot.addAttribute("type", "vtkMultiBlockDataSet");
xmlRoot.addAttribute("version", "1.0");
xmlRoot.addAttribute("byte_order", "LittleEndian");
-
+
xmlTag& xmlDataSet = xmlRoot.addChild("vtkMultiBlockDataSet");
-
+
// Write faces and feature edges
{
fileName fn = outPrefix / "facets.vtp";
-
+
writeFacetsToVTK
(
outPrefix / "facets.vtp",
@@ -371,16 +371,16 @@ int main(int argc, char *argv[])
points,
facets
);
-
+
xmlTag& tag = xmlDataSet.addChild("DataSet");
tag.addAttribute("index", Foam::name(index++));
tag.addAttribute("name", "facets");
tag.addAttribute("file", fn);
}
-
+
{
fileName fn = outPrefix / "featureEdges.vtp";
-
+
writeEdgesToVTK
(
outPrefix / "featureEdges.vtp",
@@ -388,33 +388,33 @@ int main(int argc, char *argv[])
points,
edges
);
-
+
xmlTag& tag = xmlDataSet.addChild("DataSet");
tag.addAttribute("index", Foam::name(index++));
tag.addAttribute("name", "featureEdges");
tag.addAttribute("file", fn);
}
-
+
// Write patches
// Create patch addressing
List > patchAddr(patches.size());
-
+
forAll(facets, faceI)
{
patchAddr[facets[faceI].region()].append(faceI);
}
-
+
{
xmlTag& xmlBlock = xmlDataSet.addChild("Block");
xmlBlock.addAttribute("index", Foam::name(index++));
xmlBlock.addAttribute("name", "patches");
-
+
forAll(patches, patchI)
- {
+ {
word patchName = patches[patchI].name();
-
+
fileName fn = outPrefix / "patches" / patchName + ".vtp";
-
+
writeFacetsToVTK
(
fn,
@@ -423,32 +423,32 @@ int main(int argc, char *argv[])
facets,
patchAddr[patchI]
);
-
+
xmlTag& tag = xmlBlock.addChild("DataSet");
tag.addAttribute("index", Foam::name(patchI));
tag.addAttribute("name", patchName);
tag.addAttribute("file", fn);
}
}
-
+
// Write point subsets
{
xmlTag& xmlBlock = xmlDataSet.addChild("Block");
xmlBlock.addAttribute("index", Foam::name(index++));
xmlBlock.addAttribute("name", "pointSubsets");
-
+
DynList subsetIndices;
labelList subsetAddr;
-
+
origSurf.pointSubsetIndices(subsetIndices);
-
+
forAll(subsetIndices, id)
{
word subsetName = origSurf.pointSubsetName(id);
origSurf.pointsInSubset(id, subsetAddr);
-
+
fileName fn = outPrefix / "pointSubsets" / subsetName + ".vtp";
-
+
writePointsToVTK
(
fn,
@@ -456,32 +456,32 @@ int main(int argc, char *argv[])
points,
subsetAddr
);
-
+
xmlTag& tag = xmlBlock.addChild("DataSet");
tag.addAttribute("index", Foam::name(id));
tag.addAttribute("name", subsetName);
tag.addAttribute("file", fn);
}
}
-
+
// Write edge subsets
{
xmlTag& xmlBlock = xmlDataSet.addChild("Block");
xmlBlock.addAttribute("index", Foam::name(index++));
xmlBlock.addAttribute("name", "edgeSubsets");
-
+
DynList subsetIndices;
labelList subsetAddr;
-
+
origSurf.edgeSubsetIndices(subsetIndices);
-
+
forAll(subsetIndices, id)
{
word subsetName = origSurf.edgeSubsetName(id);
origSurf.edgesInSubset(id, subsetAddr);
-
+
fileName fn = outPrefix / "edgeSubsets" / subsetName + ".vtp";
-
+
writeEdgesToVTK
(
fn,
@@ -490,32 +490,32 @@ int main(int argc, char *argv[])
edges,
subsetAddr
);
-
+
xmlTag& tag = xmlBlock.addChild("DataSet");
tag.addAttribute("index", Foam::name(id));
tag.addAttribute("name", subsetName);
tag.addAttribute("file", fn);
}
}
-
+
// Write facet subsets
{
xmlTag& xmlBlock = xmlDataSet.addChild("Block");
xmlBlock.addAttribute("index", Foam::name(index++));
xmlBlock.addAttribute("name", "faceSubsets");
-
+
DynList subsetIndices;
labelList subsetAddr;
-
+
origSurf.facetSubsetIndices(subsetIndices);
-
+
forAll(subsetIndices, id)
- {
+ {
word subsetName = origSurf.facetSubsetName(id);
origSurf.facetsInSubset(id, subsetAddr);
-
+
fileName fn = outPrefix / "faceSubsets" / subsetName + ".vtp";
-
+
writeFacetsToVTK
(
fn,
@@ -524,21 +524,21 @@ int main(int argc, char *argv[])
facets,
subsetAddr
);
-
+
xmlTag& tag = xmlBlock.addChild("DataSet");
tag.addAttribute("index", Foam::name(id));
tag.addAttribute("name", subsetName);
tag.addAttribute("file", fn);
}
- }
-
+ }
+
OFstream os(outPrefix + ".vtm");
os << xmlRoot << endl;
-
+
Info << "Created " << outPrefix + ".vtm" << endl;
-
+
Info << "End\n" << endl;
-
+
return 0;
}
diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/xmlTag.H b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/xmlTag.H
index ac7018729..f424d9744 100644
--- a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/xmlTag.H
+++ b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/xmlTag.H
@@ -1,9 +1,9 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | foam-extend: Open Source CFD
- \\ / O peration | Version: 3.2
- \\ / A nd | Web: http://www.foam-extend.org
- \\/ M anipulation | For copyright notice see file Copyright
+ \\ / O peration |
+ \\ / A nd | For copyright notice see file Copyright
+ \\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of foam-extend.
@@ -54,16 +54,16 @@ class xmlTag
public OStringStream
{
// Private data
-
+
//- Tag name
word name_;
-
+
//- Attributes
HashTable attributes_;
-
+
//- Child tags
DynamicList children_;
-
+
public:
// Constructors
@@ -76,7 +76,7 @@ public:
attributes_(),
children_()
{}
-
+
//- Construct given tag name
xmlTag(const word& name)
:
@@ -101,7 +101,7 @@ public:
// Member Functions
-
+
//- Add an attribute
template
void addAttribute(const keyType& key, const T& value)
@@ -110,13 +110,13 @@ public:
os << value;
attributes_.insert(key, os.str());
};
-
+
//- Add a fileName attribute
void addAttribute(const keyType& key, const fileName& value)
{
attributes_.insert(key, value);
};
-
+
//- Add a string attribute
void addAttribute(const keyType& key, const string& value)
{
@@ -128,15 +128,15 @@ public:
{
attributes_.insert(key, value);
};
-
+
//- Add a child
xmlTag& addChild(const xmlTag& tag)
{
children_.append(tag);
-
+
return children_[children_.size()-1];
};
-
+
//- Create and add a new child
xmlTag& addChild(const word& name)
{
@@ -149,26 +149,26 @@ public:
{
name_ = tag.name_;
attributes_ = tag.attributes_;
- children_ = tag.children_;
+ children_ = tag.children_;
OStringStream::rewind();
Foam::operator<<(*this, tag.str().c_str());
};
-
+
// Friend IOstream Operators
friend Ostream& operator<<(Ostream&, const xmlTag&);
-
+
template
friend xmlTag& operator<<(xmlTag&, const VectorSpace&);
-
+
friend xmlTag& operator<<(xmlTag&, const labelledTri&);
-
+
template
friend xmlTag& operator<<(xmlTag&, const FixedList&);
template
friend xmlTag& operator<<(xmlTag&, const LongList&);
-
+
template
friend xmlTag& operator<<(xmlTag&, const UList&);
};
@@ -180,7 +180,7 @@ Ostream& operator<<(Ostream& os, const xmlTag& tag)
{
// Tag name
os << indent << '<' << tag.name_;
-
+
// Attributes and text
for
(
@@ -191,24 +191,24 @@ Ostream& operator<<(Ostream& os, const xmlTag& tag)
{
os << token::SPACE << iter.key() << '=' << iter();
}
-
+
if (tag.str().size() || tag.children_.size())
{
os << '>' << nl;
-
+
// Children
os.incrIndent();
-
+
forAll(tag.children_, i)
{
os << tag.children_[i];
}
-
+
os.decrIndent();
-
+
// Tag text
os << tag.str().c_str();
-
+
// Close tag
os << indent << "' << endl;
}
@@ -229,9 +229,9 @@ xmlTag& operator<<(xmlTag& tag, const UList& data)
{
tag << data[i] << token::SPACE;
}
-
+
tag << nl;
-
+
return tag;
}
@@ -243,9 +243,9 @@ xmlTag& operator<<(xmlTag& tag, const LongList& data)
{
tag << data[i] << token::SPACE;
}
-
+
tag << nl;
-
+
return tag;
}
@@ -258,9 +258,9 @@ xmlTag& operator<<(xmlTag& tag, const VectorSpace& data)
{
tag << data[i] << token::SPACE;
}
-
+
tag << nl;
-
+
return tag;
}
@@ -272,9 +272,9 @@ xmlTag& operator<<(xmlTag& tag, const FixedList& data)
{
tag << data[i] << token::SPACE;
}
-
+
tag << nl;
-
+
return tag;
}
@@ -282,10 +282,10 @@ xmlTag& operator<<(xmlTag& tag, const FixedList& data)
xmlTag& operator<<(xmlTag& tag, const labelledTri& data)
{
const triFace& tFace = data;
-
+
return tag << tFace;
}
-
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/cartesian2DMesh.C b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/cartesian2DMesh.C
index 22f48f5a7..91d954a2f 100644
--- a/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/cartesian2DMesh.C
+++ b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/cartesian2DMesh.C
@@ -1,25 +1,25 @@
/*---------------------------------------------------------------------------*\
========= |
- \\ / F ield | foam-extend: Open Source CFD
- \\ / O peration | Version: 3.2
- \\ / A nd | Web: http://www.foam-extend.org
- \\/ M anipulation | For copyright notice see file Copyright
+ \\ / F ield | cfMesh: A library for mesh generation
+ \\ / O peration |
+ \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com)
+ \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
-------------------------------------------------------------------------------
License
- This file is part of foam-extend.
+ This file is part of cfMesh.
- foam-extend is free software: you can redistribute it and/or modify it
+ cfMesh 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
+ Free Software Foundation; either version 3 of the License, or (at your
option) any later version.
- foam-extend 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.
+ cfMesh 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 foam-extend. If not, see patchNameHash(patchNames);
-
+
// Find selected patches
label nFound = 0;
forAll(origPatches, patchI)
@@ -66,7 +64,7 @@ void getPatchIds
nFound++;
}
}
-
+
if (nFound != patchNames.size())
{
WarningIn("getPatchIds")
@@ -84,17 +82,17 @@ void copyFaceSubsets
{
DynList subsetIds;
origSurf.facetSubsetIndices(subsetIds);
-
+
forAll(subsetIds, subsetI)
{
label newSubsetId = newSurf.addFacetSubset
(
origSurf.facetSubsetName(subsetI)
);
-
- labelList origFaces;
+
+ labelList origFaces;
origSurf.facetsInSubset(subsetI, origFaces);
-
+
forAll(origFaces, faceI)
{
newSurf.addFacetToSubset
@@ -116,17 +114,17 @@ void copyEdgeSubsets
{
DynList subsetIds;
origSurf.edgeSubsetIndices(subsetIds);
-
+
forAll(subsetIds, subsetI)
{
label newSubsetId = newSurf.addEdgeSubset
(
origSurf.edgeSubsetName(subsetI)
);
-
- labelList origEdges;
+
+ labelList origEdges;
origSurf.edgesInSubset(subsetI, origEdges);
-
+
forAll(origEdges, faceI)
{
newSurf.addEdgeToSubset
@@ -148,17 +146,17 @@ void copyPointSubsets
{
DynList subsetIds;
origSurf.pointSubsetIndices(subsetIds);
-
+
forAll(subsetIds, subsetI)
{
label newSubsetId = newSurf.addPointSubset
(
origSurf.pointSubsetName(subsetI)
);
-
- labelList origPoints;
+
+ labelList origPoints;
origSurf.pointsInSubset(subsetI, origPoints);
-
+
forAll(origPoints, faceI)
{
newSurf.addPointToSubset
@@ -182,20 +180,20 @@ autoPtr mergeSurfacePatches
{
const geometricSurfacePatchList& origPatches = origSurf.patches();
const LongList& origFacets = origSurf.facets();
-
+
label newPatchId = origPatches.size();
-
+
// Determine new patch type
word newPatchType = origPatches[patchIds[0]].geometricType();
-
+
// Create patch addressing
List > patchAddr(origPatches.size()+1);
-
+
forAll(origFacets, faceI)
{
patchAddr[origFacets[faceI].region()].append(faceI);
}
-
+
// Move selected patches to new patch
forAll(patchIds, patchI)
{
@@ -206,35 +204,35 @@ autoPtr mergeSurfacePatches
// Create new facets list
LongList newFacets(origFacets.size());
labelList newFaceAddr(origFacets.size(), -1);
-
+
label patchCount = 0;
label faceI = 0;
forAll(patchAddr, patchI)
{
- const unallocLabelList& addr = patchAddr[patchI];
-
+ const UList& addr = patchAddr[patchI];
+
if(addr.size())
{
forAll(addr, i)
{
newFacets[faceI] = origFacets[addr[i]];
newFacets[faceI].region() = patchCount;
-
+
newFaceAddr[addr[i]] = faceI;
-
+
faceI++;
}
}
-
+
if(addr.size() || keepPatches)
{
patchCount++;
}
}
-
+
// Create new patch list
geometricSurfacePatchList newPatches(patchCount);
-
+
patchCount = 0;
forAll(origPatches, patchI)
{
@@ -244,13 +242,13 @@ autoPtr mergeSurfacePatches
newPatches[patchCount] = origPatches[patchI];
newPatches[patchCount].index() = patchCount;
}
-
+
if(patchAddr[patchI].size() || keepPatches)
{
patchCount++;
}
}
-
+
// Add new patch if it contains faces
if(patchAddr[patchAddr.size()-1].size())
{
@@ -265,7 +263,7 @@ autoPtr mergeSurfacePatches
{
patchCount++;
}
-
+
// Create new surface
autoPtr newSurf
(
@@ -277,17 +275,17 @@ autoPtr mergeSurfacePatches
origSurf.points()
)
);
-
+
// Transfer face subsets
copyFaceSubsets(origSurf, newSurf());
newSurf->updateFacetsSubsets(newFaceAddr);
-
+
// Transfer feature edge subsets
copyEdgeSubsets(origSurf, newSurf());
-
+
// Transfer point subsets
copyPointSubsets(origSurf, newSurf());
-
+
// Done
return newSurf;
}
@@ -310,18 +308,18 @@ int main(int argc, char *argv[])
// Process commandline arguments
fileName inFileName(args.args()[1]);
-
+
word newPatchName(args.args()[2]);
fileName outFileName(inFileName);
-
+
if( args.options().found("output") )
{
outFileName = args.options()["output"];
}
bool keepPatches = false;
-
+
if( args.options().found("keep") )
{
keepPatches = true;
@@ -329,10 +327,10 @@ int main(int argc, char *argv[])
// Read original surface
triSurf origSurf(inFileName);
-
+
// Get patch ids
DynamicList patchIds;
-
+
if (args.options().found("patchNames"))
{
if (args.options().found("patchIds"))
@@ -340,10 +338,10 @@ int main(int argc, char *argv[])
FatalError() << "Cannot specify both patch names and ids"
<< Foam::abort(FatalError);
}
-
+
IStringStream is(args.options()["patchNames"]);
wordList patchNames(is);
-
+
getPatchIds
(
origSurf,
@@ -354,32 +352,32 @@ int main(int argc, char *argv[])
if (args.options().found("patchIds"))
{
IStringStream is(args.options()["patchIds"]);
-
+
patchIds = labelList(is);
}
if (args.options().found("patchIds"))
{
IStringStream is(args.options()["patchIds"]);
-
+
patchIds.append(labelList(is));
}
if (args.options().found("patchIdRange"))
{
IStringStream is(args.options()["patchIdRange"]);
-
+
Pair idRange(is);
-
+
for(label id = idRange.first(); id <= idRange.second(); id++)
{
patchIds.append(id);
}
- }
+ }
if (!patchIds.size())
{
FatalError() << "No patches specified"
<< Foam::abort(FatalError);
}
-
+
// Merge patches
autoPtr newSurf = mergeSurfacePatches
(
@@ -388,16 +386,16 @@ int main(int argc, char *argv[])
newPatchName,
keepPatches
);
-
+
// Write new surface mesh
newSurf->writeSurface(outFileName);
-
+
Info << "Original surface patches: " << origSurf.patches().size() << endl;
Info << "Final surface patches: " << newSurf->patches().size() << endl;
Info << "Surface written to " << outFileName << endl;
-
+
Info << "End\n" << endl;
-
+
return 0;
}
diff --git a/applications/utilities/mesh/generation/cfMesh/meshToFPMA/meshToFPMA.C b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/meshToFPMA.C
index e67763f1f..7297df55b 100644
--- a/applications/utilities/mesh/generation/cfMesh/meshToFPMA/meshToFPMA.C
+++ b/applications/utilities/mesh/generation/cfMesh/meshToFPMA/meshToFPMA.C
@@ -1,25 +1,25 @@
/*---------------------------------------------------------------------------*\
========= |
- \\ / F ield | foam-extend: Open Source CFD
- \\ / O peration | Version: 3.2
- \\ / A nd | Web: http://www.foam-extend.org
- \\/ M anipulation | For copyright notice see file Copyright
+ \\ / F ield | cfMesh: A library for mesh generation
+ \\ / O peration |
+ \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com)
+ \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
-------------------------------------------------------------------------------
License
- This file is part of foam-extend.
+ This file is part of cfMesh.
- foam-extend is free software: you can redistribute it and/or modify it
+ cfMesh 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
+ Free Software Foundation; either version 3 of the License, or (at your
option) any later version.
- foam-extend 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.
+ cfMesh 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 foam-extend. If not, see
@@ -83,16 +82,13 @@ int main(int argc, char *argv[])
file += ss.str();
Info << "Creating " << file << endl;
- // create a directory for processor data
+ //- create a directory for processor data
mkDir(runTime.path()/file);
- // generate constant directories
- mkDir(runTime.path()/"constant");
-
- // copy the contents of the const directory into processor*
+ //- copy the contents of the const directory into processor*
cp(runTime.path()/"constant", runTime.path()/file);
- // generate 0 directories
+ //- generate 0 directories for
mkDir(runTime.path()/file/"0");
}
diff --git a/applications/utilities/mesh/generation/cfMesh/python/Salome/extractFeatureEdges.py b/applications/utilities/mesh/generation/cfMesh/python/Salome/extractFeatureEdges.py
index 558ff9c13..eca9d2267 100644
--- a/applications/utilities/mesh/generation/cfMesh/python/Salome/extractFeatureEdges.py
+++ b/applications/utilities/mesh/generation/cfMesh/python/Salome/extractFeatureEdges.py
@@ -24,53 +24,53 @@ def extractFeatureEdges(body, minFeatureAngle = 5):
import GEOM
from salome.geom import geomBuilder
geompy = geomBuilder.New(salome.myStudy)
-
+
# Check the body type
if not (body.GetShapeType() in [GEOM.SHELL, GEOM.SOLID, GEOM.FACE, GEOM.COMPOUND]):
raise RuntimeError('Supplied object is not a solid, shell or face.')
-
+
print 'Extracting edges of %s with feature angle > %g.' % (body.GetName(), minFeatureAngle)
-
+
# Extract basic info
faces = geompy.SubShapeAll(body, geompy.ShapeType["FACE"])
curves = geompy.SubShapeAll(body, geompy.ShapeType["EDGE"])
points = geompy.SubShapeAll(body, geompy.ShapeType["VERTEX"])
-
+
faceIds = geompy.GetSubShapesIDs(body, faces)
curveIds = geompy.GetSubShapesIDs(body, curves)
nodeIds = geompy.GetSubShapesIDs(body, points)
-
+
maxFaceId = max(faceIds)
maxCurveId = max(curveIds)
maxNodeId = max(nodeIds)
-
+
# Reverse mapping from curve id to local curve arrays
faceMap = [-1 for i in xrange(maxFaceId+1)]
for localId, id in enumerate(faceIds):
faceMap[id] = localId
-
+
curveMap = [-1 for i in xrange(maxCurveId+1)]
for localId, id in enumerate(curveIds):
curveMap[id] = localId
-
+
nodeMap = [-1 for i in xrange(maxNodeId+1)]
for localId, id in enumerate(nodeIds):
nodeMap[id] = localId
-
-
+
+
# Get curves on each face
faceCurveIds = [[curveMap[id] for id in geompy.GetSubShapesIDs(
body,
geompy.SubShapeAll(face, geompy.ShapeType["EDGE"])
)] for face in faces]
-
+
# Get faces attached to each curve
curveFaceIds = [[] for id in curveIds]
-
+
for faceI, ids in enumerate(faceCurveIds):
for id in ids:
curveFaceIds[id].append(faceI)
-
+
# Now that we have the connectivity for curves and faces find the
# feature edges
featureEdgeIds = []
@@ -87,21 +87,21 @@ def extractFeatureEdges(body, minFeatureAngle = 5):
angle = geompy.GetAngle(n1, n2)
if angle > minFeatureAngle:
featureEdgeIds.append(curveId)
-
+
elif len(adjFaceIds) == 1:
# Curve on standalone face - Add by default
featureEdgeIds.append(curveId)
-
+
elif len(adjFaceIds) == 0:
# Standalone curve - Ignore
None
-
+
else:
raise RuntimeError('Curve found sharing %d faces. This is unexpected for fully enclosed bodies.' % len(adjFaceIds))
-
+
# Done
print "%d feature edges found" % len(featureEdgeIds)
-
+
return featureEdgeIds
@@ -110,22 +110,22 @@ def extractFeatureEdges(body, minFeatureAngle = 5):
if __name__ == '__main__':
import salome
salome.salome_init()
-
+
import GEOM
from salome.geom import geomBuilder
geompy = geomBuilder.New(salome.myStudy)
-
+
# Get current GUI selection
selected = salome.sg.getAllSelected()
if len(selected) != 1:
raise RuntimeError('A single solid, shell or face object must be selected.')
-
+
body = salome.myStudy.FindObjectID(selected[0]).GetObject()
-
+
# Get feature edges and add to the group 'featureEdges'
featureEdges = geompy.CreateGroup(body, geompy.ShapeType["EDGE"])
geompy.UnionIDs(featureEdges, extractFeatureEdges(body))
geompy.addToStudyInFather(body, featureEdges, 'featureEdges')
-
+
if salome.sg.hasDesktop():
salome.sg.updateObjBrowser(1)
diff --git a/applications/utilities/mesh/generation/cfMesh/python/Salome/salomeTriSurf.py b/applications/utilities/mesh/generation/cfMesh/python/Salome/salomeTriSurf.py
index 40fcdcb25..4b3fbf5f7 100644
--- a/applications/utilities/mesh/generation/cfMesh/python/Salome/salomeTriSurf.py
+++ b/applications/utilities/mesh/generation/cfMesh/python/Salome/salomeTriSurf.py
@@ -52,28 +52,28 @@ class triSurf:
from salome.smesh import smeshBuilder
from operator import itemgetter
from collections import OrderedDict
-
+
import SMESH, SALOMEDS
-
+
# =============================================================================
# Get the Salome mesh object
if object is None:
selected = salome.sg.getAllSelected()
if len(selected) != 1:
raise RuntimeError('A single Salome mesh object must be selected.')
-
+
object = salome.myStudy.FindObjectID(selected[0]).GetObject()
-
+
try:
object.GetMesh()
except:
raise RuntimeError('Supplied object is not a Salome SMESH mesh.')
-
+
smesh = smeshBuilder.New(salome.myStudy)
mesh = smesh.Mesh(object)
-
+
print "Converting SMESH Mesh '%s'" % mesh.GetName()
-
+
# =============================================================================
# Get basic mesh info
nNodes = mesh.NbNodes()
@@ -83,11 +83,11 @@ class triSurf:
nodeIds = mesh.GetNodesId()
faceIds = mesh.GetElementsByType(SMESH.FACE)
edgeIds = mesh.GetElementsByType(SMESH.EDGE)
-
+
# Check that mesh is strictly triangular
if nFaces != nTris:
raise RuntimeError('Mesh is not strictly triangular')
-
+
# Get patch and subset names & ids
# All SMESH.FACE groups are assumed to be patches
# All SMESH.EDGE groups are assumed to be feature subsets
@@ -95,7 +95,7 @@ class triSurf:
patches = OrderedDict()
pointSubsets = OrderedDict()
featureEdgeSubsets = OrderedDict()
-
+
for group in mesh.GetGroups():
if group.GetType() == SMESH.FACE:
patches[group.GetName()] = group.GetIDs()
@@ -103,7 +103,7 @@ class triSurf:
featureEdgeSubsets[group.GetName()] = group.GetIDs()
elif group.GetType() == SMESH.NODE:
pointSubsets[group.GetName()] = group.GetIDs()
-
+
# =============================================================================
# Process faces and patches
# Get patchId for each face
@@ -117,44 +117,44 @@ class triSurf:
else:
print "Face %d is assigned to both groups %s and %s" % (faceId, name, patches.keys()[patchIds[faceId-1]])
raise RuntimeError('Groups of faces are not unique, i.e. they overlap.')
-
+
patchId += 1
-
+
# Compact and reorder patchIds to match faceIds
patchIds = [patchIds[faceId-1] for faceId in faceIds]
-
+
# Reorder faces by increasing group id
faceAndpatchIds = sorted(zip(faceIds, patchIds), key=itemgetter(1))
faceIds, patchIds = zip(*faceAndpatchIds)
-
+
# Add unused faces to the default patch
defaultFaces = [faceId for faceId, patchId in faceAndpatchIds if patchId == lastPatchId]
if len(defaultFaces) > 0:
patches['defaultFaces'] = defaultFaces
-
+
defaultFaces = None
-
+
# =============================================================================
# Process feature edges
if not allEdges:
edgeIds = []
for name, ids in featureEdgeSubsets.iteritems():
edgeIds += ids
-
+
edgeIds = list(set(edgeIds))
nEdges = len(edgeIds)
-
+
# Reverse mapping of edge ids since they aren't necessarily numbered 1..nEdges
if len(edgeIds):
edgeMap = [-1] * max(edgeIds)
else:
edgeMap = []
-
+
i=0
for edgeId in edgeIds:
edgeMap[edgeId-1] = i
i += 1
-
+
# =============================================================================
# Process nodes
# Reverse mapping of node ids since nodes aren't necessarily numbered 1..nNodes
@@ -163,77 +163,77 @@ class triSurf:
for nodeId in nodeIds:
nodeMap[nodeId-1] = i
i += 1
-
+
# =============================================================================
self._mesh = mesh
-
+
self._nodeIds = nodeIds
self._edgeIds = edgeIds
self._faceIds = faceIds
-
+
self._nodeMap = nodeMap
self._edgeMap = edgeMap
self._faceMap = []
-
+
self._patches = patches
self._pointSubsets = pointSubsets
self._featureEdgeSubsets = featureEdgeSubsets
self._faceSubsets = {}
-
+
print 'Done'
-
+
def nNodes(self):
'''
Return the number of nodes
'''
return len(self._nodeIds)
-
+
def nEdges(self):
'''
Return the number of edges
'''
return len(self._edgeIds)
-
+
def nFacets(self):
'''
Return the number of triangular facets
'''
return len(self._faceIds)
-
+
def nPatches(self):
'''
Return the number of patches
'''
return len(self._patches)
-
+
def _writePatchDefs(self, f, typeName = 'wall'):
'''
Write the patch definitions to file as an OpenFOAM geometricSurfacePatchList.
NOTE: All patches are assumed to be walls.
'''
patches = self._patches
-
+
f.write('%d\n(\n' % len(patches))
for name in patches.iterkeys():
f.write('%s\t%s\n' % (name, typeName))
-
+
f.write(')\n')
-
+
def _writeNodes(self, f):
'''
Write the nodes to file as an OpenFOAM pointField.
'''
mesh = self._mesh
nodeIds = self._nodeIds
-
+
f.write('%d\n(\n' % len(nodeIds))
-
+
for x, y, z in [mesh.GetNodeXYZ(nodeId) for nodeId in nodeIds]:
f.write( '( %g %g %g )\n' % (x, y, z))
-
+
f.write(')\n')
-
+
def _writeFeatureEdges(self, f):
'''
Write the feature edges to file as an OpenFOAM edgeList.
@@ -241,35 +241,35 @@ class triSurf:
mesh = self._mesh
nodeMap = self._nodeMap
edgeIds = self._edgeIds
-
+
f.write('%d\n(\n' % len(edgeIds))
-
+
for edgeId in edgeIds:
nodes = mesh.GetElemNodes(edgeId)
f.write( '(' + ' '.join([str(nodeMap[nodeId-1]) for nodeId in nodes]) + ')\n')
-
+
f.write(')\n')
-
+
def _writeFacets(self, f):
'''
Write the facets to file as an OpenFOAM List of labelledTri.
'''
from itertools import chain
-
+
mesh = self._mesh
nodeMap = self._nodeMap
patches = self._patches
-
+
f.write('%d\n(\n' % sum([len(patch) for patch in patches.itervalues()]))
-
+
patchId = 0
for patchId, (patchName, faceIds) in enumerate(patches.iteritems()):
for faceId in faceIds:
nodes = mesh.GetElemNodes(faceId)
f.write( '((' + ' '.join([str(nodeMap[nodeId-1]) for nodeId in nodes]) + ') %d)\n' % patchId)
-
+
f.write(')\n')
-
+
def _writeSubsets(self, f, subsets, map, typeId):
'''
General function to write a subset to file as an OpenFOAM Map.
@@ -277,72 +277,72 @@ class triSurf:
f.write('%d\n(\n' % len(subsets))
for name, ids in subsets.iteritems():
f.write('%s %s %d ( %s )\n' % (name, typeId, len(ids), ' '.join([str(map[id-1]) for id in ids])))
-
+
f.write(')\n')
-
+
def _writePointSubsets(self, f):
'''
Write the point subsets to file as and OpenFOAM Map.
'''
self._writeSubsets(f, self._pointSubsets, self._nodeMap, '2')
-
+
def _writeFaceSubsets(self, f):
'''
Write the face subsets to file as and OpenFOAM Map.
'''
self._writeSubsets(f, self._faceSubsets, self._faceMap, '4')
-
+
def _writeFeatureEdgeSubsets(self, f):
'''
Write the feature edge subsets to file as and OpenFOAM Map.
'''
self._writeSubsets(f, self._featureEdgeSubsets, self._edgeMap, '8')
-
+
def writeEdgeMesh(self, fileName):
'''
Write to file as an OpenFOAM edgeMesh
-
+
fileName - The file name to write
'''
# Create file
f = open(fileName, 'wb') # NOTE: file opened as binary to ensure unix-style line breaks
-
+
# Write header
f.write(foamHeader('edgeMesh', self._mesh.GetName()))
-
+
self._writeNodes(f)
self._writeFeatureEdges(f)
-
+
f.close()
-
+
print 'edgeMesh written to %s' % fileName
-
+
def writeFtr(self, fileName):
'''
Write to file as an OpenFOAM cfMesh FTR file
-
+
fileName - the file name to write
'''
# Create file
f = open(fileName, 'wb') # NOTE: file opened as binary to ensure unix-style line breaks
-
+
self._writePatchDefs(f)
self._writeNodes(f)
self._writeFacets(f)
-
+
f.close()
-
+
print 'triSurf written to %s' % fileName
-
+
def writeFms(self, fileName):
'''
Write to file as an OpenFOAM cfMesh FMS file
-
+
fileName - the file name to write
'''
# Create file
f = open(fileName, 'wb') # NOTE: file opened as binary to ensure unix-style line breaks
-
+
self._writePatchDefs(f)
self._writeNodes(f)
self._writeFacets(f)
@@ -350,14 +350,14 @@ class triSurf:
self._writePointSubsets(f)
self._writeFaceSubsets(f)
self._writeFeatureEdgeSubsets(f)
-
+
f.close()
-
+
print 'triSurf written to %s' % fileName
if __name__ == '__main__':
import salome
salome.salome_init()
-
+
import SMESH, SALOMEDS
diff --git a/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C
index d09c4af68..31eec8bab 100644
--- a/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C
+++ b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/removeSurfaceFacets.C
@@ -1,25 +1,25 @@
/*---------------------------------------------------------------------------*\
========= |
- \\ / F ield | foam-extend: Open Source CFD
- \\ / O peration | Version: 3.2
- \\ / A nd | Web: http://www.foam-extend.org
- \\/ M anipulation | For copyright notice see file Copyright
+ \\ / F ield | cfMesh: A library for mesh generation
+ \\ / O peration |
+ \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com)
+ \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
-------------------------------------------------------------------------------
License
- This file is part of foam-extend.
+ This file is part of cfMesh.
- foam-extend is free software: you can redistribute it and/or modify it
+ cfMesh 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
+ Free Software Foundation; either version 3 of the License, or (at your
option) any later version.
- foam-extend 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.
+ cfMesh 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 foam-extend. If not, see
#include
-#include "triSurfaceDetectFeatureEdges.H"
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
using namespace Foam;
@@ -121,12 +121,12 @@ int main(int argc, char *argv[])
//- generate bounding bound triangles
const label nTriangles = origSurface.size();
LongList& newTriangles = sMod.facetsAccess();
- newTriangles.setSize(nTriangles + 12);
+ newTriangles.setSize(nTriangles+12);
//- create patches
geometricSurfacePatchList& newPatches = sMod.patchesAccess();
const label nPatches = origSurface.patches().size();
- newPatches.setSize(nPatches + 6);
+ newPatches.setSize(nPatches+6);
newPatches[nPatches].name() = "xMin";
newPatches[nPatches+1].name() = "xMax";
diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/surfaceToFMS.C b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/surfaceToFMS.C
index d662032d7..79f1d81a0 100644
--- a/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/surfaceToFMS.C
+++ b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/surfaceToFMS.C
@@ -1,28 +1,28 @@
/*---------------------------------------------------------------------------*\
========= |
- \\ / F ield | foam-extend: Open Source CFD
- \\ / O peration | Version: 3.2
- \\ / A nd | Web: http://www.foam-extend.org
- \\/ M anipulation | For copyright notice see file Copyright
+ \\ / F ield | cfMesh: A library for mesh generation
+ \\ / O peration |
+ \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com)
+ \\/ M anipulation | Copyright (C) Creative Fields, Ltd.
-------------------------------------------------------------------------------
License
- This file is part of foam-extend.
+ This file is part of cfMesh.
- foam-extend is free software: you can redistribute it and/or modify it
+ cfMesh 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
+ Free Software Foundation; either version 3 of the License, or (at your
option) any later version.
- foam-extend 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.
+ cfMesh 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 foam-extend. If not, see (*surfacePtr_)
+ );
+
+ //- create surface patches based on the feature edges
+ //- and update the meshDict based on the given data
+ triSurfacePatchManipulator manipulator(*surfacePtr_);
+
+ const triSurf* surfaceWithPatches =
+ manipulator.surfaceWithPatches(&meshDict_);
+
+ //- delete the old surface and assign the new one
+ deleteDemandDrivenData(surfacePtr_);
+ surfacePtr_ = surfaceWithPatches;
+ }
+
+ if( meshDict_.found("anisotropicSources") )
+ {
+ surfaceMeshGeometryModification surfMod(*surfacePtr_, meshDict_);
+
+ modSurfacePtr_ = surfMod.modifyGeometry();
+
+ octreePtr_ = new meshOctree(*modSurfacePtr_, true);
+ }
+ else
+ {
+ octreePtr_ = new meshOctree(*surfacePtr_, true);
+ }
+
+ meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes();
+
+ generateMesh();
+ }
+ catch(const std::string& message)
{
- //- get rid of duplicate triangles as they cause strange problems
- triSurfaceCleanupDuplicateTriangles(const_cast(*surfacePtr_));
-
- //- create surface patches based on the feature edges
- //- and update the meshDict based on the given data
- triSurfacePatchManipulator manipulator(*surfacePtr_);
-
- const triSurf* surfaceWithPatches =
- manipulator.surfaceWithPatches(&meshDict_);
-
- //- delete the old surface and assign the new one
- deleteDemandDrivenData(surfacePtr_);
- surfacePtr_ = surfaceWithPatches;
+ Info << message << endl;
}
-
- if( meshDict_.found("anisotropicSources") )
+ catch(...)
{
- surfaceMeshGeometryModification surfMod(*surfacePtr_, meshDict_);
-
- modSurfacePtr_ = surfMod.modifyGeometry();
-
- octreePtr_ = new meshOctree(*modSurfacePtr_, true);
+ WarningIn
+ (
+ "cartesian2DMeshGenerator::cartesian2DMeshGenerator(const Time&)"
+ ) << "Meshing process terminated!" << endl;
}
- else
- {
- octreePtr_ = new meshOctree(*surfacePtr_, true);
- }
-
- meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes();
-
- generateMesh();
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C
index 5ff31b7fd..d81f2dd50 100644
--- a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C
+++ b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.C
@@ -76,24 +76,24 @@ void cartesianMeshExtractor::decomposeSplitHexes()
void cartesianMeshExtractor::createMesh()
{
Info << "Extracting polyMesh" << endl;
-
+
//- create points and pointLeaves addressing
createPointsAndAddressing();
//- create the mesh
createPolyMesh();
-
+
//- decompose split-hex cells into tetrahedra and pyramids
decomposeSplitHexesIntoTetsAndPyramids();
-
+
//- remove unused vertices
polyMeshGenModifier(mesh_).removeUnusedVertices();
-
+
Info << "Mesh has :" << nl
<< mesh_.points().size() << " vertices " << nl
<< mesh_.faces().size() << " faces" << nl
<< mesh_.cells().size() << " cells" << endl;
-
+
if( Pstream::parRun() )
{
label nCells = mesh_.cells().size();
@@ -112,7 +112,7 @@ void cartesianMeshExtractor::createMesh()
<< " This can be reolved by reducing the maxCellSize by a fraction."
<< "i.e. 2.49999 instead of 2.5." << exit(FatalError);
}
-
+
Info << "Finished extracting polyMesh" << endl;
}
diff --git a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H
index c5268ac90..fdbd60a24 100644
--- a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H
+++ b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractor.H
@@ -42,7 +42,7 @@ SourceFiles
namespace Foam
{
-
+
class IOdictionary;
/*---------------------------------------------------------------------------*\
@@ -54,13 +54,13 @@ class cartesianMeshExtractor
// Private data
//- reference to the octree addressing
meshOctreeAddressing octreeCheck_;
-
+
//- reference to the mesh
polyMeshGen& mesh_;
-
+
//- decompose split hex cells
bool decomposeSplitHexes_;
-
+
//- cell label for a given leaf
labelList* leafCellLabelPtr_;
@@ -73,7 +73,7 @@ class cartesianMeshExtractor
//- create mesh data
void createPolyMesh();
-
+
//- decompose split hexes into pyramids and tets
void decomposeSplitHexesIntoTetsAndPyramids();
@@ -105,7 +105,7 @@ public:
//- decompose split hexes into standard cells
void decomposeSplitHexes();
-
+
//- create the mesh with the above options
void createMesh();
};
diff --git a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C
index 9d6ec376f..d33800736 100644
--- a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C
+++ b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorDecomposeSplitHexes.C
@@ -45,39 +45,39 @@ void cartesianMeshExtractor::decomposeSplitHexesIntoTetsAndPyramids()
if( !decomposeSplitHexes_ ) return;
Info << "Decomposing split-hex cells" << endl;
-
+
const faceListPMG& faces = mesh_.faces();
-
+
//- decompose faces which have more than 4 vertices
boolList decompose(faces.size(), false);
-
+
label nDecomposed(0);
forAll(faces, faceI)
{
if( faces[faceI].size() > 4 )
{
++nDecomposed;
-
+
decompose[faceI] = true;
}
}
-
+
reduce(nDecomposed, sumOp());
-
+
Info << "Decomposing " << nDecomposed
<< " faces with more than 4 vertices" << endl;
-
+
if( nDecomposed != 0 )
{
//- decompose marked faces into triangles
decomposeFaces(mesh_).decomposeMeshFaces(decompose);
}
-
+
//- decompose cells with 24 faces
const cellListPMG& cells = mesh_.cells();
decompose.setSize(cells.size());
decompose = false;
-
+
hexMatcher hex;
forAll(cells, cellI)
{
@@ -87,19 +87,19 @@ void cartesianMeshExtractor::decomposeSplitHexesIntoTetsAndPyramids()
decompose[cellI] = true;
}
}
-
+
reduce(nDecomposed, sumOp());
-
+
Info << "Decomposing " << nDecomposed
<< " cells into tetrahedra and pyramids" << endl;
-
+
if( nDecomposed )
{
//- decompose marked cells into tets and pyramids
decomposeCells dc(mesh_);
dc.decomposeMesh(decompose);
}
-
+
Info << "Finished decomposing split-hex cells" << endl;
}
diff --git a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C
index a2172b4d6..9118a7e75 100644
--- a/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C
+++ b/src/mesh/cfMesh/cartesianMesh/cartesianMeshExtractor/cartesianMeshExtractorPolyMesh.C
@@ -418,8 +418,8 @@ void cartesianMeshExtractor::createPolyMesh()
newFacePatch
);
- meshModifier.boundariesAccess()[1].patchType() = "patch";
- meshModifier.boundariesAccess()[2].patchType() = "patch";
+ meshModifier.boundariesAccess()[1].patchType() = "empty";
+ meshModifier.boundariesAccess()[2].patchType() = "empty";
}
Info << "Finished creating polyMesh" << endl;
diff --git a/src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C b/src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C
index 39a585952..f76c284a8 100644
--- a/src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C
+++ b/src/mesh/cfMesh/cartesianMesh/cartesianMeshGenerator/cartesianMeshGenerator.C
@@ -29,7 +29,6 @@ Description
#include "triSurf.H"
#include "triSurfacePatchManipulator.H"
#include "demandDrivenData.H"
-#include "foamTime.H"
#include "meshOctreeCreator.H"
#include "cartesianMeshExtractor.H"
#include "meshSurfaceEngine.H"
@@ -247,69 +246,55 @@ void cartesianMeshGenerator::renumberMesh()
void cartesianMeshGenerator::generateMesh()
{
- try
+ if( controller_.runCurrentStep("templateGeneration") )
{
- if( controller_.runCurrentStep("templateGeneration") )
- {
- createCartesianMesh();
- }
-
- if( controller_.runCurrentStep("surfaceTopology") )
- {
- surfacePreparation();
- }
-
- if( controller_.runCurrentStep("surfaceProjection") )
- {
- mapMeshToSurface();
- }
-
- if( controller_.runCurrentStep("patchAssignment") )
- {
- extractPatches();
- }
-
- if( controller_.runCurrentStep("edgeExtraction") )
- {
- mapEdgesAndCorners();
-
- optimiseMeshSurface();
- }
-
- if( controller_.runCurrentStep("boundaryLayerGeneration") )
- {
- generateBoundaryLayers();
- }
-
- if( controller_.runCurrentStep("meshOptimisation") )
- {
- optimiseFinalMesh();
-
- projectSurfaceAfterBackScaling();
- }
-
- if( controller_.runCurrentStep("boundaryLayerRefinement") )
- {
- refBoundaryLayers();
- }
-
- renumberMesh();
-
- replaceBoundaries();
-
- controller_.workflowCompleted();
+ createCartesianMesh();
}
- catch(const std::string& message)
+
+ if( controller_.runCurrentStep("surfaceTopology") )
{
- Info << message << endl;
+ surfacePreparation();
}
- catch(...)
+
+ if( controller_.runCurrentStep("surfaceProjection") )
{
- WarningIn
- (
- "void cartesianMeshGenerator::generateMesh()"
- ) << "Meshing process terminated!" << endl;
+ mapMeshToSurface();
}
+
+ if( controller_.runCurrentStep("patchAssignment") )
+ {
+ extractPatches();
+ }
+
+ if( controller_.runCurrentStep("edgeExtraction") )
+ {
+ mapEdgesAndCorners();
+
+ optimiseMeshSurface();
+ }
+
+ if( controller_.runCurrentStep("boundaryLayerGeneration") )
+ {
+ generateBoundaryLayers();
+ }
+
+ if( controller_.runCurrentStep("meshOptimisation") )
+ {
+ optimiseFinalMesh();
+
+ projectSurfaceAfterBackScaling();
+ }
+
+ if( controller_.runCurrentStep("boundaryLayerRefinement") )
+ {
+ refBoundaryLayers();
+ }
+
+ renumberMesh();
+
+ replaceBoundaries();
+
+ controller_.workflowCompleted();
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -334,57 +319,72 @@ cartesianMeshGenerator::cartesianMeshGenerator(const Time& time)
mesh_(time),
controller_(mesh_)
{
- if( true )
+ try
{
- checkMeshDict cmd(meshDict_);
+ if( true )
+ {
+ checkMeshDict cmd(meshDict_);
+ }
+
+ fileName surfaceFile = meshDict_.lookup("surfaceFile");
+ if( Pstream::parRun() )
+ surfaceFile = ".."/surfaceFile;
+
+ surfacePtr_ = new triSurf(db_.path()/surfaceFile);
+
+ if( true )
+ {
+ //- save meta data with the mesh (surface mesh + its topology info)
+ triSurfaceMetaData sMetaData(*surfacePtr_);
+ const dictionary& surfMetaDict = sMetaData.metaData();
+
+ mesh_.metaData().add("surfaceFile", surfaceFile, true);
+ mesh_.metaData().add("surfaceMeta", surfMetaDict, true);
+ }
+
+ if( surfacePtr_->featureEdges().size() != 0 )
+ {
+ //- create surface patches based on the feature edges
+ //- and update the meshDict based on the given data
+ triSurfacePatchManipulator manipulator(*surfacePtr_);
+
+ const triSurf* surfaceWithPatches =
+ manipulator.surfaceWithPatches(&meshDict_);
+
+ //- delete the old surface and assign the new one
+ deleteDemandDrivenData(surfacePtr_);
+ surfacePtr_ = surfaceWithPatches;
+ }
+
+ if( meshDict_.found("anisotropicSources") )
+ {
+ surfaceMeshGeometryModification surfMod(*surfacePtr_, meshDict_);
+
+ modSurfacePtr_ = surfMod.modifyGeometry();
+
+ octreePtr_ = new meshOctree(*modSurfacePtr_);
+ }
+ else
+ {
+ octreePtr_ = new meshOctree(*surfacePtr_);
+ }
+
+ meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes();
+
+ generateMesh();
}
-
- fileName surfaceFile = meshDict_.lookup("surfaceFile");
- if( Pstream::parRun() )
- surfaceFile = ".."/surfaceFile;
-
- surfacePtr_ = new triSurf(db_.path()/surfaceFile);
-
- if( true )
+ catch(const std::string& message)
{
- //- save meta data with the mesh (surface mesh + its topology info)
- triSurfaceMetaData sMetaData(*surfacePtr_);
- const dictionary& surfMetaDict = sMetaData.metaData();
-
- mesh_.metaData().add("surfaceFile", surfaceFile, true);
- mesh_.metaData().add("surfaceMeta", surfMetaDict, true);
+ Info << "Here" << endl;
+ Info << message << endl;
}
-
- if( surfacePtr_->featureEdges().size() != 0 )
+ catch(...)
{
- //- create surface patches based on the feature edges
- //- and update the meshDict based on the given data
- triSurfacePatchManipulator manipulator(*surfacePtr_);
-
- const triSurf* surfaceWithPatches =
- manipulator.surfaceWithPatches(&meshDict_);
-
- //- delete the old surface and assign the new one
- deleteDemandDrivenData(surfacePtr_);
- surfacePtr_ = surfaceWithPatches;
+ WarningIn
+ (
+ "cartesianMeshGenerator::cartesianMeshGenerator(const Time&)"
+ ) << "Meshing process terminated!" << endl;
}
-
- if( meshDict_.found("anisotropicSources") )
- {
- surfaceMeshGeometryModification surfMod(*surfacePtr_, meshDict_);
-
- modSurfacePtr_ = surfMod.modifyGeometry();
-
- octreePtr_ = new meshOctree(*modSurfacePtr_);
- }
- else
- {
- octreePtr_ = new meshOctree(*surfacePtr_);
- }
-
- meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes();
-
- generateMesh();
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.C b/src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.C
index 120231e0f..67ac11a7a 100644
--- a/src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.C
+++ b/src/mesh/cfMesh/tetMesh/tetMeshGenerator/tetMeshGenerator.C
@@ -28,7 +28,6 @@ Description
#include "tetMeshGenerator.H"
#include "triSurf.H"
#include "demandDrivenData.H"
-#include "foamTime.H"
#include "meshOctreeCreator.H"
#include "tetMeshExtractorOctree.H"
#include "meshSurfaceEngine.H"
@@ -235,69 +234,55 @@ void tetMeshGenerator::renumberMesh()
void tetMeshGenerator::generateMesh()
{
- try
+ if( controller_.runCurrentStep("templateGeneration") )
{
- if( controller_.runCurrentStep("templateGeneration") )
- {
- createTetMesh();
- }
-
- if( controller_.runCurrentStep("surfaceTopology") )
- {
- surfacePreparation();
- }
-
- if( controller_.runCurrentStep("surfaceProjection") )
- {
- mapMeshToSurface();
- }
-
- if( controller_.runCurrentStep("patchAssignment") )
- {
- extractPatches();
- }
-
- if( controller_.runCurrentStep("edgeExtraction") )
- {
- mapEdgesAndCorners();
-
- optimiseMeshSurface();
- }
-
- if( controller_.runCurrentStep("boundaryLayerGeneration") )
- {
- generateBoundaryLayers();
- }
-
- if( controller_.runCurrentStep("meshOptimisation") )
- {
- optimiseFinalMesh();
-
- projectSurfaceAfterBackScaling();
- }
-
- if( controller_.runCurrentStep("boundaryLayerRefinement") )
- {
- refBoundaryLayers();
- }
-
- renumberMesh();
-
- replaceBoundaries();
-
- controller_.workflowCompleted();
+ createTetMesh();
}
- catch(const std::string& message)
+
+ if( controller_.runCurrentStep("surfaceTopology") )
{
- Info << message << endl;
+ surfacePreparation();
}
- catch(...)
+
+ if( controller_.runCurrentStep("surfaceProjection") )
{
- WarningIn
- (
- "void tetMeshGenerator::generateMesh()"
- ) << "Meshing process terminated!" << endl;
+ mapMeshToSurface();
}
+
+ if( controller_.runCurrentStep("patchAssignment") )
+ {
+ extractPatches();
+ }
+
+ if( controller_.runCurrentStep("edgeExtraction") )
+ {
+ mapEdgesAndCorners();
+
+ optimiseMeshSurface();
+ }
+
+ if( controller_.runCurrentStep("boundaryLayerGeneration") )
+ {
+ generateBoundaryLayers();
+ }
+
+ if( controller_.runCurrentStep("meshOptimisation") )
+ {
+ optimiseFinalMesh();
+
+ projectSurfaceAfterBackScaling();
+ }
+
+ if( controller_.runCurrentStep("boundaryLayerRefinement") )
+ {
+ refBoundaryLayers();
+ }
+
+ renumberMesh();
+
+ replaceBoundaries();
+
+ controller_.workflowCompleted();
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -323,55 +308,69 @@ tetMeshGenerator::tetMeshGenerator(const Time& time)
mesh_(time),
controller_(mesh_)
{
- if( true )
+ try
{
- checkMeshDict cmd(meshDict_);
+ if( true )
+ {
+ checkMeshDict cmd(meshDict_);
+ }
+
+ const fileName surfaceFile = meshDict_.lookup("surfaceFile");
+
+ surfacePtr_ = new triSurf(runTime_.path()/surfaceFile);
+
+ if( true )
+ {
+ //- save meta data with the mesh (surface mesh + its topology info)
+ triSurfaceMetaData sMetaData(*surfacePtr_);
+ const dictionary& surfMetaDict = sMetaData.metaData();
+
+ mesh_.metaData().add("surfaceFile", surfaceFile, true);
+ mesh_.metaData().add("surfaceMeta", surfMetaDict, true);
+ }
+
+ if( surfacePtr_->featureEdges().size() != 0 )
+ {
+ //- create surface patches based on the feature edges
+ //- and update the meshDict based on the given data
+ triSurfacePatchManipulator manipulator(*surfacePtr_);
+
+ const triSurf* surfaceWithPatches =
+ manipulator.surfaceWithPatches(&meshDict_);
+
+ //- delete the old surface and assign the new one
+ deleteDemandDrivenData(surfacePtr_);
+ surfacePtr_ = surfaceWithPatches;
+ }
+
+ if( meshDict_.found("anisotropicSources") )
+ {
+ surfaceMeshGeometryModification surfMod(*surfacePtr_, meshDict_);
+
+ modSurfacePtr_ = surfMod.modifyGeometry();
+
+ octreePtr_ = new meshOctree(*modSurfacePtr_);
+ }
+ else
+ {
+ octreePtr_ = new meshOctree(*surfacePtr_);
+ }
+
+ meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes();
+
+ generateMesh();
}
-
- const fileName surfaceFile = meshDict_.lookup("surfaceFile");
-
- surfacePtr_ = new triSurf(runTime_.path()/surfaceFile);
-
- if( true )
+ catch(const std::string& message)
{
- //- save meta data with the mesh (surface mesh + its topology info)
- triSurfaceMetaData sMetaData(*surfacePtr_);
- const dictionary& surfMetaDict = sMetaData.metaData();
-
- mesh_.metaData().add("surfaceFile", surfaceFile, true);
- mesh_.metaData().add("surfaceMeta", surfMetaDict, true);
+ Info << message << endl;
}
-
- if( surfacePtr_->featureEdges().size() != 0 )
+ catch(...)
{
- //- create surface patches based on the feature edges
- //- and update the meshDict based on the given data
- triSurfacePatchManipulator manipulator(*surfacePtr_);
-
- const triSurf* surfaceWithPatches =
- manipulator.surfaceWithPatches(&meshDict_);
-
- //- delete the old surface and assign the new one
- deleteDemandDrivenData(surfacePtr_);
- surfacePtr_ = surfaceWithPatches;
+ WarningIn
+ (
+ "tetMeshGenerator::tetMeshGenerator(const Time&)"
+ ) << "Meshing process terminated!" << endl;
}
-
- if( meshDict_.found("anisotropicSources") )
- {
- surfaceMeshGeometryModification surfMod(*surfacePtr_, meshDict_);
-
- modSurfacePtr_ = surfMod.modifyGeometry();
-
- octreePtr_ = new meshOctree(*modSurfacePtr_);
- }
- else
- {
- octreePtr_ = new meshOctree(*surfacePtr_);
- }
-
- meshOctreeCreator(*octreePtr_, meshDict_).createOctreeBoxes();
-
- generateMesh();
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/boxScaling.C b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/boxScaling.C
index 020e69b5b..37f33240d 100644
--- a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/boxScaling.C
+++ b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/boxScaling.C
@@ -176,7 +176,7 @@ void boxScaling::boundingPlanes(PtrList&pl) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dictionary boxScaling::dict(bool ignoreType) const
+dictionary boxScaling::dict(bool /*ignoreType*/) const
{
dictionary dict;
diff --git a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C
index 2c34d9467..b383cab7e 100644
--- a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C
+++ b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModification.C
@@ -46,7 +46,7 @@ coordinateModification::coordinateModification()
coordinateModification::coordinateModification
(
const word& name,
- const dictionary& dict
+ const dictionary& /*dict*/
)
:
name_(name)
diff --git a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H
index 0b27090fa..e1c7c60b7 100644
--- a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H
+++ b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/coordinateModifier.H
@@ -36,8 +36,6 @@ SourceFiles
#ifndef coordinateModifier_H
#define coordinateModifier_H
-#include "objectRegistry.H"
-#include "foamTime.H"
#include "word.H"
#include "point.H"
#include "coordinateModificationList.H"
diff --git a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/planeScaling.C b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/planeScaling.C
index b78237096..3cf8aea36 100644
--- a/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/planeScaling.C
+++ b/src/mesh/cfMesh/utilities/anisotropicMeshing/coordinateModification/planeScaling.C
@@ -153,7 +153,7 @@ void planeScaling::boundingPlanes(PtrList& pl) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dictionary planeScaling::dict(bool ignoreType) const
+dictionary planeScaling::dict(bool /*ignoreType*/) const
{
dictionary dict;
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayers.H b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayers.H
index 6c4af3c5b..5aa525a6c 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayers.H
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayers.H
@@ -35,8 +35,6 @@ SourceFiles
#ifndef boundaryLayers_H
#define boundaryLayers_H
-#include "objectRegistry.H"
-#include "foamTime.H"
#include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H"
#include "meshSurfacePartitioner.H"
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
index bc8e9021e..3aff65c60 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersCreateVertices.C
@@ -686,7 +686,7 @@ void boundaryLayers::createNewPartitionVerticesParallel
(
const labelLongList& procPoints,
const List& pVertices,
- const boolList& treatPatches
+ const boolList& /*treatPatches*/
)
{
if( !Pstream::parRun() )
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersWrapperLayer.C b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersWrapperLayer.C
index a9e0551e6..5e83bc48a 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersWrapperLayer.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/boundaryLayers/boundaryLayersWrapperLayer.C
@@ -33,21 +33,21 @@ Description
namespace Foam
{
-
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
void boundaryLayers::addWrapperLayer()
{
createOTopologyLayers();
-
+
if( treatedPatch_[0] ) return;
const meshSurfaceEngine& mse = surfaceEngine();
-
+
const labelList& bPoints = mse.boundaryPoints();
-
+
boolList treatPatches(mesh_.boundaries().size(), true);
-
+
labelLongList newLabelForVertex(nPoints_, -1);
pointFieldPMG& points = mesh_.points();
@@ -57,13 +57,13 @@ void boundaryLayers::addWrapperLayer()
points[nPoints_] = points[bPoints[bpI]];
newLabelForVertex[bPoints[bpI]] = nPoints_++;
}
-
+
createNewFacesAndCells(treatPatches);
-
+
forAll(treatPatches, patchI)
if( treatPatches[patchI] )
treatedPatch_[patchI] = true;
-
+
//- delete surface engine
clearOut();
}
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
index 86692a6bc..446944a60 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
@@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices()
OPstream toOtherProc
(
- Pstream::blocking,
+ Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(),
globalLabels.byteSize()
);
@@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices()
labelList receivedData;
IPstream fromOtherProc
(
- Pstream::blocking,
+ Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo()
);
@@ -498,7 +498,7 @@ void extrudeLayer::createNewVertices()
DynList edgeGroup;
edgeGroup.setSize(dEdges.size());
- edgeGroup = -1;
+ edgeGroup = label(-1);
//- check edge connections and store all edges which can be reached
//- over other edges into the same group
@@ -538,7 +538,7 @@ void extrudeLayer::createNewVertices()
//- find face groups from the groups assigned to dual edges
DynList faceGroups;
faceGroups.setSize(pointFaces.sizeOfRow(pointI));
- faceGroups = -1;
+ faceGroups = label(-1);
forAllRow(pointFaces, pointI, pfI)
{
@@ -618,7 +618,7 @@ void extrudeLayer::createNewVertices()
//- assign groups to faces and cells
DynList faceGroup;
faceGroup.setSize(pointFaces.sizeOfRow(pointI));
- faceGroup = -1;
+ faceGroup = label(-1);
label group(0);
@@ -1114,7 +1114,7 @@ void extrudeLayer::createLayerCells()
//- find labels of points
DynList origFacePoints;
origFacePoints.setSize(pointFaces.sizeOfRow(pointI));
- origFacePoints = -1;
+ origFacePoints = label(-1);
forAllRow(pointFaces, pointI, pfI)
{
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.H b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.H
index 0985f1bef..b00407525 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.H
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.H
@@ -36,8 +36,6 @@ SourceFiles
#ifndef extrudeLayer_H
#define extrudeLayer_H
-#include "objectRegistry.H"
-#include "foamTime.H"
#include "polyMeshGenModifier.H"
#include "VRWGraphList.H"
#include "labelPair.H"
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H
index dae4556c9..1ccb1a082 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayerI.H
@@ -49,10 +49,10 @@ inline label extrudeLayer::addressingCalculator::positionInFace
) const
{
const face& f = faces_[extrudedFaces_[extrudedI].first()];
-
+
return f.which(pointI);
}
-
+
inline label extrudeLayer::addressingCalculator::origPointLabel
(
const label extrudedI,
@@ -60,7 +60,7 @@ inline label extrudeLayer::addressingCalculator::origPointLabel
) const
{
const face& of = faces_[extrudedFaces_[extrudedI].second()];
-
+
if( pairOrientation_[extrudedI] )
{
return of[pos];
@@ -69,13 +69,13 @@ inline label extrudeLayer::addressingCalculator::origPointLabel
{
return of[(of.size()-pos)%of.size()];
}
-
+
FatalErrorIn
(
"label extrudeLayer::addressingCalculator::origPointLabel"
"(const label, const label) const"
) << "Cannot find point for the given position" << abort(FatalError);
-
+
return -1;
}
@@ -88,7 +88,7 @@ inline label extrudeLayer::addressingCalculator::origPoint
const face& f = faces_[extrudedFaces_[extrudedI].first()];
const face& of = faces_[extrudedFaces_[extrudedI].second()];
const label pos = f.which(pointI);
-
+
if( pairOrientation_[extrudedI] )
{
return of[pos];
@@ -97,13 +97,13 @@ inline label extrudeLayer::addressingCalculator::origPoint
{
return of[(of.size()-pos)%of.size()];
}
-
+
FatalErrorIn
(
"label extrudeLayer::addressingCalculator::origPoint"
"(const label, const label) const"
) << "Cannot find point for the given position" << abort(FatalError);
-
+
return -1;
}
@@ -114,18 +114,18 @@ inline label extrudeLayer::addressingCalculator::faceSharingEdge
) const
{
const face& f = faces_[extrudedFaces_[extrudedI].first()];
-
+
const label pointI = f[eI];
const label nextI = f.nextLabel(eI);
-
+
label otherFace(-1);
forAllRow(pointExtruded_, pointI, pfI)
{
const label currFaceI = pointExtruded_(pointI, pfI);
-
+
if( currFaceI == extrudedI )
continue;
-
+
if( pointExtruded_.contains(nextI, currFaceI) )
{
if( otherFace != -1 )
@@ -135,11 +135,11 @@ inline label extrudeLayer::addressingCalculator::faceSharingEdge
"(const label, const label) const"
) << "Expected only one such face"
<< abort(FatalError);
-
+
otherFace = currFaceI;
}
}
-
+
return otherFace;
}
@@ -151,11 +151,11 @@ inline void extrudeLayer::addressingCalculator::facesSharingEdge
) const
{
edgeFaces.clear();
-
+
forAllRow(pointExtruded_, start, pfI)
{
const label currFaceI = pointExtruded_(start, pfI);
-
+
if( pointExtruded_.contains(end, currFaceI) )
edgeFaces.append(currFaceI);
}
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.H b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.H
index 007ec8b7b..fce51dded 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.H
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayers.H
@@ -36,8 +36,6 @@ SourceFiles
#ifndef refineBoundaryLayers_H
#define refineBoundaryLayers_H
-#include "objectRegistry.H"
-#include "foamTime.H"
#include "polyMeshGenModifier.H"
#include "meshSurfaceEngine.H"
#include "DynList.H"
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C
index fffca87f1..d61369df5 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersCells.C
@@ -885,7 +885,7 @@ void refineBoundaryLayers::refineCornerHexCell::generateNewPoints()
forAll(cellPoints_[i], j)
{
cellPoints_[i][j].setSize(nLayersK_+1);
- cellPoints_[i][j] = -1;
+ cellPoints_[i][j] = label(-1);
}
}
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
index 40cf3a866..8c41d50fb 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
@@ -250,7 +250,7 @@ void refineBoundaryLayers::refineFace
forAll(facePoints, i)
{
facePoints[i].setSize(nLayersDir1+1);
- facePoints[i] = -1;
+ facePoints[i] = label(-1);
}
//- add points in the matrix
@@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces()
OPstream toOtherProc
(
- Pstream::blocking,
+ Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(),
sendData.byteSize()
);
@@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces()
IPstream fromOtherProc
(
- Pstream::blocking,
+ Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo()
);
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C
index b39b6b1ec..6eb5c0267 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFunctions.C
@@ -269,7 +269,7 @@ bool refineBoundaryLayers::analyseLayers()
{
if( allZMin[patchI] ^ allZMax[patchI] )
{
- nLayersAtPatch[patchI] = -1;
+ nLayersAtPatch[patchI] = label(-1);
layerAtPatch_[patchI].clear();
}
}
@@ -599,7 +599,7 @@ void refineBoundaryLayers::generateNewVertices()
//- on edges of the mesh
DynList numPointsAtThread;
numPointsAtThread.setSize(nThreads);
- numPointsAtThread = 0;
+ numPointsAtThread = label(0);
# ifdef USE_OMP
# pragma omp parallel for num_threads(nThreads) schedule(static, 1)
diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/triangulateNonPlanarBaseFaces/triangulateNonPlanarBaseFaces.H b/src/mesh/cfMesh/utilities/boundaryLayers/triangulateNonPlanarBaseFaces/triangulateNonPlanarBaseFaces.H
index 0829c50be..7a30f36a2 100644
--- a/src/mesh/cfMesh/utilities/boundaryLayers/triangulateNonPlanarBaseFaces/triangulateNonPlanarBaseFaces.H
+++ b/src/mesh/cfMesh/utilities/boundaryLayers/triangulateNonPlanarBaseFaces/triangulateNonPlanarBaseFaces.H
@@ -36,8 +36,6 @@ SourceFiles
#ifndef triangulateNonPlanarBaseFaces_H
#define triangulateNonPlanarBaseFaces_H
-#include "objectRegistry.H"
-#include "foamTime.H"
#include "polyMeshGenModifier.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.C b/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.C
index 8d154e10b..a03b44e37 100644
--- a/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.C
+++ b/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.C
@@ -764,6 +764,54 @@ void checkMeshDict::checkRenameBoundary() const
}
}
+//Mesh quality criteria specified by the user
+void checkMeshDict::checkQualitySettings() const
+{
+
+ if( meshDict_.found("meshQualitySettings") )
+ {
+ const dictionary& qualityDict = meshDict_.subDict("meshQualitySettings");
+
+ //- read maximum non-orthogonality defined by the user
+ if( qualityDict.found("maxNonOrthogonality") )
+ {
+ readScalar(qualityDict.lookup("maxNonOrthogonality"));
+ }
+
+ //- read maximum skewness defined by the user
+ if( qualityDict.found("maxSkewness") )
+ {
+ readScalar(qualityDict.lookup("maxSkewness"));
+ }
+
+ //- read minimum volume of the face pyramid defined by the user
+ if( qualityDict.found("minPyramidVolume") )
+ {
+ readScalar(qualityDict.lookup("minPyramidVolume"));
+ }
+
+ //- read face flatness defined by the user
+ if( qualityDict.found("faceFlatness") )
+ {
+ readScalar(qualityDict.lookup("faceFlatness"));
+ }
+
+ //- read minimum tetrahedral part of a cell defined by the user
+ if( qualityDict.found("minCellPartTetrahedra") )
+ {
+ readScalar(qualityDict.lookup("minCellPartTetrahedra"));
+ }
+
+ //- read minimum area of a face defined by the user
+ if( qualityDict.found("minimumFaceArea") )
+ {
+ readScalar(qualityDict.lookup("minimumFaceArea"));
+ }
+
+
+ }
+}
+
void checkMeshDict::checkEntries() const
{
checkBasicSettings();
@@ -785,6 +833,8 @@ void checkMeshDict::checkEntries() const
checkBoundaryLayers();
checkRenameBoundary();
+
+ checkQualitySettings();
}
void checkMeshDict::updatePatchCellSize
@@ -860,7 +910,7 @@ void checkMeshDict::updatePatchCellSize
void checkMeshDict::updateSubsetCellSize
(
- const std::map& patchesFromPatch
+ const std::map& /*patchesFromPatch*/
)
{
@@ -1028,7 +1078,7 @@ void checkMeshDict::updateRemoveCellsIntersectingPatches
void checkMeshDict::updateObjectRefinements
(
- const std::map& patchesFromPatch
+ const std::map& /*patchesFromPatch*/
)
{
diff --git a/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.H b/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.H
index a56e35ae5..0f75e512d 100644
--- a/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.H
+++ b/src/mesh/cfMesh/utilities/checkMeshDict/checkMeshDict.H
@@ -35,8 +35,6 @@ SourceFiles
#ifndef checkMeshDict_H
#define checkMeshDict_H
-#include "objectRegistry.H"
-#include "foamTime.H"
#include "IOdictionary.H"
#include
@@ -92,6 +90,9 @@ class checkMeshDict
//- check renameBoundary entry
void checkRenameBoundary() const;
+ //- check entry for mesh quality
+ void checkQualitySettings() const;
+
//- perform all checks
void checkEntries() const;
diff --git a/src/mesh/cfMesh/utilities/containers/DynList/DynList.C b/src/mesh/cfMesh/utilities/containers/DynList/DynList.C
index 8fe842580..df3fa0152 100644
--- a/src/mesh/cfMesh/utilities/containers/DynList/DynList.C
+++ b/src/mesh/cfMesh/utilities/containers/DynList/DynList.C
@@ -29,9 +29,11 @@ License
// Construct from Istream
template
-Foam::DynList::DynList(Istream& is)
+Foam::DynList::DynList(Istream&)
:
- UList(),
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
nextFree_(0)
{
FatalErrorIn
@@ -39,11 +41,6 @@ Foam::DynList::DynList(Istream& is)
"template"
"\nFoam::DynList::DynList(Istream& is)"
) << "Not implemented" << exit(FatalError);
-
- List helper(is);
-
- nextFree_ = helper.size();
- UList::swap(helper);
}
@@ -54,7 +51,7 @@ Foam::Ostream& Foam::operator<<
const Foam::DynList& DL
)
{
- UList helper(const_cast(DL.begin()), DL.nextFree_);
+ UList helper(DL.dataPtr_, DL.nextFree_);
os << helper;
return os;
@@ -75,8 +72,10 @@ Foam::Istream& Foam::operator>>
"(Foam::Istream& is, Foam::DynList& DL)"
) << "Not implemented" << exit(FatalError);
- is >> static_cast&>(DL);
- DL.nextFree_ = DL.List::size();
+ UList helper(DL.dataPtr_, DL.nextFree_);
+ //is >> static_cast&>(DL);
+ is >> helper;
+ DL.nextFree_ = helper.size();
return is;
}
diff --git a/src/mesh/cfMesh/utilities/containers/DynList/DynList.H b/src/mesh/cfMesh/utilities/containers/DynList/DynList.H
index 1b550836b..13186e6b4 100644
--- a/src/mesh/cfMesh/utilities/containers/DynList/DynList.H
+++ b/src/mesh/cfMesh/utilities/containers/DynList/DynList.H
@@ -73,10 +73,14 @@ Istream& operator>>
template
class DynList
-:
- public UList
{
// Private data
+ //- pointer to the data
+ T* dataPtr_;
+
+ //- size of the allocated data
+ label nAllocated_;
+
//- statically allocated data (used for short lists)
T staticData_[staticSize];
@@ -84,12 +88,21 @@ class DynList
label nextFree_;
// Private member functions
+ //- access to the data pointer
+ inline T* data();
+
+ //- const access to the data pointer
+ inline const T* data() const;
+
//- allocate list size
inline void allocateSize(const label);
//- check if index is inside the scope (used for debugging only)
inline void checkIndex(const label) const;
+ //- check if nAllocated_ is greater or equal to nextFree_
+ inline void checkAllocation() const;
+
public:
// Constructors
@@ -100,6 +113,11 @@ public:
//- Construct given size
explicit inline DynList(const label);
+#if WM_LABEL_SIZE == 64
+ //- Construct given size
+ explicit inline DynList(const int);
+#endif
+
//- Construct from given size and defualt value
explicit inline DynList(const label, const T&);
@@ -205,6 +223,10 @@ public:
template
inline void operator=(const ListType&);
+ //- Compare the list with the another one
+ inline bool operator==(const DynList&) const;
+ inline bool operator!=(const DynList&) const;
+
// IOstream operators
diff --git a/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H b/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H
index f73f5cea7..2ca053429 100644
--- a/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H
+++ b/src/mesh/cfMesh/utilities/containers/DynList/DynListI.H
@@ -23,48 +23,66 @@ License
\*---------------------------------------------------------------------------*/
+template
+inline T* Foam::DynList::data()
+{
+ return dataPtr_;
+}
+
+template
+inline const T* Foam::DynList::data() const
+{
+ return dataPtr_;
+}
template
inline void Foam::DynList::allocateSize(const label s)
{
- if( s > UList::size() )
+ checkAllocation();
+
+ if( s > staticSize )
{
- T* newData = new T[s];
+ if( s > nAllocated_ )
+ {
+ //- allocates enough space for the elements
+ T* newData = new T[s];
- for(label i=0;ioperator[](i);
+ for(label i=0;ioperator[](i);
- T* data = UList::begin();
- if( data && (data != staticData_) )
- delete [] data;
+ if( nAllocated_ > staticSize )
+ delete [] dataPtr_;
- //UList::reset(newData, s);
- this->UList::operator=(UList(newData, s));
+ dataPtr_ = newData;
+ nAllocated_ = s;
+ }
+ else if( s < nAllocated_ )
+ {
+ //- shrinks the list
+ T* newData = new T[s];
+
+ for(label i=0;ioperator[](i);
+
+ delete [] dataPtr_;
+
+ dataPtr_ = newData;
+ nAllocated_ = s;
+ }
}
- else if( (s > staticSize) && (s < UList::size()) )
+ else
{
- T* newData = new T[s];
+ if( nAllocated_ > staticSize )
+ {
+ //- delete dynamically allocated data
+ for(label i=0;ioperator[](i);
+ delete [] dataPtr_;
+ }
- T* data = UList::begin();
- delete [] data;
-
- //UList::reset(newData, s);
- this->UList::operator=(UList(newData, s));
- }
- else if( (s <= staticSize) && (UList::size() > staticSize) )
- {
- for(label i=0;i::operator[](i);
-
- T* data = UList::begin();
- if( data && (data != staticData_) )
- delete [] data;
-
- //UList::reset(staticData_, staticSize);
- this->UList::operator=(UList(staticData_, staticSize));
+ dataPtr_ = staticData_;
+ nAllocated_ = staticSize;
}
}
@@ -82,60 +100,124 @@ inline void Foam::DynList::checkIndex(const label i) const
}
}
+template
+inline void Foam::DynList::checkAllocation() const
+{
+ if( nextFree_ > nAllocated_ )
+ FatalErrorIn
+ (
+ "template "
+ "inline void Foam::DynList::"
+ "checkAllocation() const"
+ ) << "nextFree_ is out of scope 0 " << " and " << nAllocated_
+ << abort(FatalError);
+}
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
//- Construct null
template
inline Foam::DynList::DynList()
:
- UList(staticData_, staticSize),
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
nextFree_(0)
-{}
+{
+ setSize(0);
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+}
template
inline Foam::DynList::DynList(const label s)
:
- UList(staticData_, staticSize),
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
nextFree_(0)
{
setSize(s);
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
+
+#if WM_LABEL_SIZE == 64
+template
+inline Foam::DynList::DynList(const int s)
+:
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
+ nextFree_(0)
+{
+ setSize(s);
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+}
+#endif
+
+
template
inline Foam::DynList::DynList(const label s, const T& val)
:
- UList(staticData_, staticSize),
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
nextFree_(0)
{
setSize(s);
for(label i=0;ioperator[](i) = val;
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
template
inline Foam::DynList::DynList(const UList& ul)
:
- UList(staticData_, staticSize),
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
nextFree_(0)
{
setSize(ul.size());
forAll(ul, i)
this->operator[](i) = ul[i];
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
template
template
inline Foam::DynList::DynList(const ListType& l)
:
- UList(staticData_, staticSize),
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
nextFree_(0)
{
setSize(l.size());
for(label i=0;ioperator[](i) = l[i];
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
//- Copy construct
@@ -145,19 +227,24 @@ inline Foam::DynList::DynList
const DynList& dl
)
:
- UList(staticData_, staticSize),
+ dataPtr_(nullptr),
+ nAllocated_(0),
+ staticData_(),
nextFree_(0)
{
setSize(dl.size());
for(label i=0;ioperator[](i) = dl[i];
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
template
inline Foam::DynList::~DynList()
{
allocateSize(0);
- //UList::reset(nullptr, 0);
}
@@ -166,12 +253,20 @@ inline Foam::DynList::~DynList()
template
inline Foam::label Foam::DynList::size() const
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
return nextFree_;
}
template
inline Foam::label Foam::DynList::byteSize() const
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
if( !contiguous() )
{
FatalErrorIn("DynList::byteSize()")
@@ -181,20 +276,31 @@ inline Foam::label Foam::DynList::byteSize() const
}
return nextFree_*sizeof(T);
-
}
template
inline void Foam::DynList::setSize(const label s)
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
allocateSize(s);
nextFree_ = s;
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
template
inline void Foam::DynList::clear()
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
nextFree_ = 0;
}
@@ -202,34 +308,62 @@ inline void Foam::DynList::clear()
template
void Foam::DynList::shrink()
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
allocateSize(nextFree_);
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
template
inline void Foam::DynList::append(const T& e)
{
- if( nextFree_ >= UList::size() )
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
+ if( nextFree_ >= nAllocated_ )
{
- const label newSize = 2*UList::size()+2;
+ const label newSize = 2*nAllocated_+2;
allocateSize(newSize);
}
- UList::operator[](nextFree_++) = e;
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
+ this->operator[](nextFree_++) = e;
}
template
inline void Foam::DynList::appendIfNotIn(const T& e)
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
if( !contains(e) )
append(e);
+
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
}
template
inline bool Foam::DynList::contains(const T& e) const
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
for(label i=0;i::operator[](i) == e )
+ if( this->operator[](i) == e )
return true;
}
@@ -242,9 +376,13 @@ inline Foam::label Foam::DynList::containsAtPosition
const T& e
) const
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
for(label i=0;i::operator[](i) == e )
+ if( this->operator[](i) == e )
return i;
}
@@ -254,12 +392,20 @@ inline Foam::label Foam::DynList::containsAtPosition
template
inline const T& Foam::DynList::lastElement() const
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
return this->operator[](nextFree_-1);
}
template
inline T Foam::DynList::removeLastElement()
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
if( nextFree_ == 0 )
{
FatalErrorIn
@@ -268,13 +414,18 @@ inline T Foam::DynList::removeLastElement()
) << "List is empty" << abort(FatalError);
}
- T el = UList::operator[](--nextFree_);
+ T el = this->operator[](nextFree_-1);
+ --nextFree_;
return el;
}
template
inline T Foam::DynList::removeElement(const label i)
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
if( nextFree_ == 0 )
{
FatalErrorIn
@@ -287,12 +438,20 @@ inline T Foam::DynList::removeElement(const label i)
this->operator[](i) = this->operator[](nextFree_-1);
--nextFree_;
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
return el;
}
template
inline T& Foam::DynList::newElmt(const label i)
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
return this->operator()(i);
}
@@ -301,13 +460,21 @@ inline T& Foam::DynList::newElmt(const label i)
template
inline T& Foam::DynList::operator()(const label i)
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
nextFree_ = Foam::max(nextFree_, i + 1);
- if( nextFree_ >= UList::size() )
+ if( nextFree_ >= nAllocated_ )
{
allocateSize(2 * nextFree_+1);
}
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
return this->operator[](i);
}
@@ -315,20 +482,22 @@ template
inline const T& Foam::DynList::operator[](const label i) const
{
# ifdef FULLDEBUG
+ checkAllocation();
checkIndex(i);
# endif
- return UList::operator[](i);
+ return dataPtr_[i];
}
template
inline T& Foam::DynList::operator[](const label i)
{
# ifdef FULLDEBUG
+ checkAllocation();
checkIndex(i);
# endif
- return UList::operator[](i);
+ return dataPtr_[i];
}
template
@@ -374,7 +543,12 @@ inline const T& Foam::DynList::rcElement
template
inline void Foam::DynList::operator=(const T& t)
{
- UList::operator=(t);
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
+ for(label i=0;i
@@ -383,9 +557,17 @@ inline void Foam::DynList::operator=
const DynList& dl
)
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
allocateSize(dl.size());
nextFree_ = dl.size();
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
for(label i=0;ioperator[](i) = dl[i];
}
@@ -394,12 +576,45 @@ template
template
inline void Foam::DynList::operator=(const ListType& l)
{
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
allocateSize(l.size());
nextFree_ = l.size();
+ # ifdef DEBUG
+ checkAllocation();
+ # endif
+
for(label i=0;ioperator[](i) = l[i];
}
+template
+inline bool Foam::DynList::operator==
+(
+ const DynList& DL
+) const
+{
+ if( nextFree_ != DL.nextFree_ )
+ return false;
+
+ forAll(DL, i)
+ if( this->operator[](i) != DL[i] )
+ return false;
+
+ return true;
+}
+
+template
+inline bool Foam::DynList::operator!=
+(
+ const DynList& DL
+) const
+{
+ return !operator==(DL);
+}
+
// ************************************************************************* //
diff --git a/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.C b/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.C
index 190d1f4c4..a8d351fde 100644
--- a/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.C
+++ b/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraph.C
@@ -34,15 +34,34 @@ Foam::Ostream& Foam::operator<<
const Foam::FRWGraph& DL
)
{
- os << DL.size() << "(" << endl;
- for(register label i=0;iFoam::Ostream& Foam::operator<<"
+ "(Foam::Ostream& os, const Foam::FRWGraph&)"
+ );
+
return os;
}
diff --git a/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraphI.H b/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraphI.H
index 6b08e63ec..497735c5b 100644
--- a/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraphI.H
+++ b/src/mesh/cfMesh/utilities/containers/FRWGraph/FRWGraphI.H
@@ -105,7 +105,7 @@ inline Foam::label Foam::FRWGraph::size() const
}
template
-inline Foam::label Foam::FRWGraph::sizeOfRow(const label rowI) const
+inline Foam::label Foam::FRWGraph::sizeOfRow(const label) const
{
return width;
}
@@ -155,7 +155,8 @@ inline bool Foam::FRWGraph::contains
) const
{
const label start = rowI * width;
- for(register label i=0;i::containsAtPosition
) const
{
const label start = rowI * width;
- for(register label i=0;i::IODynList(const IOobject& io)
(
io.readOpt() == IOobject::MUST_READ
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
- || (io.readOpt() == IOobject::READ_IF_PRESENT_IF_MODIFIED && headerOk())
)
{
readStream(typeName) >> *this;
@@ -77,16 +76,12 @@ IODynList::IODynList
regIOobject(io),
DynList()
{
- if
- (
- (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
- || (io.readOpt() == IOobject::READ_IF_PRESENT_IF_MODIFIED && headerOk())
- )
+ if (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
{
readStream(typeName) >> *this;
close();
}
-
+
DynList::operator=(list);
}
diff --git a/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.C b/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.C
index 0974945b3..8297c8e24 100644
--- a/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.C
+++ b/src/mesh/cfMesh/utilities/containers/IOLongList/IOLongList.C
@@ -46,7 +46,6 @@ IOLongList::IOLongList(const IOobject& io)
(
io.readOpt() == IOobject::MUST_READ
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
- || (io.readOpt() == IOobject::READ_IF_PRESENT_IF_MODIFIED && headerOk())
)
{
readStream(typeName) >> *this;
@@ -77,16 +76,12 @@ IOLongList::IOLongList
regIOobject(io),
LongList()
{
- if
- (
- (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
- || (io.readOpt() == IOobject::READ_IF_PRESENT_IF_MODIFIED && headerOk())
- )
+ if (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
{
readStream(typeName) >> *this;
close();
}
-
+
LongList::operator=(list);
}
diff --git a/src/mesh/cfMesh/utilities/containers/Lists/cellListPMG.H b/src/mesh/cfMesh/utilities/containers/Lists/cellListPMG.H
index 014d29f6a..6b794d051 100644
--- a/src/mesh/cfMesh/utilities/containers/Lists/cellListPMG.H
+++ b/src/mesh/cfMesh/utilities/containers/Lists/cellListPMG.H
@@ -29,7 +29,7 @@ Description
every time it is resized
SourceFiles
-
+
\*---------------------------------------------------------------------------*/
@@ -53,24 +53,24 @@ class cellListPMG
// Private data
//- number of used elements
label nElmts_;
-
+
// Disallow bitwise assignment
void operator=(const cellListPMG&);
-
+
cellListPMG(const cellListPMG&);
-
+
// Disallow transfer from cellList
void transfer(cellList&);
-
+
public:
-
+
// Constructors
//- null construct
inline cellListPMG();
// Destructor
inline ~cellListPMG();
-
+
// Member functions
//- return the number of used elements
inline label size() const;
@@ -83,15 +83,15 @@ public:
//- add a cell at the end of the list
inline void append(const cell&);
-
+
//- return an element with bound checking
inline cell& newElmt(const label);
// Member operators
inline void operator=(const cellList&);
-
+
friend inline Ostream& operator<<(Ostream&, const cellListPMG&);
-
+
friend inline Istream& operator>>(Istream&, cellListPMG&);
};
diff --git a/src/mesh/cfMesh/utilities/containers/Lists/cellListPMGI.H b/src/mesh/cfMesh/utilities/containers/Lists/cellListPMGI.H
index 81a84933b..a85205a09 100644
--- a/src/mesh/cfMesh/utilities/containers/Lists/cellListPMGI.H
+++ b/src/mesh/cfMesh/utilities/containers/Lists/cellListPMGI.H
@@ -52,7 +52,7 @@ inline cellListPMG::~cellListPMG()
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
+
inline label cellListPMG::size() const
{
return nElmts_;
@@ -68,7 +68,7 @@ inline void cellListPMG::setSize(const label nElmts)
cellList copy(label(1.5*nElmts));
for(label i=0;ioperator[](i));
-
+
cellList::transfer(copy);
}
else
@@ -106,11 +106,11 @@ inline void cellListPMG::operator=(const cellList& cls)
forAll(cls, cI)
this->operator[](cI) = cls[cI];
}
-
+
inline Ostream& operator<<(Ostream& os, const cellListPMG& cls)
{
SubList c(cls, cls.nElmts_, 0);
-
+
os << c;
return os;
}
@@ -120,7 +120,7 @@ inline Istream& operator>>(Istream& is, cellListPMG& cls)
cellList& cells = static_cast(cls);
is >> cells;
cls.nElmts_ = cells.size();
-
+
return is;
}
diff --git a/src/mesh/cfMesh/utilities/containers/Lists/faceListPMGI.H b/src/mesh/cfMesh/utilities/containers/Lists/faceListPMGI.H
index 8c29b7c93..a1e6bb245 100644
--- a/src/mesh/cfMesh/utilities/containers/Lists/faceListPMGI.H
+++ b/src/mesh/cfMesh/utilities/containers/Lists/faceListPMGI.H
@@ -69,7 +69,7 @@ inline faceListPMG::~faceListPMG()
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
+
inline label faceListPMG::size() const
{
return nElmts_;
@@ -85,7 +85,7 @@ inline void faceListPMG::setSize(const label nElmts)
faceList copy(label(1.5*nElmts));
for(label i=0;ioperator[](i));
-
+
faceList::transfer(copy);
}
else
@@ -128,11 +128,11 @@ inline void faceListPMG::operator=(const faceList& fcs)
forAll(fcs, fI)
this->operator[](fI) = fcs[fI];
}
-
+
inline Ostream& operator<<(Ostream& os, const faceListPMG& fcs)
{
SubList |