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

coding style adherence

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
View File

@ -39,7 +39,7 @@ Foam::dictionaryEntry::dictionaryEntry
Istream& is
)
:
entry(is),
entry(keyType(is)),
dictionary(parentDict, is)
{
is.fatalCheck

1
src/OpenFOAM/db/dictionary/entry/entry.C
View File

@ -38,7 +38,6 @@ Foam::entry::entry(const keyType& keyword)
Foam::entry::entry(const entry& e)
:
IDLList<entry>::link(),
keyword_(e.keyword_)
{}

6
src/OpenFOAM/db/dictionary/entry/entry.H
View File

@ -77,7 +77,7 @@ class entry
// Private Member Functions
//- Get the next valid keyword otherwise return false
static bool getKeyword(keyType& keyword, Istream& is);
static bool getKeyword(keyType&, Istream&);
public:
@ -85,7 +85,7 @@ public:
// Constructors
//- Construct from keyword
entry(const keyType& keyword);
entry(const keyType&);
//- Construct as copy
entry(const entry&);
@ -102,7 +102,7 @@ public:
virtual autoPtr<entry> clone() const;
//- Construct from Istream and insert into dictionary
static bool New(dictionary& parentDict, Istream& is);
static bool New(dictionary& parentDict, Istream&);
//- Construct on freestore from Istream and return
static autoPtr<entry> New(Istream& is);

2
src/OpenFOAM/db/scalarRange/scalarRange.C
View File

@ -315,7 +315,7 @@ Foam::Istream& Foam::operator>>(Istream& is, scalarRange& range)
Info<< "rejected ill-formed range:";
for (label i=0; i<nTok; ++i)
{
Info << " " << toks[i];
Info<< " " << toks[i];
}
Info<< endl;
}

8
src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
View File

@ -63,7 +63,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
if (debug)
{
Info << "projecting points" << endl;
Info<< "projecting points" << endl;
}
List<objectHit> proj =
@ -139,7 +139,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
+ projectionDirection[pointI]*ph.distance()
- ph.missPoint()
);
// Calculate the local tolerance
scalar minEdgeLength = GREAT;
@ -244,7 +244,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
if (debug)
{
Info << "projecting face centres" << endl;
Info<< "projecting face centres" << endl;
}
const pointField& fromPatchPoints = fromPatch_.points();
@ -274,7 +274,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
);
faceAddressingPtr_ = new labelList(proj.size(), -1);
labelList& faceAddressing = *faceAddressingPtr_;
labelList& faceAddressing = *faceAddressingPtr_;
forAll (faceAddressing, faceI)
{

6
src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
View File

@ -368,7 +368,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
{
if (S_[i] <= minS)
{
//Info << "Removing " << S_[i] << " < " << minS << endl;
//Info<< "Removing " << S_[i] << " < " << minS << endl;
S_[i] = 0;
nZeros_++;
}
@ -390,11 +390,11 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
if (diff > maxDiff) maxDiff = diff;
}
}
Info << "Maximum discrepancy between A and svd(A) = " << maxDiff << endl;
Info<< "Maximum discrepancy between A and svd(A) = " << maxDiff << endl;
if (maxDiff > 4)
{
Info << "singular values " << S_ << endl;
Info<< "singular values " << S_ << endl;
}
*/
}

2
src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
View File

@ -598,7 +598,7 @@ bool Foam::polyBoundaryMesh::checkDefinition(const bool report) const
}
else
{
Info << " Boundary definition OK." << endl;
Info<< " Boundary definition OK." << endl;
}
}

2
src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
View File

@ -614,7 +614,7 @@ Foam::polyMesh::polyMesh
{
if (checkMesh())
{
Info << "Mesh OK" << endl;
Info<< "Mesh OK" << endl;
}
}
}

8
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
View File

@ -89,7 +89,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Topological change
if (debug)
{
Info << "Topological change" << endl;
Info<< "Topological change" << endl;
}
clearOut();
@ -403,7 +403,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Points moved
if (debug)
{
Info << "Point motion" << endl;
Info<< "Point motion" << endl;
}
clearGeom();
@ -430,14 +430,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
// Rotation can cause direction vector to change
geometricD_ = Vector<label>::zero;
solutionD_ = Vector<label>::zero;
return polyMesh::POINTS_MOVED;
}
else
{
if (debug)
{
Info << "No change" << endl;
Info<< "No change" << endl;
}
return polyMesh::UNCHANGED;

4
src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
View File

@ -156,8 +156,8 @@ void Foam::faceZone::calcCellLayers() const
sc[faceI] = neiCellI;
}
}
//Info << "masterCells: " << mc << endl;
//Info << "slaveCells: " << sc << endl;
//Info<< "masterCells: " << mc << endl;
//Info<< "slaveCells: " << sc << endl;
}
}

6
src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C
View File

@ -74,7 +74,7 @@ void Foam::preservePatchTypes
{
if (patchDictionary.found(patchNames[patchi]))
{
const dictionary& patchDict =
const dictionary& patchDict =
patchDictionary.subDict(patchNames[patchi]);
patchDict.lookup("type") >> patchTypes[patchi];
@ -90,14 +90,14 @@ void Foam::preservePatchTypes
if (patchDictionary.found(defaultFacesName))
{
const dictionary& patchDict =
const dictionary& patchDict =
patchDictionary.subDict(defaultFacesName);
patchDict.readIfPresent("geometricType", defaultFacesType);
}
}
Info << nl << "Default patch type set to " << defaultFacesType << endl;
Info<< nl << "Default patch type set to " << defaultFacesType << endl;
}

4
src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
View File

@ -262,7 +262,7 @@ projectPoints
if (debug)
{
Info << result[curLocalPointLabel] << nl;
Info<< result[curLocalPointLabel] << nl;
}
}
else
@ -505,7 +505,7 @@ projectFaceCentres
if (debug)
{
Info << result[curLocalFaceLabel] << nl;
Info<< result[curLocalFaceLabel] << nl;
}
}
else

6
src/conversion/meshReader/meshReaderAux.C
View File

@ -58,15 +58,15 @@ void Foam::meshReader::warnDuplicates
// warn about duplicate names
if (duplicates)
{
Info << nl << "WARNING: " << context << " with identical names:";
Info<< nl << "WARNING: " << context << " with identical names:";
forAllConstIter(HashTable<label>, hashed, iter)
{
if (*iter > 1)
{
Info << " " << iter.key();
Info<< " " << iter.key();
}
}
Info << nl << endl;
Info<< nl << endl;
}
}

4
src/conversion/meshWriter/starcd/STARCDMeshWriter.C
View File

@ -554,7 +554,7 @@ bool Foam::meshWriters::STARCD::writeSurface
OFstream celFile(baseName + ".cel");
writeHeader(celFile, "CELL");
Info << "Writing " << celFile.name() << endl;
Info<< "Writing " << celFile.name() << endl;
// mesh and patch info
const pointField& points = mesh_.points();
@ -693,7 +693,7 @@ bool Foam::meshWriters::STARCD::writeSurface
vrtFile.precision(10);
vrtFile.setf(std::ios::showpoint); // force decimal point for Fortran
Info << "Writing " << vrtFile.name() << endl;
Info<< "Writing " << vrtFile.name() << endl;
// build sorted table of contents
SortableList<label> toc(pointHash.size());

2
src/dynamicMesh/motionSolver/motionSolver.C
View File

@ -78,7 +78,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh)
word solverTypeName(msData);
Info << "Selecting motion solver: " << solverTypeName << endl;
Info<< "Selecting motion solver: " << solverTypeName << endl;
dlLibraryTable::open
(

10
src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
View File

@ -174,14 +174,14 @@ bool Foam::polyTopoChanger::changeTopology() const
{
Info<< "Modifier " << morphI << " named "
<< topoChanges[morphI].name();
if (curTriggerChange)
{
Info << " morphing" << endl;
Info<< " morphing" << endl;
}
else
{
Info << " unchanged" << endl;
Info<< " unchanged" << endl;
}
}
@ -195,7 +195,7 @@ bool Foam::polyTopoChanger::changeTopology() const
<< topoChanges[morphI].name() << " inactive" << endl;
}
}
}
return triggerChange;
@ -252,7 +252,7 @@ void Foam::polyTopoChanger::update(const mapPolyMesh& m)
// Force the mesh modifiers to auto-write. This allows us to
// preserve the current state of modifiers corresponding with
// the mesh.
// the mesh.
writeOpt() = IOobject::AUTO_WRITE;
instance() = mesh_.time().timeName();
}

6
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
View File

@ -91,7 +91,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
{
const face oldFace = slavePatch_[faceI];
const face oldLocalFace = slaveLocalFaces[faceI];
// Info << "old slave face " << faceI << ": " << oldFace << endl;
// Info<< "old slave face " << faceI << ": " << oldFace << endl;
const labelList& curEdges = slaveFaceEdges[faceI];
DynamicList<label> newFace(oldFace.size()*enrichedFaceRatio_);
@ -133,7 +133,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
const labelList& slavePointsOnEdge =
pointsIntoSlaveEdges[curEdges[i]];
// Info << "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl;
// Info<< "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl;
// If there are no points on the edge, skip everything
// If there is only one point, no need for sorting
if (slavePointsOnEdge.size())
@ -246,7 +246,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
{
const face& oldFace = masterPatch_[faceI];
const face& oldLocalFace = masterLocalFaces[faceI];
// Info << "old master face: " << oldFace << endl;
// Info<< "old master face: " << oldFace << endl;
const labelList& curEdges = masterFaceEdges[faceI];
DynamicList<label> newFace(oldFace.size()*enrichedFaceRatio_);

2
src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
View File

@ -1,4 +1,4 @@
Info << "\nReading g" << endl;
Info<< "\nReading g" << endl;
uniformDimensionedVectorField g
(
IOobject

2
src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
View File

@ -64,7 +64,7 @@ Foam::quadraticFitSnGradData::quadraticFitSnGradData
{
if (debug)
{
Info << "Contructing quadraticFitSnGradData" << endl;
Info<< "Contructing quadraticFitSnGradData" << endl;
}
// check input

8
src/finiteVolume/fvMesh/fvMesh.C
View File

@ -356,7 +356,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "Boundary and topological update" << endl;
Info<< "Boundary and topological update" << endl;
}
boundary_.readUpdate(boundaryMesh());
@ -368,7 +368,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "Topological update" << endl;
Info<< "Topological update" << endl;
}
clearOut();
@ -377,7 +377,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "Point motion update" << endl;
Info<< "Point motion update" << endl;
}
clearGeom();
@ -386,7 +386,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info << "No update" << endl;
Info<< "No update" << endl;
}
}

4
src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
View File

@ -153,7 +153,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
// Reference point
point p0 = this->mesh().faceCentres()[facei];
// Info << "Face " << facei << " at " << p0 << " stencil points at:\n"
// Info<< "Face " << facei << " at " << p0 << " stencil points at:\n"
// << C - p0 << endl;
// p0 -> p vector in the face-local coordinate system
@ -240,7 +240,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
// if (goodFit && iIt > 0)
// {
// Info << "FitData<Polynomial>::calcFit"
// Info<< "FitData<Polynomial>::calcFit"
// << "(const List<point>& C, const label facei" << nl
// << "Can now fit face " << facei << " iteration " << iIt
// << " with sum of weights " << sum(coeffsi) << nl

2
src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
View File

@ -54,7 +54,7 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
{
word diffTypeName(mdData);
Info << "Selecting motion diffusion: " << diffTypeName << endl;
Info<< "Selecting motion diffusion: " << diffTypeName << endl;
IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(diffTypeName);

2
src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
View File

@ -163,7 +163,7 @@ Foam::commonRailInjector::commonRailInjector
}
}
Info << "end constructor. in commonRail" << endl;
Info<< "end constructor. in commonRail" << endl;
}

6
src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
View File

@ -177,9 +177,9 @@ void Foam::multiHoleInjector::setTangentialVectors()
}
vector yp = zp^xp;
// Info << "xp = " << xp << endl;
// Info << "yp = " << yp << endl;
// Info << "zp = " << zp << endl;
// Info<< "xp = " << xp << endl;
// Info<< "yp = " << yp << endl;
// Info<< "zp = " << zp << endl;
scalar angle = 0.0;
scalar u = degToRad(umbrellaAngle_/2.0);

2
src/lagrangian/dieselSpray/parcel/parcel.C
View File

@ -616,7 +616,7 @@ void Foam::parcel::updateParcelProperties
{
if (n>100)
{
Info << "n = " << n << ", T = " << Td << ", pv = " << pAtSurface << endl;
Info<< "n = " << n << ", T = " << Td << ", pv = " << pAtSurface << endl;
}
}
}

4
src/lagrangian/dieselSpray/spray/spray.C
View File

@ -331,11 +331,11 @@ Foam::spray::spray
}
if (liquidToGasIndex_[i] == -1)
{
Info << "In composition:" << endl;
Info<< "In composition:" << endl;
for (label k=0; k<Ns; k++)
{
word specieName(composition_.Y()[k].name());
Info << specieName << endl;
Info<< specieName << endl;
}
FatalError<<

4
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
View File

@ -303,7 +303,7 @@ scalar RutlandFlashBoil::boilingTime
if (FgNeg > 0.0)
{
Info << "no convergence" << endl;
Info<< "no convergence" << endl;
}
@ -333,7 +333,7 @@ scalar RutlandFlashBoil::boilingTime
if (k >= Niter - 1)
{
Info << " No convergence for G " << endl;
Info<< " No convergence for G " << endl;
}
}
else

2
src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
View File

@ -159,7 +159,7 @@ bool reflectParcel::wallTreatment
/*
if (mag(Ub-v) > SMALL)
{
Info << "reflectParcel:: v = " << v
Info<< "reflectParcel:: v = " << v
<< ", Ub = " << Ub
<< ", facei = " << facei
<< ", patchi = " << patchi

2
src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
View File

@ -40,7 +40,7 @@ void Foam::referredCellList::buildReferredCellList
bool pointPointListBuild
)
{
Info << nl << "Building list of referred interaction neighbours" << endl;
Info<< nl << "Building list of referred interaction neighbours" << endl;
const polyMesh& mesh(il_.mesh());

10
src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
View File

@ -39,7 +39,7 @@ PtrList<volScalarField> allSpeciesRhoN
forAll (allSpeciesRhoN, rN)
{
Info << " Creating number density field for "
Info<< " Creating number density field for "
<< molecules.potential().idList()[rN] << endl;
allSpeciesRhoN.set
@ -94,7 +94,7 @@ PtrList<volScalarField> allSpeciesRhoM
forAll (allSpeciesRhoM, rM)
{
Info << " Creating mass density field for "
Info<< " Creating mass density field for "
<< molecules.potential().idList()[rM] << endl;
allSpeciesRhoM.set
@ -149,7 +149,7 @@ PtrList<volVectorField> allSpeciesVelocity
forAll (allSpeciesVelocity, v)
{
Info << " Creating velocity field for "
Info<< " Creating velocity field for "
<< molecules.potential().idList()[v] << endl;
allSpeciesVelocity.set
@ -223,7 +223,7 @@ PtrList<volScalarField> allSpeciesTemperature
forAll (allSpeciesTemperature, t)
{
Info << " Creating temperature field for "
Info<< " Creating temperature field for "
<< molecules.potential().idList()[t] << endl;
allSpeciesTemperature.set
@ -279,7 +279,7 @@ PtrList<volScalarField> allSpeciesMeanKE
forAll (allSpeciesMeanKE, mKE)
{
Info << " Creating mean kinetic energy field for "
Info<< " Creating mean kinetic energy field for "
<< molecules.potential().idList()[mKE] << endl;
allSpeciesMeanKE.set

2
src/lagrangian/molecularDynamics/molecule/mdTools/createRefUnits.H
View File

@ -11,7 +11,7 @@ IOobject reducedUnitsDictIOobject
if (reducedUnitsDictIOobject.headerOk())
{
Info << nl
Info<< nl
<< "Reading reference quantities from reducedUnitsDict file." << endl;
IOdictionary reducedUnitsDict(reducedUnitsDictIOobject);

2
src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
View File

@ -176,7 +176,7 @@ if (singleStepNMols)
/singleStepNMols
<< endl;
// Info << singleStepNMols << " "
// Info<< singleStepNMols << " "
// << singleStepTotalMomentum/singleStepTotalMass << " "
// << singleStepMaxVelocityMag << " "
// << singleStepTotalKE/singleStepNMols << " "

4
src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
View File

@ -53,7 +53,7 @@ if (runTime.outputTime())
{
if (accumulatedNMols)
{
Info << "calculating averages" << endl;
Info<< "calculating averages" << endl;
averageTemperature =
(
@ -77,7 +77,7 @@ if (runTime.outputTime())
meshVolume
);
Info << "----------------------------------------" << nl
Info<< "----------------------------------------" << nl
<< "Averaged properties" << nl
<< "Average |velocity| = "
<< mag(accumulatedTotalLinearMomentum)/accumulatedTotalMass << nl

4
src/lagrangian/molecularDynamics/potential/potential/potential.C
View File

@ -231,7 +231,7 @@ void Foam::potential::potential::readPotentialDict()
if (potentialDict.found("external"))
{
Info << nl << "Reading external forces:" << endl;
Info<< nl << "Reading external forces:" << endl;
const dictionary& externalDict = potentialDict.subDict("external");
@ -244,7 +244,7 @@ void Foam::potential::potential::readPotentialDict()
}
}
Info << nl << tab << "gravity = " << gravity_ << endl;
Info<< nl << tab << "gravity = " << gravity_ << endl;
}

20
src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
View File

@ -154,7 +154,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
singleEdges.setSize(nSingleEdges);
# ifdef DEBUG_ZIPUP
Info << "Cell " << cellI << endl;
Info<< "Cell " << cellI << endl;
forAll (curFaces, faceI)
{
@ -274,7 +274,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
Info << "start head blocked" << endl;
Info<< "start head blocked" << endl;
# endif
blockHead = true;
@ -285,7 +285,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
Info << "start tail blocked" << endl;
Info<< "start tail blocked" << endl;
# endif
blockTail = true;
@ -369,7 +369,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
Info << "head blocked" << endl;
Info<< "head blocked" << endl;
# endif
blockHead = true;
@ -380,7 +380,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
if (pointUsage[pointI] > 2)
{
# ifdef DEBUG_CHAIN
Info << "tail blocked" << endl;
Info<< "tail blocked" << endl;
# endif
blockTail = true;
@ -392,7 +392,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
if (curEdgeStart == curEdgeEnd)
{
# ifdef DEBUG_CHAIN
Info << "closed loop" << endl;
Info<< "closed loop" << endl;
# endif
pointChain.removeHead();
@ -415,7 +415,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
}
# ifdef DEBUG_CHAIN
Info << "completed patch chain: " << pointChain << endl;
Info<< "completed patch chain: " << pointChain << endl;
# endif
if (pointChain.size() > 2)
@ -428,7 +428,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
edgesToInsert.setSize(nEdgesToInsert);
# ifdef DEBUG_ZIPUP
Info << "edgesToInsert: " << edgesToInsert << endl;
Info<< "edgesToInsert: " << edgesToInsert << endl;
# endif
// Insert the edges into a list of faces
@ -588,7 +588,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
# ifdef DEBUG_ZIPUP
if (allPointsPresent)
{
Info << "All points present" << endl;
Info<< "All points present" << endl;
}
# endif
@ -605,7 +605,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
edgeList newFaceEdges = newFace.edges();
# ifdef DEBUG_ZIPUP
Info << "Not all points present." << endl;
Info<< "Not all points present." << endl;
# endif
label nNewFacePoints = 0;

22
src/sampling/include/mapPatch.H
View File

@ -1,8 +1,8 @@
if(planeMapping && targetPatchNamePresent && cut.cut())
{
//Map variables U, phi & k
//Info << typeInfo("isoLESmodel") << endl;
//Info << "SGS model" << sgsModel.type() << endl;
//Info<< typeInfo("isoLESmodel") << endl;
//Info<< "SGS model" << sgsModel.type() << endl;
scalarField planek(cutCells.size());
scalarField planeNuTilda(cutCells.size());
@ -23,21 +23,21 @@
if(sgsModel.type() == "SpalartAllmaras")
{
Info << "Mapping NuTilda." << endl;
Info<< "Mapping NuTilda." << endl;
sgsModel.nuTilda()().boundaryField()[targetPatchNumber] ==
interPatch.faceInterpolate(planeNuTilda)();
}
else
{
Info << "Mapping k." << endl;
Info<< "Mapping k." << endl;
sgsModel.k()().boundaryField()[targetPatchNumber] ==
interPatch.faceInterpolate(planek)();
}
U.boundaryField()[targetPatchNumber] ==
interPatch.faceInterpolate(planeU)();
/* sgsModel.k()().boundaryField()[targetPatchNumber] ==
/* sgsModel.k()().boundaryField()[targetPatchNumber] ==
toPatchInter.pointToFaceInterpolate
(
interPatch.pointInterpolate
@ -49,7 +49,7 @@
)
);
U.boundaryField()[targetPatchNumber] ==
U.boundaryField()[targetPatchNumber] ==
toPatchInter.pointToFaceInterpolate
(
interPatch.pointInterpolate
@ -62,7 +62,7 @@
);
*/
scalar Q = sum
(
mesh.Sf().boundaryField()[targetPatchNumber]
@ -74,11 +74,11 @@
mesh.Sf().boundaryField()[targetPatchNumber] &
Ubar.value()
);
U.boundaryField()[targetPatchNumber] ==
U.boundaryField()[targetPatchNumber] * (Qbar/Q);
Info << "Mass flux correction factor: " << (Qbar/Q) << endl;
Info<< "Mass flux correction factor: " << (Qbar/Q) << endl;
phi.boundaryField()[targetPatchNumber] ==
(

6
src/surfMesh/surfMesh/surfMeshIO.C
View File

@ -75,7 +75,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
// Topological change
if (debug)
{
Info << "Topological change" << endl;
Info<< "Topological change" << endl;
}
clearOut();
@ -169,7 +169,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
// Points moved
if (debug)
{
Info << "Point motion" << endl;
Info<< "Point motion" << endl;
}
clearGeom();
@ -195,7 +195,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
{
if (debug)
{
Info << "No change" << endl;
Info<< "No change" << endl;
}
}

2
src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
View File

@ -307,7 +307,7 @@ void Foam::radiation::fvDOM::calculate()
maxResidual = max(maxBandResidual, maxResidual);
}
Info << "Radiation solver iter: " << radIter << endl;
Info<< "Radiation solver iter: " << radIter << endl;
} while(maxResidual > convergence_ && radIter < maxIter_);

20
src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
View File

@ -137,11 +137,11 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
List<cellZone*> cz(0);
Info << "Adding point, face and cell zones" << endl;
Info<< "Adding point, face and cell zones" << endl;
addZones(pz, fz, cz);
// Add a topology modifier
Info << "Adding topology modifiers" << endl;
Info<< "Adding topology modifiers" << endl;
topoChanger_.setSize(1);
topoChanger_.set
(
@ -249,11 +249,11 @@ bool Foam::linearValveFvMesh::attached() const
if (result)
{
Info << "linearValveFvMesh: attached!" << endl;
Info<< "linearValveFvMesh: attached!" << endl;
}
else
{
Info << "linearValveFvMesh: detached!" << endl;
Info<< "linearValveFvMesh: detached!" << endl;
}
return result;
@ -299,7 +299,7 @@ void Foam::linearValveFvMesh::update()
// Detaching the interface
if (attached())
{
Info << "Decoupling sliding interfaces" << endl;
Info<< "Decoupling sliding interfaces" << endl;
makeSlidersLive();
// Changing topology by hand
@ -311,7 +311,7 @@ void Foam::linearValveFvMesh::update()
}
else
{
Info << "Sliding interfaces decoupled" << endl;
Info<< "Sliding interfaces decoupled" << endl;
}
// Perform mesh motion
@ -328,7 +328,7 @@ void Foam::linearValveFvMesh::update()
{
if (topoChangeMap().hasMotionPoints())
{
Info << "Topology change; executing pre-motion" << endl;
Info<< "Topology change; executing pre-motion" << endl;
movePoints(topoChangeMap().preMotionPoints());
}
}
@ -339,17 +339,17 @@ void Foam::linearValveFvMesh::update()
movePoints(msPtr_->curPoints());
// Attach the interface
Info << "Coupling sliding interfaces" << endl;
Info<< "Coupling sliding interfaces" << endl;
makeSlidersLive();
resetMorph();
setMorphTimeIndex(3*time().timeIndex() + 2);
updateMesh();
Info << "Moving points post slider attach" << endl;
Info<< "Moving points post slider attach" << endl;
msPtr_->updateMesh();
Info << "Sliding interfaces coupled: " << attached() << endl;
Info<< "Sliding interfaces coupled: " << attached() << endl;
}

16
src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
View File

@ -164,7 +164,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
);
Info << "Adding point and face zones" << endl;
Info<< "Adding point and face zones" << endl;
addZones(pz, fz, cz);
// Add a topology modifier
@ -204,7 +204,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
);
Info << "Adding topology modifiers" << endl;
Info<< "Adding topology modifiers" << endl;
addTopologyModifiers(tm);
// Write mesh
@ -375,7 +375,7 @@ void Foam::linearValveLayersFvMesh::update()
// Detaching the interface
if (attached())
{
Info << "Decoupling sliding interfaces" << endl;
Info<< "Decoupling sliding interfaces" << endl;
makeSlidersLive();
// Changing topology
@ -385,7 +385,7 @@ void Foam::linearValveLayersFvMesh::update()
}
else
{
Info << "Sliding interfaces decoupled" << endl;
Info<< "Sliding interfaces decoupled" << endl;
}
// Perform layer action and mesh motion
@ -400,7 +400,7 @@ void Foam::linearValveLayersFvMesh::update()
{
if (topoChangeMap().hasMotionPoints())
{
Info << "Topology change; executing pre-motion" << endl;
Info<< "Topology change; executing pre-motion" << endl;
movePoints(topoChangeMap().preMotionPoints());
}
}
@ -409,7 +409,7 @@ void Foam::linearValveLayersFvMesh::update()
movePoints(newPoints());
// Attach the interface
Info << "Coupling sliding interfaces" << endl;
Info<< "Coupling sliding interfaces" << endl;
makeSlidersLive();
// Changing topology
@ -417,11 +417,11 @@ void Foam::linearValveLayersFvMesh::update()
setMorphTimeIndex(3*time().timeIndex() + 2);
updateMesh();
Info << "Moving points post slider attach" << endl;
Info<< "Moving points post slider attach" << endl;
// const pointField p = allPoints();
// movePoints(p);
Info << "Sliding interfaces coupled: " << attached() << endl;
Info<< "Sliding interfaces coupled: " << attached() << endl;
}

8
src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
View File

@ -156,7 +156,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
}
movingCells.setSize(nMovingCells);
Info << "Number of cells in the moving region: " << nMovingCells << endl;
Info<< "Number of cells in the moving region: " << nMovingCells << endl;
cz[0] = new cellZone
(
@ -166,11 +166,11 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
cellZones()
);
Info << "Adding point, face and cell zones" << endl;
Info<< "Adding point, face and cell zones" << endl;
addZones(pz, fz, cz);
// Add a topology modifier
Info << "Adding topology modifiers" << endl;
Info<< "Adding topology modifiers" << endl;
topoChanger_.setSize(1);
topoChanger_.set
(
@ -361,7 +361,7 @@ bool Foam::mixerFvMesh::update()
{
if (debug)
{
Info << "Mesh topology is changing" << endl;
Info<< "Mesh topology is changing" << endl;
}
deleteDemandDrivenData(movingPointsMaskPtr_);

20
src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
View File

@ -146,7 +146,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
flipZone2[nZoneFaces2] = true;
}
Info << "face " << faceI << " for zone 2. Flip: "
Info<< "face " << faceI << " for zone 2. Flip: "
<< flipZone2[nZoneFaces2] << endl;
nZoneFaces2++;
}
@ -158,8 +158,8 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
zone2.setSize(nZoneFaces2);
flipZone2.setSize(nZoneFaces2);
Info << "zone: " << zone1 << endl;
Info << "zone: " << zone2 << endl;
Info<< "zone: " << zone1 << endl;
Info<< "zone: " << zone2 << endl;
List<pointZone*> pz(0);
List<faceZone*> fz(2);
@ -191,7 +191,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
fz.setSize(nFz);
Info << "Adding mesh zones." << endl;
Info<< "Adding mesh zones." << endl;
addZones(pz, fz, cz);
@ -236,7 +236,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
nMods++;
tm.setSize(nMods);
Info << "Adding " << nMods << " mesh modifiers" << endl;
Info<< "Adding " << nMods << " mesh modifiers" << endl;
topoChanger_.addTopologyModifiers(tm);
write();
@ -334,11 +334,11 @@ bool Foam::movingConeTopoFvMesh::update()
if (topoChangeMap.valid())
{
Info << "Topology change. Calculating motion points" << endl;
Info<< "Topology change. Calculating motion points" << endl;
if (topoChangeMap().hasMotionPoints())
{
Info << "Topology change. Has premotion points" << endl;
Info<< "Topology change. Has premotion points" << endl;
//Info<< "preMotionPoints:" << topoChangeMap().preMotionPoints()
// << endl;
@ -390,7 +390,7 @@ bool Foam::movingConeTopoFvMesh::update()
}
else
{
Info << "Topology change. Already set mesh points" << endl;
Info<< "Topology change. Already set mesh points" << endl;
motionMask_ =
vertexMarkup
@ -424,7 +424,7 @@ bool Foam::movingConeTopoFvMesh::update()
}
else
{
Info << "No topology change" << endl;
Info<< "No topology change" << endl;
// Set the mesh motion
newPoints =
points()
@ -466,7 +466,7 @@ bool Foam::movingConeTopoFvMesh::update()
// The mesh now contains the cells with zero volume
Info << "Executing mesh motion" << endl;
Info<< "Executing mesh motion" << endl;
movePoints(newPoints);
// The mesh now has got non-zero volume cells