zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-chtMultiReagion

Browse Source
This commit is contained in:
sergio
2010-01-28 12:30:53 +00:00
parent 0b96ae5409 e931525a0f
commit c4c8f59f83
4 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
View File

@ -47,6 +47,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
Info<< " <<Writing " << nNonAligned Info<< " <<Writing " << nNonAligned
<< " points on non-aligned edges to set " << " points on non-aligned edges to set "
<< nonAlignedPoints.name() << endl; << nonAlignedPoints.name() << endl;
nonAlignedPoints.instance() = mesh.pointsInstance();
nonAlignedPoints.write(); nonAlignedPoints.write();
} }
} }
@ -67,6 +68,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
{ {
Info<< " <<Writing " << nNonClosed Info<< " <<Writing " << nNonClosed
<< " non closed cells to set " << cells.name() << endl; << " non closed cells to set " << cells.name() << endl;
cells.instance() = mesh.pointsInstance();
cells.write(); cells.write();
} }
} }
@ -78,6 +80,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
Info<< " <<Writing " << nHighAspect Info<< " <<Writing " << nHighAspect
<< " cells with high aspect ratio to set " << " cells with high aspect ratio to set "
<< aspectCells.name() << endl; << aspectCells.name() << endl;
aspectCells.instance() = mesh.pointsInstance();
aspectCells.write(); aspectCells.write();
} }
} }
@ -94,6 +97,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
{ {
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " zero area faces to set " << faces.name() << endl; << " zero area faces to set " << faces.name() << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -111,6 +115,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
{ {
Info<< " <<Writing " << nCells Info<< " <<Writing " << nCells
<< " zero volume cells to set " << cells.name() << endl; << " zero volume cells to set " << cells.name() << endl;
cells.instance() = mesh.pointsInstance();
cells.write(); cells.write();
} }
} }
@ -129,6 +134,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
{ {
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " non-orthogonal faces to set " << faces.name() << endl; << " non-orthogonal faces to set " << faces.name() << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -147,6 +153,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " faces with incorrect orientation to set " << " faces with incorrect orientation to set "
<< faces.name() << endl; << faces.name() << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -164,6 +171,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
{ {
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " skew faces to set " << faces.name() << endl; << " skew faces to set " << faces.name() << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -184,6 +192,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
Info<< " <<Writing " << nPoints Info<< " <<Writing " << nPoints
<< " points on short edges to set " << points.name() << " points on short edges to set " << points.name()
<< endl; << endl;
points.instance() = mesh.pointsInstance();
points.write(); points.write();
} }
} }
@ -202,6 +211,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
Info<< " <<Writing " << nPoints Info<< " <<Writing " << nPoints
<< " near (closer than " << Foam::sqrt(minDistSqr) << " near (closer than " << Foam::sqrt(minDistSqr)
<< " apart) points to set " << nearPoints.name() << endl; << " apart) points to set " << nearPoints.name() << endl;
nearPoints.instance() = mesh.pointsInstance();
nearPoints.write(); nearPoints.write();
} }
} }
@ -221,6 +231,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " faces with concave angles to set " << faces.name() << " faces with concave angles to set " << faces.name()
<< endl; << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -239,6 +250,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
{ {
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " warped faces to set " << faces.name() << endl; << " warped faces to set " << faces.name() << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -255,6 +267,7 @@ Foam::label Foam::checkGeometry(const polyMesh& mesh, const bool allGeometry)
Info<< " <<Writing " << nCells Info<< " <<Writing " << nCells
<< " under-determined cells to set " << cells.name() << endl; << " under-determined cells to set " << cells.name() << endl;
cells.instance() = mesh.pointsInstance();
cells.write(); cells.write();
} }
} }

8
applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
View File

@ -89,6 +89,7 @@ Foam::label Foam::checkTopology
Info<< " <<Writing " << nPoints Info<< " <<Writing " << nPoints
<< " unused points to set " << points.name() << endl; << " unused points to set " << points.name() << endl;
points.instance() = mesh.pointsInstance();
points.write(); points.write();
} }
} }
@ -106,6 +107,7 @@ Foam::label Foam::checkTopology
{ {
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " unordered faces to set " << faces.name() << endl; << " unordered faces to set " << faces.name() << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -122,6 +124,7 @@ Foam::label Foam::checkTopology
Info<< " <<Writing " << nCells Info<< " <<Writing " << nCells
<< " cells with over used edges to set " << cells.name() << " cells with over used edges to set " << cells.name()
<< endl; << endl;
cells.instance() = mesh.pointsInstance();
cells.write(); cells.write();
} }
} }
@ -137,6 +140,7 @@ Foam::label Foam::checkTopology
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " faces with out-of-range or duplicate vertices to set " << " faces with out-of-range or duplicate vertices to set "
<< faces.name() << endl; << faces.name() << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -153,6 +157,7 @@ Foam::label Foam::checkTopology
Info<< " <<Writing " << nFaces Info<< " <<Writing " << nFaces
<< " faces with incorrect edges to set " << faces.name() << " faces with incorrect edges to set " << faces.name()
<< endl; << endl;
faces.instance() = mesh.pointsInstance();
faces.write(); faces.write();
} }
} }
@ -203,6 +208,7 @@ Foam::label Foam::checkTopology
<< " cells with with single non-boundary face to set " << " cells with with single non-boundary face to set "
<< oneCells.name() << oneCells.name()
<< endl; << endl;
oneCells.instance() = mesh.pointsInstance();
oneCells.write(); oneCells.write();
} }
@ -214,6 +220,7 @@ Foam::label Foam::checkTopology
<< " cells with with single non-boundary face to set " << " cells with with single non-boundary face to set "
<< twoCells.name() << twoCells.name()
<< endl; << endl;
twoCells.instance() = mesh.pointsInstance();
twoCells.write(); twoCells.write();
} }
} }
@ -354,6 +361,7 @@ Foam::label Foam::checkTopology
<< " conflicting points to set " << " conflicting points to set "
<< points.name() << endl; << points.name() << endl;
points.instance() = mesh.pointsInstance();
points.write(); points.write();
} }

13
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
View File

@ -408,6 +408,19 @@ void Foam::vtkPV3Foam::updateInfoSets
meshDir_/"sets" meshDir_/"sets"
); );
if (debug)
{
Info<< " Foam::vtkPV3Foam::updateInfoSets read "
<< objects.names() << " from "
<< dbPtr_().findInstance
(
meshDir_,
"faces",
IOobject::READ_IF_PRESENT
)
<< endl;
}
arrayRangeCellSets_.reset(arraySelection->GetNumberOfArrays()); arrayRangeCellSets_.reset(arraySelection->GetNumberOfArrays());
arrayRangeCellSets_ += addToSelection<cellSet> arrayRangeCellSets_ += addToSelection<cellSet>

8
src/meshTools/sets/topoSets/topoSet.C
View File

@ -141,7 +141,7 @@ Foam::fileName topoSet::topoSet::localPath
const word& name const word& name
) )
{ {
return mesh.pointsInstance()/polyMesh::meshSubDir/"sets"/name; return mesh.facesInstance()/polyMesh::meshSubDir/"sets"/name;
} }
@ -362,7 +362,7 @@ topoSet::topoSet
IOobject IOobject
( (
name, name,
mesh.pointsInstance(), mesh.facesInstance(),
polyMesh::meshSubDir/"sets", polyMesh::meshSubDir/"sets",
mesh, mesh,
r, r,
@ -402,7 +402,7 @@ topoSet::topoSet
IOobject IOobject
( (
name, name,
mesh.pointsInstance(), mesh.facesInstance(),
polyMesh::meshSubDir/"sets", polyMesh::meshSubDir/"sets",
mesh, mesh,
NO_READ, NO_READ,
@ -426,7 +426,7 @@ topoSet::topoSet
IOobject IOobject
( (
name, name,
mesh.pointsInstance(), mesh.facesInstance(),
polyMesh::meshSubDir/"sets", polyMesh::meshSubDir/"sets",
mesh, mesh,
NO_READ, NO_READ,