coding style adherence

- markup codingStyleGuide.org examples so they actually indent correctly

- use 'Info<<' as per codingStyleGuide instead of 'Info <<'
This commit is contained in:
Mark Olesen
2009-11-27 15:39:14 +01:00
parent 51bdcca506
commit fa93ce8cd7
235 changed files with 702 additions and 634 deletions

View File

@ -64,7 +64,7 @@ int main(int argc, char *argv[])
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl; Info<< "\nStarting time loop\n" << endl;
while (runTime.run()) while (runTime.run())
{ {
@ -85,7 +85,7 @@ int main(int argc, char *argv[])
dieselSpray.evolve(); dieselSpray.evolve();
Info << "Solving chemistry" << endl; Info<< "Solving chemistry" << endl;
chemistry.solve chemistry.solve
( (

View File

@ -61,7 +61,7 @@ int main(int argc, char *argv[])
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl; Info<< "\nStarting time loop\n" << endl;
while (runTime.run()) while (runTime.run())
{ {
@ -72,11 +72,11 @@ int main(int argc, char *argv[])
runTime++; runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
Info << "Evolving Spray" << endl; Info<< "Evolving Spray" << endl;
dieselSpray.evolve(); dieselSpray.evolve();
Info << "Solving chemistry" << endl; Info<< "Solving chemistry" << endl;
chemistry.solve chemistry.solve
( (

View File

@ -78,7 +78,7 @@ int main(int argc, char *argv[])
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl; Info<< "\nStarting time loop\n" << endl;
while (runTime.run()) while (runTime.run())
{ {

View File

@ -1,5 +1,5 @@
{ {
Info << "Solving chemistry" << endl; Info<< "Solving chemistry" << endl;
chemistry.solve chemistry.solve
( (

View File

@ -54,7 +54,7 @@ int main(int argc, char *argv[])
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl; Info<< "\nStarting time loop\n" << endl;
while (runTime.run()) while (runTime.run())
{ {

View File

@ -1,5 +1,5 @@
{ {
Info << "Solving chemistry" << endl; Info<< "Solving chemistry" << endl;
chemistry.solve chemistry.solve
( (

View File

@ -55,7 +55,7 @@ int main(int argc, char *argv[])
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl; Info<< "\nStarting time loop\n" << endl;
while (runTime.run()) while (runTime.run())
{ {

View File

@ -50,14 +50,14 @@ int main(int argc, char *argv[])
label nAveragingSteps = 0; label nAveragingSteps = 0;
Info << "\nStarting time loop\n" << endl; Info<< "\nStarting time loop\n" << endl;
while (runTime.loop()) while (runTime.loop())
{ {
nAveragingSteps++; nAveragingSteps++;
Info << "Time = " << runTime.timeName() << endl; Info<< "Time = " << runTime.timeName() << endl;
molecules.evolve(); molecules.evolve();
@ -74,12 +74,12 @@ int main(int argc, char *argv[])
nAveragingSteps = 0; nAveragingSteps = 0;
} }
Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s"
<< nl << endl; << nl << endl;
} }
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

@ -48,14 +48,14 @@ int main(int argc, char *argv[])
label nAveragingSteps = 0; label nAveragingSteps = 0;
Info << "\nStarting time loop\n" << endl; Info<< "\nStarting time loop\n" << endl;
while (runTime.loop()) while (runTime.loop())
{ {
nAveragingSteps++; nAveragingSteps++;
Info << "Time = " << runTime.timeName() << endl; Info<< "Time = " << runTime.timeName() << endl;
molecules.evolve(); molecules.evolve();
@ -70,12 +70,12 @@ int main(int argc, char *argv[])
nAveragingSteps = 0; nAveragingSteps = 0;
} }
Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s"
<< nl << endl; << nl << endl;
} }
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

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

View File

@ -1,4 +1,4 @@
Info << "Reading field p\n" << endl; Info<< "Reading field p\n" << endl;
volScalarField p volScalarField p
( (
IOobject IOobject
@ -12,7 +12,7 @@
mesh mesh
); );
Info << "Reading field U\n" << endl; Info<< "Reading field U\n" << endl;
volVectorField U volVectorField U
( (
IOobject IOobject

View File

@ -1,4 +1,4 @@
Info << "Reading field p\n" << endl; Info<< "Reading field p\n" << endl;
volScalarField p volScalarField p
( (
IOobject IOobject
@ -12,7 +12,7 @@
mesh mesh
); );
Info << "Reading field U\n" << endl; Info<< "Reading field U\n" << endl;
volVectorField U volVectorField U
( (
IOobject IOobject

View File

@ -1,5 +1,5 @@
{ {
Info << "Solving chemistry" << endl; Info<< "Solving chemistry" << endl;
chemistry.solve chemistry.solve
( (

View File

@ -1,5 +1,5 @@
{ {
Info << "Solving chemistry" << endl; Info<< "Solving chemistry" << endl;
chemistry.solve chemistry.solve
( (

View File

@ -1,5 +1,5 @@
{ {
Info << "Solving chemistry" << endl; Info<< "Solving chemistry" << endl;
chemistry.solve chemistry.solve
( (

View File

@ -190,7 +190,7 @@
} }
} }
Info << "dragPhase is " << dragPhase << endl; Info<< "dragPhase is " << dragPhase << endl;
kineticTheoryModel kineticTheory kineticTheoryModel kineticTheory
( (
phasea, phasea,

View File

@ -41,7 +41,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
interfaceDict.lookup("dragModel" + phasea.name()) interfaceDict.lookup("dragModel" + phasea.name())
); );
Info << "Selecting dragModel for phase " Info<< "Selecting dragModel for phase "
<< phasea.name() << phasea.name()
<< ": " << ": "
<< dragModelType << endl; << dragModelType << endl;
@ -57,7 +57,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
<< dragModelType << dragModelType
<< ", constructor not in hash table" << endl << endl << ", constructor not in hash table" << endl << endl
<< " Valid dragModel types are : " << endl; << " Valid dragModel types are : " << endl;
Info << dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
} }
return cstrIter()(interfaceDict, alpha, phasea, phaseb); return cstrIter()(interfaceDict, alpha, phasea, phaseb);

View File

@ -84,7 +84,7 @@ public:
~Scalar() ~Scalar()
{ {
Info <<"delete Scalar: " << data_ << endl; Info<<"delete Scalar: " << data_ << endl;
} }
friend Ostream& operator<<(Ostream& os, const Scalar& val) friend Ostream& operator<<(Ostream& os, const Scalar& val)
@ -197,11 +197,11 @@ int main(int argc, char *argv[])
if (p) if (p)
{ {
Info << "found: " << *p << endl; Info<< "found: " << *p << endl;
} }
else else
{ {
Info << "no p: " << endl; Info<< "no p: " << endl;
} }
scalarDict.clear(); scalarDict.clear();

View File

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

View File

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

View File

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

View File

@ -53,15 +53,15 @@ int main(int argc, char *argv[])
if (bananaIter == banana.end()) if (bananaIter == banana.end())
{ {
Info << "not found" << endl; Info<< "not found" << endl;
} }
else else
{ {
Info << "5 is " << bananaIter() << endl; Info<< "5 is " << bananaIter() << endl;
} }
// Same with STL // Same with STL
Info << "Same with STL" << endl; Info<< "Same with STL" << endl;
std::map<label, bool> STLbanana; std::map<label, bool> STLbanana;
STLbanana[5] = true; STLbanana[5] = true;
@ -69,11 +69,11 @@ int main(int argc, char *argv[])
if (STLbananaIter == STLbanana.end()) if (STLbananaIter == STLbanana.end())
{ {
Info << "not found" << endl; Info<< "not found" << endl;
} }
else else
{ {
Info << "5 is " << STLbananaIter->second << endl; Info<< "5 is " << STLbananaIter->second << endl;
} }

View File

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

View File

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
namedEnumTest::options hmm(namedEnumTest::namedEnum.read(Sin)); namedEnumTest::options hmm(namedEnumTest::namedEnum.read(Sin));
Info<< namedEnumTest::namedEnum[hmm] << endl; Info<< namedEnumTest::namedEnum[hmm] << endl;
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

@ -167,7 +167,7 @@ int main(int argc, char *argv[])
Info<< nl << "Analytical: y(2.0) = " << yEnd << endl; Info<< nl << "Analytical: y(2.0) = " << yEnd << endl;
Info << "Numerical: y(2.0) = " << y << ", hEst = " << hEst << endl; Info << "Numerical: y(2.0) = " << y << ", hEst = " << hEst << endl;
Info << "\nEnd\n" << endl; Info<< "\nEnd\n" << endl;
return 0; return 0;
} }

View File

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

View File

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

View File

@ -54,7 +54,7 @@ public:
~Scalar() ~Scalar()
{ {
Info <<"delete Scalar: " << data_ << endl; Info<<"delete Scalar: " << data_ << endl;
} }
autoPtr<Scalar> clone() const; autoPtr<Scalar> clone() const;

View File

@ -44,7 +44,7 @@ int main()
Info<< t2 << " " << t2.first() << " " << t2.second() << endl; Info<< t2 << " " << t2.first() << " " << t2.second() << endl;
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

@ -100,7 +100,7 @@ int main(int argc, char *argv[])
dynList.append(UIndirectList<double>(completeList, addresses)); dynList.append(UIndirectList<double>(completeList, addresses));
Info<< "DynamicList::append(UIndirectList): " << dynList << endl; Info<< "DynamicList::append(UIndirectList): " << dynList << endl;
Info << "\nEnd\n" << endl; Info<< "\nEnd\n" << endl;
return 0; return 0;
} }

View File

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

View File

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

View File

@ -108,8 +108,7 @@ int main()
Info<< " badName(die) => " << findEtcFile("badName", true) << nl Info<< " badName(die) => " << findEtcFile("badName", true) << nl
<< endl; << endl;
Info<< "\nEnd" << endl; Info<< "\nEnd\n" << endl;
return 0; return 0;
} }

View File

@ -95,8 +95,7 @@ int main(int argc, char *argv[])
printCleaning(pathName); printCleaning(pathName);
} }
Info<< "\nEnd" << endl; Info<< "\nEnd\n" << endl;
return 0; return 0;
} }

View File

@ -39,7 +39,7 @@ int main()
Info<< fuel.rho(1e5, 300) << endl; Info<< fuel.rho(1e5, 300) << endl;
Info<< fuel << endl; Info<< fuel << endl;
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

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

View File

@ -38,7 +38,7 @@ int main()
{ {
Info<< pTraits<scalar>::typeName << endl; Info<< pTraits<scalar>::typeName << endl;
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

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

View File

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

View File

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

View File

@ -102,8 +102,7 @@ int main(int argc, char *argv[])
Info<< "Ostream<< >" << s2 << "<\n"; Info<< "Ostream<< >" << s2 << "<\n";
Info<< "hash:" << hex << string::hash()(s2) << endl; Info<< "hash:" << hex << string::hash()(s2) << endl;
Info << "End\n" << endl; Info<< "\nEnd\n" << endl;
return 0; return 0;
} }

View File

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

View File

@ -98,10 +98,10 @@ int main(int argc, char *argv[])
if (THeader.headerOk() && Uheader.headerOk()) if (THeader.headerOk() && Uheader.headerOk())
{ {
Info << "Reading T" << endl; Info<< "Reading T" << endl;
volScalarField T(THeader, mesh); volScalarField T(THeader, mesh);
Info << "Reading U" << endl; Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh); volVectorField U(Uheader, mesh);
# include "createPhi.H" # include "createPhi.H"

View File

@ -93,10 +93,10 @@ int main(int argc, char *argv[])
if (pHeader.headerOk() && Uheader.headerOk()) if (pHeader.headerOk() && Uheader.headerOk())
{ {
Info << "Reading p" << endl; Info<< "Reading p" << endl;
volScalarField p(pHeader, mesh); volScalarField p(pHeader, mesh);
Info << "Reading U" << endl; Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh); volVectorField U(Uheader, mesh);
# include "createPhi.H" # include "createPhi.H"

View File

@ -94,10 +94,10 @@ int main(int argc, char *argv[])
if (pHeader.headerOk() && Uheader.headerOk()) if (pHeader.headerOk() && Uheader.headerOk())
{ {
Info << "Reading p" << endl; Info<< "Reading p" << endl;
volScalarField p(pHeader, mesh); volScalarField p(pHeader, mesh);
Info << "Reading U" << endl; Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh); volVectorField U(Uheader, mesh);
# include "createPhi.H" # include "createPhi.H"

View File

@ -99,10 +99,10 @@ int main(int argc, char *argv[])
if (THeader.headerOk() && Uheader.headerOk()) if (THeader.headerOk() && Uheader.headerOk())
{ {
Info << "Reading T" << endl; Info<< "Reading T" << endl;
volScalarField T(THeader, mesh); volScalarField T(THeader, mesh);
Info << "Reading U" << endl; Info<< "Reading U" << endl;
volVectorField U(Uheader, mesh); volVectorField U(Uheader, mesh);
# include "createPhi.H" # include "createPhi.H"

View File

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

View File

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

View File

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

View File

@ -560,7 +560,7 @@ int main(int argc, char *argv[])
} }
// Write resulting mesh // Write resulting mesh
Info << "Writing modified mesh to time " << runTime.timeName() << endl; Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
mesh.write(); mesh.write();
} }
else if (edgeToPos.size()) else if (edgeToPos.size())
@ -613,7 +613,7 @@ int main(int argc, char *argv[])
} }
// Write resulting mesh // Write resulting mesh
Info << "Writing modified mesh to time " << runTime.timeName() << endl; Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
mesh.write(); mesh.write();
} }
else else
@ -656,13 +656,12 @@ int main(int argc, char *argv[])
} }
// Write resulting mesh // Write resulting mesh
Info << "Writing modified mesh to time " << runTime.timeName() << endl; Info<< "Writing modified mesh to time " << runTime.timeName() << endl;
mesh.write(); mesh.write();
} }
Info << nl << "End" << endl; Info<< "\nEnd\n" << endl;
return 0; return 0;
} }

View File

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

View File

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

View File

@ -510,7 +510,7 @@ int main(int argc, char *argv[])
writeSet(selectedCells, "cells selected for meshing"); writeSet(selectedCells, "cells selected for meshing");
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

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

View File

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

View File

@ -73,7 +73,7 @@ int main(int argc, char *argv[])
cfxFile >> nblock >> npatch >> nglue >> nelem >> npoint; cfxFile >> nblock >> npatch >> nglue >> nelem >> npoint;
Info << "Reading blocks" << endl; Info<< "Reading blocks" << endl;
PtrList<hexBlock> blocks(nblock); 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 cfxPatchTypes(npatch);
wordList cfxPatchNames(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 glueMasterPatches(nglue, -1);
labelList glueSlavePatches(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) forAll (blocks, blockI)
{ {
Info << "block " << blockI << " is a "; Info<< "block " << blockI << " is a ";
blocks[blockI].readPoints(cfxFile); blocks[blockI].readPoints(cfxFile);
} }
Info << "Calculating block offsets" << endl; Info<< "Calculating block offsets" << endl;
labelList blockOffsets(nblock, -1); labelList blockOffsets(nblock, -1);
@ -172,7 +172,7 @@ int main(int argc, char *argv[])
+ blocks[blockI - 1].nBlockPoints(); + blocks[blockI - 1].nBlockPoints();
} }
Info << "Assembling patches" << endl; Info<< "Assembling patches" << endl;
faceListList rawPatches(npatch); faceListList rawPatches(npatch);
@ -203,7 +203,7 @@ int main(int argc, char *argv[])
} }
} }
Info << "Merging points "; Info<< "Merging points ";
labelList pointMergeList(nMeshPoints, -1); labelList pointMergeList(nMeshPoints, -1);
@ -408,10 +408,10 @@ int main(int argc, char *argv[])
} }
} }
} }
Info << "." << flush; Info<< "." << flush;
} }
while (changedPointMerge && nPasses < 8); while (changedPointMerge && nPasses < 8);
Info << endl; Info<< endl;
if (changedPointMerge == true) if (changedPointMerge == true)
{ {
@ -509,7 +509,7 @@ int main(int argc, char *argv[])
nMeshPoints = nNewPoints; nMeshPoints = nNewPoints;
Info << "Creating points" << endl; Info<< "Creating points" << endl;
pointField points(nMeshPoints); pointField points(nMeshPoints);
@ -536,7 +536,7 @@ int main(int argc, char *argv[])
points *= scaleFactor; points *= scaleFactor;
} }
Info << "Creating cells" << endl; Info<< "Creating cells" << endl;
cellShapeList cellShapes(nMeshCells); 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); faceListList boundary(npatch);
wordList patchNames(npatch); wordList patchNames(npatch);
@ -600,7 +600,7 @@ int main(int argc, char *argv[])
if (existingPatch >= 0) if (existingPatch >= 0)
{ {
Info << "CFX patch " << patchI Info<< "CFX patch " << patchI
<< ", of type " << cfxPatchTypes[patchI] << ", of type " << cfxPatchTypes[patchI]
<< ", name " << cfxPatchNames[patchI] << ", name " << cfxPatchNames[patchI]
<< " already exists as FOAM patch " << existingPatch << " 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] << ", of type " << cfxPatchTypes[patchI]
<< ", name " << cfxPatchNames[patchI] << ", name " << cfxPatchNames[patchI]
<< " converted into FOAM patch " << nCreatedPatches << " converted into FOAM patch " << nCreatedPatches
@ -660,7 +660,7 @@ int main(int argc, char *argv[])
if (cfxPatchTypes[patchI] == "WALL") if (cfxPatchTypes[patchI] == "WALL")
{ {
Info << "wall." << endl; Info<< "wall." << endl;
patchTypes[nCreatedPatches] = wallPolyPatch::typeName; patchTypes[nCreatedPatches] = wallPolyPatch::typeName;
patchNames[nCreatedPatches] = cfxPatchNames[patchI]; patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@ -668,7 +668,7 @@ int main(int argc, char *argv[])
} }
else if (cfxPatchTypes[patchI] == "SYMMET") else if (cfxPatchTypes[patchI] == "SYMMET")
{ {
Info << "symmetryPlane." << endl; Info<< "symmetryPlane." << endl;
patchTypes[nCreatedPatches] = symmetryPolyPatch::typeName; patchTypes[nCreatedPatches] = symmetryPolyPatch::typeName;
patchNames[nCreatedPatches] = cfxPatchNames[patchI]; patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@ -683,7 +683,7 @@ int main(int argc, char *argv[])
|| cfxPatchTypes[patchI] == "USER2D" || cfxPatchTypes[patchI] == "USER2D"
) )
{ {
Info << "generic." << endl; Info<< "generic." << endl;
patchTypes[nCreatedPatches] = polyPatch::typeName; patchTypes[nCreatedPatches] = polyPatch::typeName;
patchNames[nCreatedPatches] = cfxPatchNames[patchI]; patchNames[nCreatedPatches] = cfxPatchNames[patchI];
@ -737,10 +737,10 @@ int main(int argc, char *argv[])
// Set the precision of the points data to 10 // Set the precision of the points data to 10
IOstream::defaultPrecision(10); IOstream::defaultPrecision(10);
Info << "Writing polyMesh" << endl; Info<< "Writing polyMesh" << endl;
pShapeMesh.write(); pShapeMesh.write();
Info << "End\n" << endl; Info<< "End\n" << endl;
return 0; return 0;
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -55,7 +55,7 @@ void sammMesh::createPolyCells()
maxFaces += cellFaces_[cellI].size(); 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); meshFaces_.setSize(maxFaces);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -159,11 +159,11 @@ void starMesh::markBoundaryFaces()
{ {
if (curFace[spI] > -1 && curFace[spI] < starPointID_.size()) if (curFace[spI] > -1 && curFace[spI] < starPointID_.size())
{ {
Info << "," << starPointID_[curFace[spI]]; Info<< "," << starPointID_[curFace[spI]];
} }
else else
{ {
Info << ",???"; Info<< ",???";
} }
} }
@ -176,7 +176,7 @@ void starMesh::markBoundaryFaces()
void starMesh::collectBoundaryFaces() void starMesh::collectBoundaryFaces()
{ {
Info << "Collecting boundary faces" << endl; Info<< "Collecting boundary faces" << endl;
forAll(boundary_, patchI) forAll(boundary_, patchI)
{ {
faceList& patchFaces = 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;
} }

View File

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

View File

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

View File

@ -55,7 +55,7 @@ void starMesh::createPolyCells()
maxFaces += cellFaces_[cellI].size(); 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); meshFaces_.setSize(maxFaces);

View File

@ -50,7 +50,7 @@ void starMesh::mergeCoupleFacePoints()
// label of the merge set as the new point label. // 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 // Create a renumbering list for points
// In the first instance the renumbering list is used as a // In the first instance the renumbering list is used as a
@ -162,7 +162,7 @@ void starMesh::mergeCoupleFacePoints()
if (nMergeSets >= mergeSetID.size()) if (nMergeSets >= mergeSetID.size())
{ {
Info << "Resizing mergeSetID" << endl; Info<< "Resizing mergeSetID" << endl;
mergeSetID.setSize mergeSetID.setSize
(mergeSetID.size() + mergeIncrement); (mergeSetID.size() + mergeIncrement);
@ -345,7 +345,7 @@ void starMesh::mergeCoupleFacePoints()
// reset number of points which need to be sorted // reset number of points which need to be sorted
points_.setSize(nUsedPoints); points_.setSize(nUsedPoints);
Info << "Renumbering all faces" << endl; Info<< "Renumbering all faces" << endl;
forAll (cellFaces_, cellI) 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) 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_; labelList oldStarPointID = starPointID_;

View File

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

View File

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

View File

@ -188,7 +188,7 @@ const label starMesh::shapeFaceLookup[19][9] =
// Make polyhedral mesh data (packing) // Make polyhedral mesh data (packing)
void starMesh::createPolyMeshData() void starMesh::createPolyMeshData()
{ {
Info << "Creating a polyMesh" << endl; Info<< "Creating a polyMesh" << endl;
createPolyCells(); createPolyCells();
@ -203,7 +203,7 @@ void starMesh::createPolyMeshData()
// a memory peak // a memory peak
void starMesh::clearExtraStorage() void starMesh::clearExtraStorage()
{ {
Info << "Clearing extra storage" << endl; Info<< "Clearing extra storage" << endl;
starPointLabelLookup_.setSize(0); starPointLabelLookup_.setSize(0);
starPointID_.setSize(0); starPointID_.setSize(0);

View File

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

View File

@ -37,9 +37,9 @@ void starMesh::writeMesh()
{ {
if (isShapeMesh_) 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(); clearExtraStorage();
@ -61,7 +61,7 @@ void starMesh::writeMesh()
patchPhysicalTypes_ patchPhysicalTypes_
); );
Info << "Writing polyMesh" << endl; Info<< "Writing polyMesh" << endl;
pShapeMesh.write(); pShapeMesh.write();
} }
else else
@ -70,7 +70,7 @@ void starMesh::writeMesh()
createPolyMeshData(); createPolyMeshData();
Info << "This is a polyMesh" << endl; Info<< "This is a polyMesh" << endl;
clearExtraStorage(); clearExtraStorage();
@ -90,7 +90,7 @@ void starMesh::writeMesh()
// adding patches also checks the mesh // adding patches also checks the mesh
pMesh.addPatches(polyBoundaryPatches(pMesh)); pMesh.addPatches(polyBoundaryPatches(pMesh));
Info << "Writing polyMesh" << endl; Info<< "Writing polyMesh" << endl;
pMesh.write(); pMesh.write();
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -74,7 +74,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
const polyPatchList& oldPatches = boundaryMesh(); const polyPatchList& oldPatches = boundaryMesh();
// Mirror the points // Mirror the points
Info << "Mirroring points. Old points: " << oldPoints.size(); Info<< "Mirroring points. Old points: " << oldPoints.size();
pointField newPoints(2*oldPoints.size()); pointField newPoints(2*oldPoints.size());
label nNewPoints = 0; label nNewPoints = 0;
@ -120,10 +120,10 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
} }
// Reset the size of the point list // Reset the size of the point list
Info << " New points: " << nNewPoints << endl; Info<< " New points: " << nNewPoints << endl;
newPoints.setSize(nNewPoints); newPoints.setSize(nNewPoints);
Info << "Mirroring faces. Old faces: " << oldFaces.size(); Info<< "Mirroring faces. Old faces: " << oldFaces.size();
// Algorithm: // Algorithm:
// During mirroring, the faces that were previously boundary faces // During mirroring, the faces that were previously boundary faces
@ -329,14 +329,14 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
// Tidy up the lists // Tidy up the lists
newFaces.setSize(nNewFaces); newFaces.setSize(nNewFaces);
Info << " New faces: " << nNewFaces << endl; Info<< " New faces: " << nNewFaces << endl;
newPatchTypes.setSize(nNewPatches); newPatchTypes.setSize(nNewPatches);
newPatchNames.setSize(nNewPatches); newPatchNames.setSize(nNewPatches);
newPatchSizes.setSize(nNewPatches); newPatchSizes.setSize(nNewPatches);
newPatchStarts.setSize(nNewPatches); newPatchStarts.setSize(nNewPatches);
Info << "Mirroring patches. Old patches: " << boundary().size() Info<< "Mirroring patches. Old patches: " << boundary().size()
<< " New patches: " << nNewPatches << endl; << " New patches: " << nNewPatches << endl;
Info<< "Mirroring cells. Old cells: " << oldCells.size() Info<< "Mirroring cells. Old cells: " << oldCells.size()
@ -378,9 +378,9 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
} }
// Mirror the cell shapes // 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 mirrorMeshPtr_ = new fvMesh
( (
io, io,

View File

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

View File

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

View File

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

View File

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

View File

@ -992,7 +992,7 @@ int main(int argc, char *argv[])
delete fileStreamPtr; delete fileStreamPtr;
} }
Pout<< "\nEnd" << endl; Pout<< "\nEnd\n" << endl;
return 0; return 0;
} }

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More