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' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source 
Conflicts:
	applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
This commit is contained in:
mattijs
2009-12-01 16:47:45 +00:00
parent 2c240854b8 7889df78a9
commit 47eb0c5cd2
614 changed files with 56132 additions and 2923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -1015,7 +1015,7 @@ int main(int argc, char *argv[])
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

@ -596,7 +596,7 @@ int main(int argc, char *argv[])
mesh.write();
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
View File

@ -510,7 +510,7 @@ int main(int argc, char *argv[])
Info<< "Mesh unchanged." << endl;
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

215
applications/utilities/mesh/advanced/modifyMesh/Tuple.H
View File

@ -1,215 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::Tuple
Description
A 2 Tuple. Differs from Tuple in that the two elements can be different
type.
\*---------------------------------------------------------------------------*/
#ifndef Tuple_H
#define Tuple_H
#include "Istream.H"
#include "Ostream.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// Forward declaration of friend functions and operators
template<class Type1, class Type2>
class Tuple;
template<class Type1, class Type2>
Istream& operator>>(Istream&, Tuple<Type1, Type2>&);
template<class Type1, class Type2>
Ostream& operator<<(Ostream&, const Tuple<Type1, Type2>&);
/*---------------------------------------------------------------------------*\
Class Tuple Declaration
\*---------------------------------------------------------------------------*/
template<class Type1, class Type2>
class Tuple
{
// Private data
Type1 first_;
Type2 second_;
public:
// Constructors
//- Null constructor for lists
inline Tuple()
{}
//- Construct from components
inline Tuple(const Type1& first, const Type2& second)
:
first_(first),
second_(second)
{}
//- Construct from Istream
inline Tuple(Istream& is)
{
// Read beginning of pair
is.readBegin("pair");
is >> first_ >> second_;
// Read end of pair
is.readEnd("pair");
// Check state of Istream
is.check("Tuple::Tuple(Istream&)");
}
// Member Functions
//- Return first
inline Type1 first() const
{
return first_;
}
//- Return first
inline Type1& first()
{
return first_;
}
//- Return second
inline Type2 second() const
{
return second_;
}
//- Return second
inline Type2& second()
{
return second_;
}
//- Return reverse pair
inline Tuple<Type1, Type2> reverseTuple() const
{
return Tuple<Type1, Type2>(second_, first_);
}
// Friend Operators
inline friend bool operator==
(
const Tuple<Type1, Type2>& a,
const Tuple<Type1, Type2>& b
)
{
return
(
(a.first_ == b.first_) && (a.second_ == b.second_)
);
}
inline friend bool operator!=
(
const Tuple<Type1, Type2>& a,
const Tuple<Type1, Type2>& b
)
{
return (!(a == b));
}
// IOstream Operators
friend Istream& operator>> <Type1, Type2>
(
Istream& is,
Tuple<Type1, Type2>& p
);
friend Ostream& operator<< <Type1, Type2>
(
Ostream& os,
const Tuple<Type1, Type2>& p
);
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type1, class Type2>
Istream& operator>>(Istream& is, Tuple<Type1, Type2>& p)
{
// Read beginning of Tuple<Type, Type>
is.readBegin("Tuple<Type, Type>");
is >> p.first_ >> p.second_;
// Read end of Tuple<Type, Type>
is.readEnd("Tuple<Type, Type>");
// Check state of Ostream
is.check("Istream& operator>>(Istream&, Tuple<Type, Type>&)");
return is;
}
template<class Type1, class Type2>
Ostream& operator<<(Ostream& os, const Tuple<Type1, Type2>& p)
{
os << token::BEGIN_LIST
<< p.first_ << token::SPACE
<< p.second_
<< token::END_LIST;
// Check state of Ostream
os.check("Ostream& operator<<(Ostream&, const Tuple<Type, Type>&)");
return os;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

13
applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
View File

@ -375,8 +375,8 @@ int main(int argc, char *argv[])
bool cellsToSplit = cellsToPyramidise.size();
//List<Tuple<pointField,point> >
// cellsToCreate(dict.lookup("cellsToCreate"));
// List<Tuple2<pointField,point> >
// cellsToCreate(dict.lookup("cellsToCreate"));
Info<< "Read from " << dict.name() << nl
<< " Boundary cutting module:" << nl
@ -560,7 +560,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info << "Writing modified mesh to time " << runTime.timeName() << endl;
Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
mesh.write();
}
else if (edgeToPos.size())
@ -613,7 +613,7 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info << "Writing modified mesh to time " << runTime.timeName() << endl;
Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
mesh.write();
}
else
@ -656,13 +656,12 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info << "Writing modified mesh to time " << runTime.timeName() << endl;
Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
mesh.write();
}
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

4
applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
View File

@ -234,11 +234,11 @@ int main(int argc, char *argv[])
}
// Write resulting mesh
Info << "Writing refined morphMesh to time " << runTime.timeName() << endl;
Info<< "Writing refined morphMesh to time " << runTime.timeName() << endl;
mesh.write();
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

23
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
View File

@ -126,41 +126,41 @@ int main(int argc, char *argv[])
// Create bin0. Have upperlimit as factor times lowerlimit.
bins.append(DynamicList<label>());
lowerLimits.append(sortedVols[0]);
upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
upperLimits.append(1.1 * lowerLimits.last());
forAll(sortedVols, i)
{
if (sortedVols[i] > upperLimits[upperLimits.size()-1])
if (sortedVols[i] > upperLimits.last())
{
// New value outside of current bin
// Shrink old bin.
DynamicList<label>& bin = bins[bins.size()-1];
DynamicList<label>& bin = bins.last();
bin.shrink();
Info<< "Collected " << bin.size() << " elements in bin "
<< lowerLimits[lowerLimits.size()-1] << " .. "
<< upperLimits[upperLimits.size()-1] << endl;
<< lowerLimits.last() << " .. "
<< upperLimits.last() << endl;
// Create new bin.
bins.append(DynamicList<label>());
lowerLimits.append(sortedVols[i]);
upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
upperLimits.append(1.1 * lowerLimits.last());
Info<< "Creating new bin " << lowerLimits[lowerLimits.size()-1]
<< " .. " << upperLimits[upperLimits.size()-1]
Info<< "Creating new bin " << lowerLimits.last()
<< " .. " << upperLimits.last()
<< endl;
}
// Append to current bin.
DynamicList<label>& bin = bins[bins.size()-1];
DynamicList<label>& bin = bins.last();
bin.append(sortedVols.indices()[i]);
}
Info<< endl;
bins[bins.size()-1].shrink();
bins.last().shrink();
bins.shrink();
lowerLimits.shrink();
upperLimits.shrink();
@ -355,8 +355,7 @@ int main(int argc, char *argv[])
<< nl << endl;
}
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

4
applications/utilities/mesh/advanced/selectCells/selectCells.C
View File

@ -469,7 +469,7 @@ int main(int argc, char *argv[])
MESH, // meshType
NONMESH, // fill type
mesh.nCells()
);
);
Info<< "Removing points connecting cells unconnected by faces ..."
@ -510,7 +510,7 @@ int main(int argc, char *argv[])
writeSet(selectedCells, "cells selected for meshing");
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/utilities/mesh/advanced/splitCells/splitCells.C
View File

@ -701,7 +701,7 @@ int main(int argc, char *argv[])
mesh.write();
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

14
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
View File

@ -264,10 +264,10 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&ansysStream);
while(lexer.yylex() != 0)
while (lexer.yylex() != 0)
{}
Info << "Creating points" << endl;
Info<< "Creating points" << endl;
pointField points(slPoints.size());
@ -297,7 +297,7 @@ int main(int argc, char *argv[])
pointMap[pointMapIter()] = i++;
}
Info << "Creating cells" << endl;
Info<< "Creating cells" << endl;
labelList cellMap(maxCelli+1);
@ -409,7 +409,7 @@ int main(int argc, char *argv[])
{ 4, 2, 1, 3, 0, 5}, // hex
};
Info << "Creating boundary patches" << endl;
Info<< "Creating boundary patches" << endl;
faceListList boundary(slPatchCells.size());
wordList patchNames(slPatchCells.size());
@ -442,11 +442,11 @@ int main(int argc, char *argv[])
boundary[patchI] = patchFaces;
patchNames[patchI] = word("patch") + name(patchI + 1);
Info << "Patch " << patchI << " named " << patchNames[patchI]
Info<< "Patch " << patchI << " named " << patchNames[patchI]
<< ": " << boundary[patchI].size() << " faces" << endl;
}
Info << "ansysToFoam: " << endl
Info<< "ansysToFoam: " << endl
<< "Ansys file format does not provide information about the type of "
<< "the patch (eg. wall, symmetry plane, cyclic etc)." << endl
<< "All the patches have been created "
@ -491,7 +491,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing polyMesh" << endl;
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
Info<< nl << "end" << endl;

44
applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
View File

@ -73,7 +73,7 @@ int main(int argc, char *argv[])
cfxFile >> nblock >> npatch >> nglue >> nelem >> npoint;
Info << "Reading blocks" << endl;
Info<< "Reading blocks" << endl;
PtrList<hexBlock> blocks(nblock);
@ -90,7 +90,7 @@ int main(int argc, char *argv[])
}
}
Info << "Reading patch definitions" << endl;
Info<< "Reading patch definitions" << endl;
wordList cfxPatchTypes(npatch);
wordList cfxPatchNames(npatch);
@ -126,7 +126,7 @@ int main(int argc, char *argv[])
}
}
Info << "Reading block glueing information" << endl;
Info<< "Reading block glueing information" << endl;
labelList glueMasterPatches(nglue, -1);
labelList glueSlavePatches(nglue, -1);
@ -145,15 +145,15 @@ int main(int argc, char *argv[])
}
}
Info << "Reading block points" << endl;
Info<< "Reading block points" << endl;
forAll (blocks, blockI)
{
Info << "block " << blockI << " is a ";
Info<< "block " << blockI << " is a ";
blocks[blockI].readPoints(cfxFile);
}
Info << "Calculating block offsets" << endl;
Info<< "Calculating block offsets" << endl;
labelList blockOffsets(nblock, -1);
@ -172,7 +172,7 @@ int main(int argc, char *argv[])
+ blocks[blockI - 1].nBlockPoints();
}
Info << "Assembling patches" << endl;
Info<< "Assembling patches" << endl;
faceListList rawPatches(npatch);
@ -203,13 +203,13 @@ int main(int argc, char *argv[])
}
}
Info << "Merging points ";
Info<< "Merging points ";
labelList pointMergeList(nMeshPoints, -1);
// In order to ensure robust merging, it is necessary to traverse
// the patch glueing list until the pointMergeList stops changing.
//
//
// For efficiency, create merge pairs in the first pass
labelListListList glueMergePairs(glueMasterPatches.size());
@ -396,7 +396,7 @@ int main(int argc, char *argv[])
)
{
changedPointMerge = true;
pointMergeList[PpointLabel]
= pointMergeList[NpointLabel]
= min
@ -408,10 +408,10 @@ int main(int argc, char *argv[])
}
}
}
Info << "." << flush;
Info<< "." << flush;
}
while (changedPointMerge && nPasses < 8);
Info << endl;
Info<< endl;
if (changedPointMerge == true)
{
@ -509,7 +509,7 @@ int main(int argc, char *argv[])
nMeshPoints = nNewPoints;
Info << "Creating points" << endl;
Info<< "Creating points" << endl;
pointField points(nMeshPoints);
@ -536,7 +536,7 @@ int main(int argc, char *argv[])
points *= scaleFactor;
}
Info << "Creating cells" << endl;
Info<< "Creating cells" << endl;
cellShapeList cellShapes(nMeshCells);
@ -568,7 +568,7 @@ int main(int argc, char *argv[])
}
}
Info << "Creating boundary patches" << endl;
Info<< "Creating boundary patches" << endl;
faceListList boundary(npatch);
wordList patchNames(npatch);
@ -600,7 +600,7 @@ int main(int argc, char *argv[])
if (existingPatch >= 0)
{
Info << "CFX patch " << patchI
Info<< "CFX patch " << patchI
<< ", of type " << cfxPatchTypes[patchI]
<< ", name " << cfxPatchNames[patchI]
<< " already exists as FOAM patch " << existingPatch
@ -652,7 +652,7 @@ int main(int argc, char *argv[])
}
}
Info << "CFX patch " << patchI
Info<< "CFX patch " << patchI
<< ", of type " << cfxPatchTypes[patchI]
<< ", name " << cfxPatchNames[patchI]
<< " converted into FOAM patch " << nCreatedPatches
@ -660,7 +660,7 @@ int main(int argc, char *argv[])
if (cfxPatchTypes[patchI] == "WALL")
{
Info << "wall." << endl;
Info<< "wall." << endl;
patchTypes[nCreatedPatches] = wallPolyPatch::typeName;
patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@ -668,7 +668,7 @@ int main(int argc, char *argv[])
}
else if (cfxPatchTypes[patchI] == "SYMMET")
{
Info << "symmetryPlane." << endl;
Info<< "symmetryPlane." << endl;
patchTypes[nCreatedPatches] = symmetryPolyPatch::typeName;
patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@ -683,7 +683,7 @@ int main(int argc, char *argv[])
|| cfxPatchTypes[patchI] == "USER2D"
)
{
Info << "generic." << endl;
Info<< "generic." << endl;
patchTypes[nCreatedPatches] = polyPatch::typeName;
patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@ -737,10 +737,10 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing polyMesh" << endl;
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

4
applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C
View File

@ -70,12 +70,12 @@ void hexBlock::readPoints(Istream& is)
if (((i ^ j) & k) > 0)
{
Info << "right-handed block" << endl;
Info<< "right-handed block" << endl;
blockHandedness_ = right;
}
else
{
Info << "left-handed block" << endl;
Info<< "left-handed block" << endl;
blockHandedness_ = left;
}
}

50
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View File

@ -324,7 +324,7 @@ endOfSection {space}")"{space}
// point group type skipped
strtol(endPtr, &endPtr, 16);
pointi = pointGroupStartIndex[pointGroupStartIndex.size()-1];
pointi = pointGroupStartIndex.last();
// reset number of components to default
pointGroupNumberOfComponents = 3;
@ -336,11 +336,11 @@ endOfSection {space}")"{space}
}
Info<< "PointGroup: "
<< pointGroupZoneID[pointGroupZoneID.size()-1]
<< pointGroupZoneID.last()
<< " start: "
<< pointGroupStartIndex[pointGroupStartIndex.size()-1]
<< pointGroupStartIndex.last()
<< " end: "
<< pointGroupEndIndex[pointGroupEndIndex.size()-1] << flush;
<< pointGroupEndIndex.last() << flush;
}
<readNumberOfPoints,readPointGroupData>{endOfSection} {
@ -387,14 +387,14 @@ endOfSection {space}")"{space}
Info<< "done." << endl;
// check read of points
if (pointi != pointGroupEndIndex[pointGroupEndIndex.size()-1]+1)
if (pointi != pointGroupEndIndex.last()+1)
{
Warning
<< "Problem with reading points: " << nl
<< " start index: "
<< pointGroupStartIndex[pointGroupStartIndex.size()-1]
<< pointGroupStartIndex.last()
<< " end index: "
<< pointGroupEndIndex[pointGroupEndIndex.size()-1]
<< pointGroupEndIndex.last()
<< " last points read: " << pointi << nl
<< " on line " << lineNo << endl;
}
@ -440,14 +440,14 @@ endOfSection {space}")"{space}
faceGroupElementType = strtol(endPtr, &endPtr, 16);
facei = faceGroupStartIndex[faceGroupStartIndex.size()-1];
facei = faceGroupStartIndex.last();
Info<< "FaceGroup: "
<< faceGroupZoneID[faceGroupZoneID.size()-1]
<< faceGroupZoneID.last()
<< " start: "
<< faceGroupStartIndex[faceGroupStartIndex.size()-1]
<< faceGroupStartIndex.last()
<< " end: "
<< faceGroupEndIndex[faceGroupEndIndex.size()-1] << flush;
<< faceGroupEndIndex.last() << flush;
}
<readNumberOfFaces,readFaceGroupData>{space}{endOfSection} {
@ -507,14 +507,14 @@ endOfSection {space}")"{space}
Info<< "done." << endl;
// check read of fluentFaces
if (facei != faceGroupEndIndex[faceGroupEndIndex.size()-1]+1)
if (facei != faceGroupEndIndex.last()+1)
{
Warning
<< "Problem with reading fluentFaces: " << nl
<< " start index: "
<< faceGroupStartIndex[faceGroupStartIndex.size()-1]
<< faceGroupStartIndex.last()
<< " end index: "
<< faceGroupEndIndex[faceGroupEndIndex.size()-1]
<< faceGroupEndIndex.last()
<< " last fluentFaces read: " << facei << nl
<< " on line " << lineNo << endl;
}
@ -560,13 +560,13 @@ endOfSection {space}")"{space}
cellGroupType.append(strtol(endPtr, &endPtr, 16));
Info<< "CellGroup: "
<< cellGroupZoneID[cellGroupZoneID.size()-1]
<< cellGroupZoneID.last()
<< " start: "
<< cellGroupStartIndex[cellGroupStartIndex.size()-1]
<< cellGroupStartIndex.last()
<< " end: "
<< cellGroupEndIndex[cellGroupEndIndex.size()-1]
<< cellGroupEndIndex.last()
<< " type: "
<< cellGroupType[cellGroupType.size()-1]
<< cellGroupType.last()
<< endl;
}
@ -587,13 +587,13 @@ endOfSection {space}")"{space}
strtol(endPtr, &endPtr, 16);
Info<< "CellGroup: "
<< cellGroupZoneID[cellGroupZoneID.size()-1]
<< cellGroupZoneID.last()
<< " start: "
<< cellGroupStartIndex[cellGroupStartIndex.size()-1]
<< cellGroupStartIndex.last()
<< " end: "
<< cellGroupEndIndex[cellGroupEndIndex.size()-1]
<< cellGroupEndIndex.last()
<< " type: "
<< cellGroupType[cellGroupType.size()-1]
<< cellGroupType.last()
<< endl;
}
@ -813,7 +813,7 @@ int main(int argc, char *argv[])
yyFlexLexer lexer(&fluentStream.stdStream());
while(lexer.yylex() != 0)
while (lexer.yylex() != 0)
{}
Info<< "\nFINISHED LEXING\n\n";
@ -973,7 +973,7 @@ int main(int argc, char *argv[])
// Set the owner of these faces to -1 so that they do not get
// added to the mesh
for(label facei = start; facei <= end; facei++)
for (label facei = start; facei <= end; facei++)
{
owner[facei] = -1;
}
@ -1356,7 +1356,7 @@ int main(int argc, char *argv[])
mesh.write();
Info<< nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

62
applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
View File

@ -898,7 +898,7 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&fluentStream);
while(lexer.yylex() != 0)
while (lexer.yylex() != 0)
{}
Info<< "\n\nFINISHED LEXING\n\n\n";
@ -1388,7 +1388,7 @@ int main(int argc, char *argv[])
meshFaces[j] = cMeshFace;
pFaceSet.insert(cMeshFace);
}
if(writeSets)
if (writeSets)
{
Info<< "Writing patch " << patchNames[patchI]
<< " of size " << sz << " to faceSet." << endl;
@ -1404,7 +1404,11 @@ int main(int argc, char *argv[])
//it will be put in a default wall boundary
//internal boundaries are simply ignored
if(patchTypes[patchI] != "internal" && !pShapeMesh.isInternalFace(meshFaces[0]))
if
(
patchTypes[patchI] != "internal"
&& !pShapeMesh.isInternalFace(meshFaces[0])
)
{
//first face is external and has valid non-internal type
@ -1423,7 +1427,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
if(facePatchID[faceI - pShapeMesh.nInternalFaces()]!= -1)
if (facePatchID[faceI - pShapeMesh.nInternalFaces()]!= -1)
{
FatalErrorIn(args.executable())
<< "Face " << faceI << " on new patch "
@ -1475,7 +1479,7 @@ int main(int argc, char *argv[])
DynamicList<label> defaultBoundaryFaces(facePatchID.size());
forAll(facePatchID, idI)
{
if(facePatchID[idI] == -1)
if (facePatchID[idI] == -1)
{
defaultBoundaryFaces.append(idI);
facePatchID[idI] = nBoundaries;
@ -1575,50 +1579,50 @@ int main(int argc, char *argv[])
boundaryZones[pI].append(bPatches[pI].name());
}
label cnt=0;
SLList<label>::iterator cg = cellGroupZoneID.begin();
SLList<label>::iterator start = cellGroupStartIndex.begin();
SLList<label>::iterator end = cellGroupEndIndex.begin();
label cnt=0;
SLList<label>::iterator cg = cellGroupZoneID.begin();
SLList<label>::iterator start = cellGroupStartIndex.begin();
SLList<label>::iterator end = cellGroupEndIndex.begin();
for (; cg != cellGroupZoneID.end(); ++cg, ++start, ++end)
{
const word& name = patchNameIDs[cg()];
const word& type = patchTypeIDs[cg()];
for (; cg != cellGroupZoneID.end(); ++cg, ++start, ++end)
{
const word& name = patchNameIDs[cg()];
const word& type = patchTypeIDs[cg()];
Info<< "Writing cell zone: " << name
Info<< "Writing cell zone: " << name
<< " of type " << type << " starting at " << start() - 1
<< " ending at " << end() - 1 << " to cellSet." << endl;
labelList cls(end() - start() + 1);
labelList cls(end() - start() + 1);
// Mark zone cells, used for finding faces
boolList zoneCell(pShapeMesh.nCells(), false);
// shift cell indizes by 1
label nr=0;
for (label celli = (start() - 1); celli < end(); celli++)
// shift cell indizes by 1
label nr=0;
for (label celli = (start() - 1); celli < end(); celli++)
{
cls[nr]=celli;
zoneCell[celli] = true;
nr++;
}
}
cz[cnt] = new cellZone
(
cz[cnt] = new cellZone
(
name,
cls,
cnt,
pShapeMesh.cellZones()
);
);
DynamicList<label> zoneFaces(pShapeMesh.nFaces());
forAll(pShapeMesh.faceNeighbour(), faceI)
{
label nei = pShapeMesh.faceNeighbour()[faceI];
label own = pShapeMesh.faceOwner()[faceI];
if(nei != -1)
if (nei != -1)
{
if(zoneCell[nei] && zoneCell[own])
if (zoneCell[nei] && zoneCell[own])
{
zoneFaces.append(faceI);
}
@ -1641,7 +1645,7 @@ int main(int argc, char *argv[])
const labelList& faceCells = bPatches[pI].faceCells();
forAll(faceCells, fcI)
{
if(zoneCell[faceCells[fcI] ])
if (zoneCell[faceCells[fcI] ])
{
boundaryZones[pI].append(name);
break;
@ -1649,8 +1653,8 @@ int main(int argc, char *argv[])
}
}
cnt++;
}
cnt++;
}
pShapeMesh.addZones(pz, fz, cz);
@ -1715,7 +1719,7 @@ int main(int argc, char *argv[])
cellSet internal(pShapeMesh, name, end() - start());
// shift cell indizes by 1
for(label celli=start() - 1; celli<=end() - 1; celli++)
for (label celli = start() - 1; celli <= end() - 1; celli++)
{
internal.insert(celli);
}
@ -1729,7 +1733,7 @@ int main(int argc, char *argv[])
}
}
Info<< nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
View File

@ -63,7 +63,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
).c_str()
);
Info << "Writing Header" << endl;
Info<< "Writing Header" << endl;
fluentMeshFile
<< "(0 \"FOAM to Fluent Mesh File\")" << std::endl << std::endl

2
applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C
View File

@ -57,7 +57,7 @@ int main(int argc, char *argv[])
mesh.writeFluentMesh();
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

30
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View File

@ -233,7 +233,7 @@ mtype {space}"MTYPE:"{space}
<readProgramID>{space}{word} {
Info << "Written by " << YYText() << " ";
Info<< "Written by " << YYText() << " ";
BEGIN(controlInfo);
}
@ -245,20 +245,20 @@ mtype {space}"MTYPE:"{space}
<readVersionID>{space}{versionNumber} {
Info << " version " << YYText() << endl;
Info<< " version " << YYText() << endl;
BEGIN(controlInfo);
}
<controlInfo>{space}{dateDDMonYYYY}{space}{time} {
Info << "File written on " << YYText() << endl;
Info<< "File written on " << YYText() << endl;
}
<controlInfo>{space}{dateDDMMYYYY}{space}{time} {
Info << "File written on " << YYText() << endl;
Info<< "File written on " << YYText() << endl;
}
@ -304,7 +304,7 @@ mtype {space}"MTYPE:"{space}
{nodalCoords}{spaceNl} {
curNumberOfNodes = 0;
Info << "Reading nodal coordinates" << endl;
Info<< "Reading nodal coordinates" << endl;
BEGIN(nodalCoords);
}
@ -332,7 +332,7 @@ mtype {space}"MTYPE:"{space}
{cellsAndElements}{spaceNl} {
curNumberOfCells = 0;
Info << "Reading cells" << endl;
Info<< "Reading cells" << endl;
BEGIN(cellsAndElements);
}
@ -422,7 +422,7 @@ mtype {space}"MTYPE:"{space}
/* ------ Reading element group information ------ */
{cellStreams}{spaceNl} {
Info << "Reading cell streams" << endl;
Info<< "Reading cell streams" << endl;
BEGIN(cellStreams);
}
@ -504,7 +504,7 @@ mtype {space}"MTYPE:"{space}
<cellStreamFlags>{labelList} {
Info << "Reading cell stream labels" << endl;
Info<< "Reading cell stream labels" << endl;
BEGIN(cellStreamLabels);
}
@ -529,7 +529,7 @@ mtype {space}"MTYPE:"{space}
<cellStreamLabels>{endOfSection}\n {
Info << "Finished reading cell stream labels" << endl;
Info<< "Finished reading cell stream labels" << endl;
// reset current group ID and a number of flags
curGroupID = 0;
@ -541,7 +541,7 @@ mtype {space}"MTYPE:"{space}
{boundaryPatch}{spaceNl} {
curPatchFace = 0;
Info << "Reading patches" << endl;
Info<< "Reading patches" << endl;
BEGIN(boundaryPatchParams);
}
@ -665,10 +665,10 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&gambitStream);
while(lexer.yylex() != 0)
while (lexer.yylex() != 0)
{}
Info << "Finished lexing" << endl;
Info<< "Finished lexing" << endl;
// make a point mapping array
label maxPointIndex = 0;
@ -815,7 +815,7 @@ int main(int argc, char *argv[])
}
}
Info << "gambitToFoam: " << endl
Info<< "gambitToFoam: " << endl
<< "Gambit file format does not provide information about the type of "
<< "the patch (eg. wall, symmetry plane, cyclic etc)." << endl
<< "All the patches have been created "
@ -864,10 +864,10 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing polyMesh" << endl;
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
Info<< nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

6
applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
View File

@ -314,14 +314,14 @@ void readPhysNames(IFstream& inFile, Map<word>& physicalNames)
IStringStream lineStr(line);
label nSpaces = lineStr.str().count(' ');
if(nSpaces == 1)
if (nSpaces == 1)
{
lineStr >> regionI >> regionName;
Info<< " " << regionI << '\t'
<< string::validate<word>(regionName) << endl;
}
else if(nSpaces == 2)
else if (nSpaces == 2)
{
// >= Gmsh2.4 physical types has tag in front.
label physType;
@ -885,7 +885,7 @@ int main(int argc, char *argv[])
// Now use the patchFaces to patch up the outside faces of the mesh.
// Get the patch for all the outside faces (= default patch added as last)
const polyPatch& pp = mesh.boundaryMesh()[mesh.boundaryMesh().size()-1];
const polyPatch& pp = mesh.boundaryMesh().last();
// Storage for faceZones.
List<DynamicList<label> > zoneFaces(patchFaces.size());

18
applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
View File

@ -324,13 +324,13 @@ void readCells
cellVerts.append(cellShape(tet, cVerts, true));
cellMaterial.append(physProp);
if (cellVerts[cellVerts.size()-1].size() != cVerts.size())
if (cellVerts.last().size() != cVerts.size())
{
Pout<< "Line:" << is.lineNumber()
<< " element:" << cellI
<< " type:" << feID
<< " collapsed from " << cVerts << nl
<< " to:" << cellVerts[cellVerts.size()-1]
<< " to:" << cellVerts.last()
<< endl;
}
}
@ -347,13 +347,13 @@ void readCells
cellVerts.append(cellShape(prism, cVerts, true));
cellMaterial.append(physProp);
if (cellVerts[cellVerts.size()-1].size() != cVerts.size())
if (cellVerts.last().size() != cVerts.size())
{
Pout<< "Line:" << is.lineNumber()
<< " element:" << cellI
<< " type:" << feID
<< " collapsed from " << cVerts << nl
<< " to:" << cellVerts[cellVerts.size()-1]
<< " to:" << cellVerts.last()
<< endl;
}
}
@ -371,13 +371,13 @@ void readCells
cellVerts.append(cellShape(hex, cVerts, true));
cellMaterial.append(physProp);
if (cellVerts[cellVerts.size()-1].size() != cVerts.size())
if (cellVerts.last().size() != cVerts.size())
{
Pout<< "Line:" << is.lineNumber()
<< " element:" << cellI
<< " type:" << feID
<< " collapsed from " << cVerts << nl
<< " to:" << cellVerts[cellVerts.size()-1]
<< " to:" << cellVerts.last()
<< endl;
}
}
@ -412,7 +412,7 @@ void readPatches
Sout<< "Starting reading patches at line " << is.lineNumber() << '.'
<< endl;
while(true)
while (true)
{
string line;
is.getLine(line);
@ -511,7 +511,7 @@ void readDOFS
}
Info<< "For DOF set " << group
<< " named " << patchNames[patchNames.size()-1]
<< " named " << patchNames.last()
<< " trying to read vertex indices."
<< endl;
@ -534,7 +534,7 @@ void readDOFS
}
Info<< "For DOF set " << group
<< " named " << patchNames[patchNames.size()-1]
<< " named " << patchNames.last()
<< " read " << vertices.size() << " vertex indices." << endl;
dofVertices.append(vertices.shrink());

2
applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[])
# include "readKivaGrid.H"
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

10
applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
View File

@ -20,7 +20,7 @@ pointField points(nPoints);
label i4;
labelList idface(nPoints), fv(nPoints);
for(label i=0; i<nPoints; i++)
for (label i=0; i<nPoints; i++)
{
scalar ffv;
kivaFile
@ -44,7 +44,7 @@ labelList i1tab(nPoints), i3tab(nPoints), i8tab(nPoints), idreg(nPoints),
label nBfaces = 0;
for(label i=0; i<nPoints; i++)
for (label i=0; i<nPoints; i++)
{
label i1, i3, i8;
scalar ff, fbcl, fbcf, fbcb;
@ -85,7 +85,7 @@ if (mTable == 0)
labelList imtab(nPoints), jmtab(nPoints), kmtab(nPoints);
for(label i=0; i<nPoints; i++)
for (label i=0; i<nPoints; i++)
{
label im, jm, km;
kivaFile >> i4 >> im >> jm >> km;
@ -115,7 +115,7 @@ forAll (pointMap, i)
}
// Initialise all cells to hex and search and set map for collocated points
for(label i=0; i<nPoints; i++)
for (label i=0; i<nPoints; i++)
{
if (f[i] > 0.0)
{
@ -237,7 +237,7 @@ List<SLList<face> > pFaces[nBCs];
face quadFace(4);
face triFace(3);
for(label i=0; i<nPoints; i++)
for (label i=0; i<nPoints; i++)
{
if (f[i] > 0)
{

2
applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C
View File

@ -70,7 +70,7 @@ void hexBlock::setHandedness()
}
else
{
Info << "Left-handed block." << endl;
Info<< "Left-handed block." << endl;
blockHandedness_ = left;
}
return;

2
applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
View File

@ -1410,7 +1410,7 @@ void Foam::meshDualiser::setRefinement
meshMod
);
}
while(fp != 0);
while (fp != 0);
}
}

4
applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C
View File

@ -111,8 +111,8 @@ void sammMesh::createPolyBoundary()
// reset the size of the face list
meshFaces_.setSize(nCreatedFaces);
Info << "Number of boundary faces: " << nBoundaryFacesFound << endl;
Info << "Total number of faces: " << nCreatedFaces << endl;
Info<< "Number of boundary faces: " << nBoundaryFacesFound << endl;
Info<< "Total number of faces: " << nCreatedFaces << endl;
}

6
applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C
View File

@ -55,7 +55,7 @@ void sammMesh::createPolyCells()
maxFaces += cellFaces_[cellI].size();
}
Info << "Maximum possible number of faces in mesh: " << maxFaces << endl;
Info<< "Maximum possible number of faces in mesh: " << maxFaces << endl;
meshFaces_.setSize(maxFaces);
@ -72,7 +72,7 @@ void sammMesh::createPolyCells()
// Insertion cannot be done in one go as the faces need to be
// added into the list in the increasing order of neighbour
// cells. Therefore, all neighbours will be detected first
// and then added in the correct order.
// and then added in the correct order.
const faceList& curFaces = cellFaces_[cellI];
@ -109,7 +109,7 @@ void sammMesh::createPolyCells()
label curNei = curNeighbours[neiI];
// reject neighbours with the lower label. This should
// also reject current cell.
// also reject current cell.
if (curNei > cellI)
{
// get the list of search faces

4
applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C
View File

@ -55,12 +55,12 @@ void sammMesh::purgeCellShapes()
if (!found)
{
Info << "Purging cell shape " << cellI << endl;
Info<< "Purging cell shape " << cellI << endl;
cellShapes_[cellI] = cellShape(*unknownPtr_, labelList(0));
break;
}
}
}
}
}

8
applications/utilities/mesh/conversion/sammToFoam/readCouples.C
View File

@ -40,7 +40,7 @@ void sammMesh::readCouples()
if (couplesFile.good())
{
Info << "\nReading couples" << endl;
Info<< "\nReading couples" << endl;
// A mesh with couples cannot be a shape mesh
isShapeMesh_ = false;
@ -71,7 +71,7 @@ void sammMesh::readCouples()
// get reference to master cell faces
faceList& masterFaces = cellFaces_[masterCell - 1];
// Info << "Master cell: " << masterCell - 1 << " index: "
// Info<< "Master cell: " << masterCell - 1 << " index: "
// << cellShapes_[masterCell - 1].model().index()
// << " face: " <<
// masterFaces
@ -116,14 +116,14 @@ void sammMesh::readCouples()
[slaveFace]
].reverseFace();
// Info << " slave cell: " << slaveCell - 1 << " index: "
// Info<< " slave cell: " << slaveCell - 1 << " index: "
// << cellShapes_[slaveCell - 1].model().index()
// << " face: " << masterFaces[slaveToAdd] << endl;
slaveToAdd++;
}
// Info << endl;
// Info<< endl;
}

6
applications/utilities/mesh/conversion/sammToFoam/sammMesh.C
View File

@ -104,7 +104,7 @@ List<const label*> sammMesh::sammAddressingTable
// Make polyhedral mesh data (packing)
void sammMesh::createPolyMeshData()
{
Info << "Creating a polyMesh" << endl;
Info<< "Creating a polyMesh" << endl;
createPolyCells();
@ -124,7 +124,7 @@ void sammMesh::createPolyMeshData()
{
if (curFaceLabels[faceI] == -1)
{
Info << "cell " << cellI
Info<< "cell " << cellI
<< " has got an unmatched face. "
<< "Index: " << cellShapes_[cellI].model().index() << endl
// << "cell shape: " << cellShapes_[cellI] << endl
@ -142,7 +142,7 @@ void sammMesh::createPolyMeshData()
if (nProblemCells > 0)
{
Info << "Number of problem cells: " << nProblemCells << endl;
Info<< "Number of problem cells: " << nProblemCells << endl;
}
}

4
applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
View File

@ -61,10 +61,10 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing mesh" << endl;
Info<< "Writing mesh" << endl;
makeMesh.writeMesh();
Info<< nl << "End" << nl << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

8
applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
View File

@ -37,7 +37,7 @@ void sammMesh::writeMesh()
{
if (isShapeMesh_)
{
Info << "This is a shapeMesh." << endl;
Info<< "This is a shapeMesh." << endl;
polyMesh pShapeMesh
(
@ -57,7 +57,7 @@ void sammMesh::writeMesh()
patchPhysicalTypes_
);
Info << "Writing polyMesh" << endl;
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
}
else
@ -66,7 +66,7 @@ void sammMesh::writeMesh()
createPolyMeshData();
Info << "This is a polyMesh" << endl;
Info<< "This is a polyMesh" << endl;
polyMesh pMesh
(
@ -83,7 +83,7 @@ void sammMesh::writeMesh()
pMesh.addPatches(polyBoundaryPatches(pMesh));
Info << "Writing polyMesh" << endl;
Info<< "Writing polyMesh" << endl;
pMesh.write();
}
}

10
applications/utilities/mesh/conversion/starToFoam/createBoundaryFaces.C
View File

@ -127,7 +127,7 @@ void starMesh::markBoundaryFaces()
{
const label curCellIndex = facePointCells[cellI];
const faceList& curCellFaces =
const faceList& curCellFaces =
cellFaces_[curCellIndex];
forAll(curCellFaces, cellFaceI)
@ -159,11 +159,11 @@ void starMesh::markBoundaryFaces()
{
if (curFace[spI] > -1 && curFace[spI] < starPointID_.size())
{
Info << "," << starPointID_[curFace[spI]];
Info<< "," << starPointID_[curFace[spI]];
}
else
{
Info << ",???";
Info<< ",???";
}
}
@ -176,7 +176,7 @@ void starMesh::markBoundaryFaces()
void starMesh::collectBoundaryFaces()
{
Info << "Collecting boundary faces" << endl;
Info<< "Collecting boundary faces" << endl;
forAll(boundary_, patchI)
{
faceList& patchFaces = boundary_[patchI];
@ -193,7 +193,7 @@ void starMesh::collectBoundaryFaces()
}
}
Info << "Finished collecting boundary faces" << endl;
Info<< "Finished collecting boundary faces" << endl;
}

66
applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
View File

@ -67,7 +67,7 @@ void starMesh::createCoupleMatches()
{
if (coupleI % infoJump == 0)
{
Info << "Doing couple " << coupleI << ". STAR couple ID: "
Info<< "Doing couple " << coupleI << ". STAR couple ID: "
<< couples_[coupleI].coupleID() << endl;
}
@ -179,7 +179,7 @@ void starMesh::createCoupleMatches()
d -= n*(n & d);
# ifdef DEBUG_COUPLE_INTERSECTION
Info << "curMasterEdge: " << curMasterEdge << endl
Info<< "curMasterEdge: " << curMasterEdge << endl
<< "P: " << P << endl << "d: " << d << endl;
# endif
@ -198,7 +198,7 @@ void starMesh::createCoupleMatches()
scalar det = -(e & (n ^ d));
# ifdef DEBUG_COUPLE_INTERSECTION
Info << "curSlaveEdge: " << curSlaveEdge << endl
Info<< "curSlaveEdge: " << curSlaveEdge << endl
<< "S: " << S << endl
<< "e: " << e << endl;
# endif
@ -209,7 +209,7 @@ void starMesh::createCoupleMatches()
scalar beta = ((S - P) & (n ^ d))/det;
# ifdef DEBUG_COUPLE_INTERSECTION
Info << " beta: " << beta << endl;
Info<< " beta: " << beta << endl;
# endif
if (beta > -smallMergeTol_ && beta < 1 + smallMergeTol_)
@ -219,7 +219,7 @@ void starMesh::createCoupleMatches()
(((S - P) & d) + beta*(d & e))/magSqr(d);
# ifdef DEBUG_COUPLE_INTERSECTION
Info << " alpha: " << alpha << endl;
Info<< " alpha: " << alpha << endl;
# endif
if
@ -413,7 +413,7 @@ void starMesh::createCoupleMatches()
scalar beta1 = (sp & e)/magSqr(e);
# ifdef DEBUG_COUPLE_INTERSECTION
Info << "P: " << P << " S: " << S << " d: " << d
Info<< "P: " << P << " S: " << S << " d: " << d
<< " e: " << e << " sp: " << sp
<< " beta1: " << beta1 << endl;
# endif
@ -446,7 +446,7 @@ void starMesh::createCoupleMatches()
)
{
# ifdef DEBUG_COUPLE_INTERSECTION
Info << "adding irregular slave "
Info<< "adding irregular slave "
<< "intersection2: "
<< points_[masterEdges[masterEdgeI].end()]
<< endl;
@ -463,10 +463,10 @@ void starMesh::createCoupleMatches()
} // end of master edges
# ifdef DEBUG_COUPLE_INTERSECTION
Info << "additional slave edge points: " << endl;
Info<< "additional slave edge points: " << endl;
forAll (slaveEdgePoints, edgeI)
{
Info << "edge: " << edgeI << ": " << slaveEdgePoints[edgeI]
Info<< "edge: " << edgeI << ": " << slaveEdgePoints[edgeI]
<< endl;
}
# endif
@ -475,7 +475,7 @@ void starMesh::createCoupleMatches()
if (nLivePoints + coupleFacePoints.size() >= points_.size())
{
// increase the size of the points list
Info << "Resizing points list" << endl;
Info<< "Resizing points list" << endl;
points_.setSize(points_.size() + couples_.size());
}
@ -511,7 +511,7 @@ void starMesh::createCoupleMatches()
label nTmpMasterLabels = 0;
# ifdef DEBUG_COUPLE_INTERSECTION
Info << "masterFace: " << masterFace << endl
Info<< "masterFace: " << masterFace << endl
<< "nAdditionalMasterPoints: " << nAdditionalMasterPoints
<< endl;
# endif
@ -545,7 +545,7 @@ void starMesh::createCoupleMatches()
points_[masterEdges[masterEdgeI].start()];
// loop until the next label to add is -1
for(;;)
for (;;)
{
label nextPointLabel = -1;
label usedI = -1;
@ -588,7 +588,7 @@ void starMesh::createCoupleMatches()
}
# ifdef DEBUG_FACE_ORDERING
Info << "nextPointLabel: " << nextPointLabel << endl;
Info<< "nextPointLabel: " << nextPointLabel << endl;
# endif
i++;
@ -619,7 +619,7 @@ void starMesh::createCoupleMatches()
tmpMasterFace.setSize(nTmpMasterLabels);
# ifdef DEBUG_FACE_ORDERING
Info << "tmpMasterFace: " << tmpMasterFace << endl;
Info<< "tmpMasterFace: " << tmpMasterFace << endl;
# endif
// Eliminate all zero-length edges
@ -657,7 +657,7 @@ void starMesh::createCoupleMatches()
);
# ifdef DEBUG_FACE_ORDERING
Info << "Collapsed: nMaster: " << nMaster
Info<< "Collapsed: nMaster: " << nMaster
<< " label: " << newMasterFace[nMaster] << endl;
# endif
@ -727,7 +727,7 @@ void starMesh::createCoupleMatches()
vector edgeVector = slaveEdges[slaveEdgeI].vec(points_);
# ifdef DEBUG_FACE_ORDERING
Info << "curSEdgePoints.size(): "
Info<< "curSEdgePoints.size(): "
<< curSEdgePoints.size() << endl
<< "edgeVector: " << edgeVector << endl;
# endif
@ -739,7 +739,7 @@ void starMesh::createCoupleMatches()
points_[slaveEdges[slaveEdgeI].start()];
// loop until the next label to add is -1
for(;;)
for (;;)
{
label nextPointLabel = -1;
label usedI = -1;
@ -782,7 +782,7 @@ void starMesh::createCoupleMatches()
}
# ifdef DEBUG_FACE_ORDERING
Info << "nextPointLabel: " << nextPointLabel << endl;
Info<< "nextPointLabel: " << nextPointLabel << endl;
# endif
i++;
@ -813,7 +813,7 @@ void starMesh::createCoupleMatches()
tmpSlaveFace.setSize(nTmpSlaveLabels);
# ifdef DEBUG_FACE_ORDERING
Info << "tmpSlaveFace: " << tmpSlaveFace << endl;
Info<< "tmpSlaveFace: " << tmpSlaveFace << endl;
# endif
// Eliminate all zero-length edges
@ -834,7 +834,7 @@ void starMesh::createCoupleMatches()
forAll(slvEdgesToCollapse, edgeI)
{
# ifdef DEBUG_FACE_ORDERING
Info << "slave edge length: " << edgeI << ", "
Info<< "slave edge length: " << edgeI << ", "
<< slvEdgesToCollapse[edgeI].mag(points_)<< endl;
# endif
@ -880,7 +880,7 @@ void starMesh::createCoupleMatches()
edgeList newSlaveEdges = newSlaveFace.edges();
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "newMasterEdges: " << newMasterEdges << endl
Info<< "newMasterEdges: " << newMasterEdges << endl
<< "newSlaveEdges: " << newSlaveEdges << endl;
# endif
@ -926,7 +926,7 @@ void starMesh::createCoupleMatches()
startEdgeFound = 2;
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "slave edge found" << endl;
Info<< "slave edge found" << endl;
# endif
break;
@ -969,7 +969,7 @@ void starMesh::createCoupleMatches()
startEdgeFound = 1;
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "master edge found" << endl;
Info<< "master edge found" << endl;
# endif
break;
@ -986,7 +986,7 @@ void starMesh::createCoupleMatches()
if (startEdgeFound > 0)
{
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "start edge: " << startEdge << endl;
Info<< "start edge: " << startEdge << endl;
# endif
// Loop through both faces and add all edges
@ -1004,7 +1004,7 @@ void starMesh::createCoupleMatches()
planeNormal /= mag(planeNormal) + VSMALL;
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "planeNormal: " << planeNormal << endl;
Info<< "planeNormal: " << planeNormal << endl;
# endif
// Do a check to control the right-hand turn. This is
@ -1034,7 +1034,7 @@ void starMesh::createCoupleMatches()
if (tripleProduct < 0)
{
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "Turning edge for right-hand turn rule" << endl;
Info<< "Turning edge for right-hand turn rule" << endl;
# endif
startEdge = startEdge.reverseEdge();
}
@ -1155,7 +1155,7 @@ void starMesh::createCoupleMatches()
scalar curGoStraight = newDir & ahead;
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "curRightTurn: " << curRightTurn
Info<< "curRightTurn: " << curRightTurn
<< " curGoStraight: " << curGoStraight << endl;
# endif
@ -1167,7 +1167,7 @@ void starMesh::createCoupleMatches()
if (curGoStraight > goStraight)
{
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "a" << endl;
Info<< "a" << endl;
# endif
// Good edge, turning left less than before
@ -1179,7 +1179,7 @@ void starMesh::createCoupleMatches()
else // new edge turning right
{
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "b" << endl;
Info<< "b" << endl;
# endif
// good edge, turning right
@ -1197,7 +1197,7 @@ void starMesh::createCoupleMatches()
if (curGoStraight < goStraight)
{
# ifdef DEBUG_RIGHT_HAND_WALK
Info << "c" << endl;
Info<< "c" << endl;
# endif
// good edge, turning right more than before
@ -1256,7 +1256,7 @@ void starMesh::createCoupleMatches()
intersectedFace.setSize(nIntFacePoints);
# ifdef DEBUG_COUPLE
Info << "intersectedFace: " << intersectedFace << endl;
Info<< "intersectedFace: " << intersectedFace << endl;
# endif
// check the intersection face for duplicate points
@ -1315,7 +1315,7 @@ void starMesh::createCoupleMatches()
forAll (intersectedFace, intPointI)
{
# ifdef DEBUG_COUPLE_PROJECTION
Info << "Proj: old point: "
Info<< "Proj: old point: "
<< points_[intersectedFace[intPointI]] << endl;
# endif
@ -1501,7 +1501,7 @@ void starMesh::createCoupleMatches()
points_.setSize(nLivePoints);
// Finished
Info << "Finished doing couples" << endl;
Info<< "Finished doing couples" << endl;
}
}

40
applications/utilities/mesh/conversion/starToFoam/createPolyBoundary.C
View File

@ -99,7 +99,7 @@ void starMesh::createPolyBoundary()
<< curCellFaces[cellFaceI]
<< endl;
Info << "PROSTAR Command: vset,news,vlis";
Info<< "PROSTAR Command: vset,news,vlis";
forAll (curCellFaces[cellFaceI], spI)
{
// check if the point is given by STAR
@ -118,10 +118,10 @@ void starMesh::createPolyBoundary()
}
else
{
Info << ",???";
Info<< ",???";
}
}
Info << " $ bset,add,vset,all" << endl;
Info<< " $ bset,add,vset,all" << endl;
}
else
{
@ -135,7 +135,7 @@ void starMesh::createPolyBoundary()
<< curCellFaces[cellFaceI]
<< endl;
Info << "PROSTAR Command: vset,news,vlis";
Info<< "PROSTAR Command: vset,news,vlis";
forAll (curCellFaces[cellFaceI], spI)
{
// check if the point is given by STAR
@ -154,10 +154,10 @@ void starMesh::createPolyBoundary()
}
else
{
Info << ",???";
Info<< ",???";
}
}
Info << " $ bset,add,vset,all" << endl;
Info<< " $ bset,add,vset,all" << endl;
}
}
@ -191,7 +191,7 @@ void starMesh::createPolyBoundary()
{
const face& missingFace = cellFaces_[cellI][faceI];
Info << "starMesh::createPolyBoundary() : "
Info<< "starMesh::createPolyBoundary() : "
<< "missing face found in cell " << cellI
<< ".\nType: " << cellShapes_[cellI].model().name()
<< ". STAR cell number: " << starCellID_[cellI]
@ -199,7 +199,7 @@ void starMesh::createPolyBoundary()
nMissingFaceFound++;
Info << "PROSTAR Command: vset,news,vlis";
Info<< "PROSTAR Command: vset,news,vlis";
forAll (missingFace, spI)
{
// check if the point is given by STAR or created locally
@ -209,21 +209,21 @@ void starMesh::createPolyBoundary()
&& missingFace[spI] < starPointID_.size()
)
{
Info << "," << starPointID_[missingFace[spI]];
Info<< "," << starPointID_[missingFace[spI]];
}
else
{
Info << ",???";
Info<< ",???";
}
}
Info << " $ bset,add,vset,all" << endl;
Info<< " $ bset,add,vset,all" << endl;
}
}
}
if (nMissingFaceFound > 0)
{
Info << "Number of unmatched faces: " << nMissingFaceFound << endl;
Info<< "Number of unmatched faces: " << nMissingFaceFound << endl;
}
// reset the size of the face list
@ -256,14 +256,14 @@ void starMesh::createPolyBoundary()
{
const face& problemFace = meshFaces_[faceI];
Info << "starMesh::createPolyBoundary() : "
Info<< "starMesh::createPolyBoundary() : "
<< "problem with face " << faceI << ": addressed "
<< markupFaces[faceI] << " times (should be 2!). Face: "
<< problemFace << endl;
nProblemFacesFound++;
Info << "PROSTAR Command: vset,news,vlis";
Info<< "PROSTAR Command: vset,news,vlis";
forAll (problemFace, spI)
{
// check if the point is given by STAR or created locally
@ -273,25 +273,25 @@ void starMesh::createPolyBoundary()
&& problemFace[spI] < starPointID_.size()
)
{
Info << "," << starPointID_[problemFace[spI]];
Info<< "," << starPointID_[problemFace[spI]];
}
else
{
Info << ",???";
Info<< ",???";
}
}
Info << " $ bset,add,vset,all" << endl;
Info<< " $ bset,add,vset,all" << endl;
}
}
if (nProblemFacesFound > 0)
{
Info << "Number of incorrectly matched faces: "
Info<< "Number of incorrectly matched faces: "
<< nProblemFacesFound << endl;
}
Info << "Number of boundary faces: " << nBoundaryFacesFound << endl;
Info << "Total number of faces: " << nCreatedFaces << endl;
Info<< "Number of boundary faces: " << nBoundaryFacesFound << endl;
Info<< "Total number of faces: " << nCreatedFaces << endl;
}

6
applications/utilities/mesh/conversion/starToFoam/createPolyCells.C
View File

@ -55,7 +55,7 @@ void starMesh::createPolyCells()
maxFaces += cellFaces_[cellI].size();
}
Info << "Maximum possible number of faces in mesh: " << maxFaces << endl;
Info<< "Maximum possible number of faces in mesh: " << maxFaces << endl;
meshFaces_.setSize(maxFaces);
@ -72,7 +72,7 @@ void starMesh::createPolyCells()
// Insertion cannot be done in one go as the faces need to be
// added into the list in the increasing order of neighbour
// cells. Therefore, all neighbours will be detected first
// and then added in the correct order.
// and then added in the correct order.
const faceList& curFaces = cellFaces_[cellI];
@ -109,7 +109,7 @@ void starMesh::createPolyCells()
label curNei = curNeighbours[neiI];
// reject neighbours with the lower label. This should
// also reject current cell.
// also reject current cell.
if (curNei > cellI)
{
// get the list of search faces

14
applications/utilities/mesh/conversion/starToFoam/mergeCoupleFacePoints.C
View File

@ -48,9 +48,9 @@ void starMesh::mergeCoupleFacePoints()
// merge set. Once all cells (and thus points) are visited, go
// through the renumbering list and for each merging point use the
// label of the merge set as the new point label.
// This is VERY fancy. Use care if/when changing.
// This is VERY fancy. Use care if/when changing.
Info << endl << "Creating merge sets" << endl;
Info<< endl << "Creating merge sets" << endl;
// Create a renumbering list for points
// In the first instance the renumbering list is used as a
@ -162,7 +162,7 @@ void starMesh::mergeCoupleFacePoints()
if (nMergeSets >= mergeSetID.size())
{
Info << "Resizing mergeSetID" << endl;
Info<< "Resizing mergeSetID" << endl;
mergeSetID.setSize
(mergeSetID.size() + mergeIncrement);
@ -327,7 +327,7 @@ void starMesh::mergeCoupleFacePoints()
// This should be OK as the compressed points list will always
// have less points that the original lists. Even if there is
// no points removed, this will copy the list back onto itself
//
//
renumberPoints[pointI] = nUsedPoints;
points_[nUsedPoints] = points_[pointI];
@ -345,7 +345,7 @@ void starMesh::mergeCoupleFacePoints()
// reset number of points which need to be sorted
points_.setSize(nUsedPoints);
Info << "Renumbering all faces" << endl;
Info<< "Renumbering all faces" << endl;
forAll (cellFaces_, cellI)
{
@ -374,7 +374,7 @@ void starMesh::mergeCoupleFacePoints()
}
}
Info << "Renumbering all cell shapes" << endl;
Info<< "Renumbering all cell shapes" << endl;
forAll (cellShapes_, cellI)
{
@ -402,7 +402,7 @@ void starMesh::mergeCoupleFacePoints()
}
}
Info << "Renumbering STAR point lookup" << endl;
Info<< "Renumbering STAR point lookup" << endl;
labelList oldStarPointID = starPointID_;

4
applications/utilities/mesh/conversion/starToFoam/purgeCellShapes.C
View File

@ -55,12 +55,12 @@ void starMesh::purgeCellShapes()
if (!found)
{
Info << "Purging cell shape " << cellI << endl;
Info<< "Purging cell shape " << cellI << endl;
cellShapes_[cellI] = cellShape(*unknownPtr_, labelList(0));
break;
}
}
}
}
}

4
applications/utilities/mesh/conversion/starToFoam/readCouples.C
View File

@ -44,7 +44,7 @@ void starMesh::readCouples()
if (couplesFile.good())
{
Info << "\nReading couples" << endl;
Info<< "\nReading couples" << endl;
label matchLabel, nEntries, typeFlag;
label starMasterCell, rotXMasterFace;
@ -178,7 +178,7 @@ void starMesh::readCouples()
}
}
Info << "finished reading couples" << endl;
Info<< "finished reading couples" << endl;
}
}

10
applications/utilities/mesh/conversion/starToFoam/starMesh.C
View File

@ -87,7 +87,7 @@ const label starMesh::sammAddressingTable[9][12] =
// (first index) and STAR face number
// - first column is always -1
// - last column is -1 for all but hexagonal prism
// WARNING: Possible bug for sammTrim2
// WARNING: Possible bug for sammTrim2
// The lookup table for SAMM shapes is based on the rotation of the
// shape. This would imply that the table below needs to be split between
// the regular shapes (3-9), which are OK, and the SAMM shapes, for which
@ -95,7 +95,7 @@ const label starMesh::sammAddressingTable[9][12] =
// cell, firts find out the face index in the normal rotation using the cell
// face permutation table and then use the index from the shape face lookup.
// Additionally, have in mind that this silliness does not allow matches
// on face 7 and 8 of the samm cell.
// on face 7 and 8 of the samm cell.
const label starMesh::sammFacePermutationTable[24][8] =
{
@ -180,7 +180,7 @@ const label starMesh::shapeFaceLookup[19][9] =
// samm trim 8:
// star number: 1 2 3 4 5 6 7 8 In ROTATION 0
// foam number: 2 5 4 7 1 0 3 6
// confirmed: 1 0 6
// confirmed: 1 0 6
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -188,7 +188,7 @@ const label starMesh::shapeFaceLookup[19][9] =
// Make polyhedral mesh data (packing)
void starMesh::createPolyMeshData()
{
Info << "Creating a polyMesh" << endl;
Info<< "Creating a polyMesh" << endl;
createPolyCells();
@ -203,7 +203,7 @@ void starMesh::createPolyMeshData()
// a memory peak
void starMesh::clearExtraStorage()
{
Info << "Clearing extra storage" << endl;
Info<< "Clearing extra storage" << endl;
starPointLabelLookup_.setSize(0);
starPointID_.setSize(0);

4
applications/utilities/mesh/conversion/starToFoam/starToFoam.C
View File

@ -61,10 +61,10 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing mesh" << endl;
Info<< "Writing mesh" << endl;
makeMesh.writeMesh();
Info<< nl << "End" << nl << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

10
applications/utilities/mesh/conversion/starToFoam/writeMesh.C
View File

@ -37,9 +37,9 @@ void starMesh::writeMesh()
{
if (isShapeMesh_)
{
Info << "This is a shapeMesh." << endl;
Info<< "This is a shapeMesh." << endl;
Info << "Default patch type set to empty" << endl;
Info<< "Default patch type set to empty" << endl;
clearExtraStorage();
@ -61,7 +61,7 @@ void starMesh::writeMesh()
patchPhysicalTypes_
);
Info << "Writing polyMesh" << endl;
Info<< "Writing polyMesh" << endl;
pShapeMesh.write();
}
else
@ -70,7 +70,7 @@ void starMesh::writeMesh()
createPolyMeshData();
Info << "This is a polyMesh" << endl;
Info<< "This is a polyMesh" << endl;
clearExtraStorage();
@ -90,7 +90,7 @@ void starMesh::writeMesh()
// adding patches also checks the mesh
pMesh.addPatches(polyBoundaryPatches(pMesh));
Info << "Writing polyMesh" << endl;
Info<< "Writing polyMesh" << endl;
pMesh.write();
}
}

28
applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
View File

@ -62,7 +62,7 @@ void writePoints(const polyMesh& mesh, const fileName& timeName)
fileName pointFile(mesh.time().path()/"meshPoints_" + timeName + ".obj");
Info << "Writing mesh points and edges to " << pointFile << endl;
Info<< "Writing mesh points and edges to " << pointFile << endl;
OFstream pointStream(pointFile);
@ -91,7 +91,7 @@ void writePoints
{
fileName fName(mesh.time().path()/"meshPoints_" + timeName + ".obj");
Info << "Writing mesh points and edges to " << fName << endl;
Info<< "Writing mesh points and edges to " << fName << endl;
OFstream str(fName);
@ -162,7 +162,7 @@ void writePoints
/ "meshPoints_" + timeName + '_' + name(cellI) + ".obj"
);
Info << "Writing mesh points and edges to " << fName << endl;
Info<< "Writing mesh points and edges to " << fName << endl;
OFstream pointStream(fName);
@ -182,7 +182,7 @@ void writeFaceCentres(const polyMesh& mesh,const fileName& timeName)
/ "meshFaceCentres_" + timeName + ".obj"
);
Info << "Writing mesh face centres to " << faceFile << endl;
Info<< "Writing mesh face centres to " << faceFile << endl;
OFstream faceStream(faceFile);
@ -200,7 +200,7 @@ void writeCellCentres(const polyMesh& mesh, const fileName& timeName)
mesh.time().path()/"meshCellCentres_" + timeName + ".obj"
);
Info << "Writing mesh cell centres to " << cellFile << endl;
Info<< "Writing mesh cell centres to " << cellFile << endl;
OFstream cellStream(cellFile);
@ -228,7 +228,7 @@ void writePatchCentres
mesh.time().path()/"patch_" + pp.name() + '_' + timeName + ".obj"
);
Info << "Writing patch face centres to " << faceFile << endl;
Info<< "Writing patch face centres to " << faceFile << endl;
OFstream patchFaceStream(faceFile);
@ -258,7 +258,7 @@ void writePatchFaces
/ "patchFaces_" + pp.name() + '_' + timeName + ".obj"
);
Info << "Writing patch faces to " << faceFile << endl;
Info<< "Writing patch faces to " << faceFile << endl;
OFstream patchFaceStream(faceFile);
@ -301,7 +301,7 @@ void writePatchBoundaryEdges
/ "patchEdges_" + pp.name() + '_' + timeName + ".obj"
);
Info << "Writing patch edges to " << edgeFile << endl;
Info<< "Writing patch edges to " << edgeFile << endl;
OFstream patchEdgeStream(edgeFile);
@ -351,7 +351,7 @@ void writePointCells
/ "pointEdges_" + timeName + '_' + name(pointI) + ".obj"
);
Info << "Writing pointEdges to " << pFile << endl;
Info<< "Writing pointEdges to " << pFile << endl;
OFstream pointStream(pFile);
@ -492,7 +492,7 @@ int main(int argc, char *argv[])
+ ".obj"
);
Info << "Writing mesh points and edges to " << fName << endl;
Info<< "Writing mesh points and edges to " << fName << endl;
OFstream str(fName);
@ -506,7 +506,7 @@ int main(int argc, char *argv[])
}
else if
(
!patchFaces
!patchFaces
&& !patchEdges
&& !doCell
&& !doPoint
@ -530,14 +530,14 @@ int main(int argc, char *argv[])
}
else
{
Info << "No mesh." << endl;
Info<< "No mesh." << endl;
}
Info << nl << endl;
Info<< nl << endl;
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
View File

@ -382,7 +382,7 @@ int main(int argc, char *argv[])
}
}
Info<< nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

4
applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H
View File

@ -83,11 +83,11 @@
);
} // end of all merge pairs
Info << "Adding point and face zones" << endl;
Info<< "Adding point and face zones" << endl;
mesh.addZones(pz, fz, cz);
Info << "Creating attachPolyTopoChanger" << endl;
Info<< "Creating attachPolyTopoChanger" << endl;
attachPolyTopoChanger polyMeshAttacher(mesh);
polyMeshAttacher.setSize(mergePatchPairs.size());

6
applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
View File

@ -418,8 +418,8 @@ int main(int argc, char *argv[])
frontPatchFaces.setSize(layerFaces.size());
forAll(backPatchFaces, i)
{
backPatchFaces[i] = layerFaces[i][0];
frontPatchFaces[i] = layerFaces[i][layerFaces[i].size()-1];
backPatchFaces[i] = layerFaces[i].first();
frontPatchFaces[i] = layerFaces[i].last();
}
// Create dummy fvSchemes, fvSolution
@ -693,7 +693,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/utilities/mesh/generation/snappyHexMesh/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \
/* -g -DFULLDEBUG -O0 */ \
-I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
-I$(LIB_SRC)/mesh/autoMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \

2
applications/utilities/mesh/manipulation/cellSet/cellSet.C
View File

@ -189,7 +189,7 @@ int main(int argc, char *argv[])
currentSet.write();
}
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
View File

@ -120,7 +120,7 @@ int main(int argc, char *argv[])
}
else
{
Info << "\nMesh OK.\n" << endl;
Info<< "\nMesh OK.\n" << endl;
}
}
}

2
applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C
View File

@ -96,7 +96,7 @@ void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
label nTetWedge = 0;
label nUnknown = 0;
for(label cellI = 0; cellI < mesh.nCells(); cellI++)
for (label cellI = 0; cellI < mesh.nCells(); cellI++)
{
if (hex.isA(mesh, cellI))
{

2
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View File

@ -186,7 +186,7 @@ int main(int argc, char *argv[])
{
newPatches.append(findPatchID(mesh, patchNames[i]));
Info<< "Using additional patch " << patchNames[i]
<< " at index " << newPatches[newPatches.size()-1] << endl;
<< " at index " << newPatches.last() << endl;
}
}

2
applications/utilities/mesh/manipulation/faceSet/faceSet.C
View File

@ -189,7 +189,7 @@ int main(int argc, char *argv[])
currentSet.write();
}
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
View File

@ -95,7 +95,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing points into directory " << points.path() << nl << endl;
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();
return 0;

2
applications/utilities/mesh/manipulation/insideCells/insideCells.C
View File

@ -89,7 +89,7 @@ int main(int argc, char *argv[])
insideCells.write();
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
View File

@ -77,7 +77,7 @@ int main(int argc, char *argv[])
masterMesh.merge();
masterMesh.polyMesh::write();
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

4
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
View File

@ -385,7 +385,7 @@ void Foam::mergePolyMesh::merge()
// Add the patches if necessary
if (patchNames_.size() != boundaryMesh().size())
{
Info << "Copying old patches" << endl;
Info<< "Copying old patches" << endl;
List<polyPatch*> newPatches(patchNames_.size());
@ -399,7 +399,7 @@ void Foam::mergePolyMesh::merge()
newPatches[patchI] = oldPatches[patchI].clone(oldPatches).ptr();
}
Info << "Adding new patches. " << endl;
Info<< "Adding new patches. " << endl;
label endOfLastPatch =
oldPatches[patchI - 1].start() + oldPatches[patchI - 1].size();

18
applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
View File

@ -33,8 +33,8 @@ License
const Foam::label Foam::mirrorFvMesh::cellRenumber[8][8] =
{
{-1, -1, -1, -1, -1, -1, -1, -1}, // unknown
{-1, -1, -1, -1, -1, -1, -1, -1}, //
{-1, -1, -1, -1, -1, -1, -1, -1}, //
{-1, -1, -1, -1, -1, -1, -1, -1}, //
{-1, -1, -1, -1, -1, -1, -1, -1}, //
{ 0, 3, 2, 1, 4, 7, 6, 5}, // hex
{ 2, 1, 0, 5, 4, 3, 6, -1}, // wedge
{ 0, 2, 1, 3, 5, 4, -1, -1}, // prism
@ -74,7 +74,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
const polyPatchList& oldPatches = boundaryMesh();
// Mirror the points
Info << "Mirroring points. Old points: " << oldPoints.size();
Info<< "Mirroring points. Old points: " << oldPoints.size();
pointField newPoints(2*oldPoints.size());
label nNewPoints = 0;
@ -120,10 +120,10 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
}
// Reset the size of the point list
Info << " New points: " << nNewPoints << endl;
Info<< " New points: " << nNewPoints << endl;
newPoints.setSize(nNewPoints);
Info << "Mirroring faces. Old faces: " << oldFaces.size();
Info<< "Mirroring faces. Old faces: " << oldFaces.size();
// Algorithm:
// During mirroring, the faces that were previously boundary faces
@ -329,14 +329,14 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
// Tidy up the lists
newFaces.setSize(nNewFaces);
Info << " New faces: " << nNewFaces << endl;
Info<< " New faces: " << nNewFaces << endl;
newPatchTypes.setSize(nNewPatches);
newPatchNames.setSize(nNewPatches);
newPatchSizes.setSize(nNewPatches);
newPatchStarts.setSize(nNewPatches);
Info << "Mirroring patches. Old patches: " << boundary().size()
Info<< "Mirroring patches. Old patches: " << boundary().size()
<< " New patches: " << nNewPatches << endl;
Info<< "Mirroring cells. Old cells: " << oldCells.size()
@ -378,9 +378,9 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
}
// Mirror the cell shapes
Info << "Mirroring cell shapes." << endl;
Info<< "Mirroring cell shapes." << endl;
Info << nl << "Creating new mesh" << endl;
Info<< nl << "Creating new mesh" << endl;
mirrorMeshPtr_ = new fvMesh
(
io,

4
applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
View File

@ -54,10 +54,10 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing mirrored mesh" << endl;
Info<< "Writing mirrored mesh" << endl;
mesh.mirrorMesh().write();
Info << "End" << endl;
Info<< "End" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
View File

@ -266,7 +266,7 @@ int main(int argc, char *argv[])
}
}
Info << "End\n" << endl;
Info<< "End\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/pointSet/pointSet.C
View File

@ -189,7 +189,7 @@ int main(int argc, char *argv[])
currentSet.write();
}
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/renumberMesh/Make/options
View File

@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude
-I$(LIB_SRC)/parallel/decompositionMethods/lnInclude
EXE_LIBS = \
-lmeshTools \

2
applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C
View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing points into directory " << points.path() << nl << endl;
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();
}

6
applications/utilities/mesh/manipulation/setSet/setSet.C
View File

@ -284,10 +284,10 @@ void printHelp(Ostream& os)
<< endl
<< "Zones can be set using zoneSets from corresponding sets:" << endl
<< " cellZoneSet c0Zone new setToCellZone c0" << endl
<< " faceZoneSet f0Zone new setToFaceZone f0" << endl
<< " faceZoneSet f0Zone new setToFaceZone f0" << endl
<< endl
<< "or if orientation is important:" << endl
<< " faceZoneSet f0Zone new setsToFaceZone f0 c0" << endl
<< " faceZoneSet f0Zone new setsToFaceZone f0 c0" << endl
<< endl
<< "ZoneSets can be manipulated using the general actions:" << endl
<< " list - prints the contents of the set" << endl
@ -992,7 +992,7 @@ int main(int argc, char *argv[])
delete fileStreamPtr;
}
Pout<< "\nEnd" << endl;
Pout<< "\nEnd\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
View File

@ -341,7 +341,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
Info<< nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
View File

@ -236,7 +236,7 @@ int main(int argc, char *argv[])
mesh.faceZones()
);
Info << "Adding point and face zones" << endl;
Info<< "Adding point and face zones" << endl;
mesh.addZones(pz, fz, cz);
attachPolyTopoChanger splitter(mesh);

10
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -172,7 +172,7 @@ int main(int argc, char *argv[])
// set up the tolerances for the sliding mesh
dictionary slidingTolerances;
if (args.options().found("toleranceDict"))
if (args.options().found("toleranceDict"))
{
IOdictionary toleranceFile(
IOobject(
@ -180,7 +180,7 @@ int main(int argc, char *argv[])
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
IOobject::NO_WRITE
)
);
slidingTolerances += toleranceFile;
@ -231,7 +231,7 @@ int main(int argc, char *argv[])
// Note: make sure to add the zones BEFORE constructing polyMeshModifier
// (since looks up various zones at construction time)
Info << "Adding point and face zones" << endl;
Info<< "Adding point and face zones" << endl;
mesh.addZones(pz.shrink(), fz.shrink(), cz.shrink());
// Add the perfect interface mesh modifier
@ -316,7 +316,7 @@ int main(int argc, char *argv[])
// Note: make sure to add the zones BEFORE constructing polyMeshModifier
// (since looks up various zones at construction time)
Info << "Adding point and face zones" << endl;
Info<< "Adding point and face zones" << endl;
mesh.addZones(pz.shrink(), fz.shrink(), cz.shrink());
// Add the sliding interface mesh modifier
@ -393,7 +393,7 @@ int main(int argc, char *argv[])
mesh.setInstance(oldInstance);
stitcher.instance() = oldInstance;
}
Info << nl << "Writing polyMesh to time " << runTime.timeName() << endl;
Info<< nl << "Writing polyMesh to time " << runTime.timeName() << endl;
IOstream::defaultPrecision(10);

2
applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
View File

@ -439,7 +439,7 @@ int main(int argc, char *argv[])
}
Info << nl << "End" << endl;
Info<< "\nEnd\n" << endl;
return 0;
}

2
applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
View File

@ -267,7 +267,7 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10
IOstream::defaultPrecision(10);
Info << "Writing points into directory " << points.path() << nl << endl;
Info<< "Writing points into directory " << points.path() << nl << endl;
points.write();
return 0;