GIT: Initial state after latest Foundation merge

This commit is contained in:
Andrew Heather
2016-09-20 14:49:08 +01:00
4571 changed files with 115696 additions and 74609 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,9 +72,9 @@ void writePoints(const polyMesh& mesh, const fileName& timeName)
OFstream pointStream(pointFile);
forAll(mesh.points(), pointI)
forAll(mesh.points(), pointi)
{
writeOBJ(mesh.points()[pointI], pointStream);
writeOBJ(mesh.points()[pointi], pointStream);
vertI++;
}
@ -109,9 +109,9 @@ void writePoints
forAll(cellLabels, i)
{
label cellI = cellLabels[i];
label celli = cellLabels[i];
const labelList& cEdges = mesh.cellEdges()[cellI];
const labelList& cEdges = mesh.cellEdges()[celli];
forAll(cEdges, cEdgeI)
{
@ -158,21 +158,21 @@ void writePoints
void writePoints
(
const polyMesh& mesh,
const label cellI,
const label celli,
const fileName& timeName
)
{
fileName fName
(
mesh.time().path()
/ "meshPoints_" + timeName + '_' + name(cellI) + ".obj"
/ "meshPoints_" + timeName + '_' + name(celli) + ".obj"
);
Info<< "Writing mesh points and edges to " << fName << endl;
OFstream pointStream(fName);
const cell& cFaces = mesh.cells()[cellI];
const cell& cFaces = mesh.cells()[celli];
meshTools::writeOBJ(pointStream, mesh.faces(), mesh.points(), cFaces);
}
@ -192,9 +192,9 @@ void writeFaceCentres(const polyMesh& mesh,const fileName& timeName)
OFstream faceStream(faceFile);
forAll(mesh.faceCentres(), faceI)
forAll(mesh.faceCentres(), facei)
{
writeOBJ(mesh.faceCentres()[faceI], faceStream);
writeOBJ(mesh.faceCentres()[facei], faceStream);
}
}
@ -210,9 +210,9 @@ void writeCellCentres(const polyMesh& mesh, const fileName& timeName)
OFstream cellStream(cellFile);
forAll(mesh.cellCentres(), cellI)
forAll(mesh.cellCentres(), celli)
{
writeOBJ(mesh.cellCentres()[cellI], cellStream);
writeOBJ(mesh.cellCentres()[celli], cellStream);
}
}
@ -225,9 +225,9 @@ void writePatchCentres
{
const polyBoundaryMesh& patches = mesh.boundaryMesh();
forAll(patches, patchI)
forAll(patches, patchi)
{
const polyPatch& pp = patches[patchI];
const polyPatch& pp = patches[patchi];
fileName faceFile
(
@ -238,9 +238,9 @@ void writePatchCentres
OFstream patchFaceStream(faceFile);
forAll(pp.faceCentres(), faceI)
forAll(pp.faceCentres(), facei)
{
writeOBJ(pp.faceCentres()[faceI], patchFaceStream);
writeOBJ(pp.faceCentres()[facei], patchFaceStream);
}
}
}
@ -254,9 +254,9 @@ void writePatchFaces
{
const polyBoundaryMesh& patches = mesh.boundaryMesh();
forAll(patches, patchI)
forAll(patches, patchi)
{
const polyPatch& pp = patches[patchI];
const polyPatch& pp = patches[patchi];
fileName faceFile
(
@ -268,14 +268,14 @@ void writePatchFaces
OFstream patchFaceStream(faceFile);
forAll(pp.localPoints(), pointI)
forAll(pp.localPoints(), pointi)
{
writeOBJ(pp.localPoints()[pointI], patchFaceStream);
writeOBJ(pp.localPoints()[pointi], patchFaceStream);
}
forAll(pp.localFaces(), faceI)
forAll(pp.localFaces(), facei)
{
const face& f = pp.localFaces()[faceI];
const face& f = pp.localFaces()[facei];
patchFaceStream<< 'f';
@ -297,9 +297,9 @@ void writePatchBoundaryEdges
{
const polyBoundaryMesh& patches = mesh.boundaryMesh();
forAll(patches, patchI)
forAll(patches, patchi)
{
const polyPatch& pp = patches[patchI];
const polyPatch& pp = patches[patchi];
fileName edgeFile
(
@ -311,9 +311,9 @@ void writePatchBoundaryEdges
OFstream patchEdgeStream(edgeFile);
forAll(pp.localPoints(), pointI)
forAll(pp.localPoints(), pointi)
{
writeOBJ(pp.localPoints()[pointI], patchEdgeStream);
writeOBJ(pp.localPoints()[pointi], patchEdgeStream);
}
for (label edgeI = pp.nInternalEdges(); edgeI < pp.nEdges(); edgeI++)
@ -332,11 +332,11 @@ void writePatchBoundaryEdges
void writePointCells
(
const polyMesh& mesh,
const label pointI,
const label pointi,
const fileName& timeName
)
{
const labelList& pCells = mesh.pointCells()[pointI];
const labelList& pCells = mesh.pointCells()[pointi];
labelHashSet allEdges(6*pCells.size());
@ -354,7 +354,7 @@ void writePointCells
fileName pFile
(
mesh.time().path()
/ "pointEdges_" + timeName + '_' + name(pointI) + ".obj"
/ "pointEdges_" + timeName + '_' + name(pointi) + ".obj"
);
Info<< "Writing pointEdges to " << pFile << endl;
@ -467,19 +467,19 @@ int main(int argc, char *argv[])
}
if (doCell)
{
label cellI = args.optionRead<label>("cell");
label celli = args.optionRead<label>("cell");
writePoints(mesh, cellI, runTime.timeName());
writePoints(mesh, celli, runTime.timeName());
}
if (doPoint)
{
label pointI = args.optionRead<label>("point");
label pointi = args.optionRead<label>("point");
writePointCells(mesh, pointI, runTime.timeName());
writePointCells(mesh, pointi, runTime.timeName());
}
if (doFace)
{
label faceI = args.optionRead<label>("face");
label facei = args.optionRead<label>("face");
fileName fName
(
@ -487,7 +487,7 @@ int main(int argc, char *argv[])
/ "meshPoints_"
+ runTime.timeName()
+ '_'
+ name(faceI)
+ name(facei)
+ ".obj"
);
@ -495,7 +495,7 @@ int main(int argc, char *argv[])
OFstream str(fName);
const face& f = mesh.faces()[faceI];
const face& f = mesh.faces()[facei];
meshTools::writeOBJ(str, faceList(1, f), mesh.points());
}