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

Info -> InfoInFunction and updated comments

Browse Source
This commit is contained in:
Henry Weller
2016-01-20 16:21:37 +00:00
parent 34d4cfaca3
commit 5779e4fd16
35 changed files with 134 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C
View File

@ -50,9 +50,7 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
{
if (fv::debug)
{
Info<< "d2dt2Scheme<Type>::New(const fvMesh&, Istream&) : "
"constructing d2dt2Scheme<Type>"
<< endl;
InfoInFunction << "Constructing d2dt2Scheme<Type>" << endl;
}
if (schemeData.eof())

3
src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
View File

@ -456,9 +456,6 @@ SLTSDdtScheme<Type>::fvmDdt
scalarField rDeltaT(SLrDeltaT()().internalField());
Info<< "SLTSDdtScheme<Type>::fvmDdt: max/min rDeltaT "
<< gMax(rDeltaT) << " " << gMin(rDeltaT) << endl;
fvm.diag() = rDeltaT*mesh().V();
if (mesh().moving())

7
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
View File

@ -50,9 +50,7 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::New
{
if (fv::debug)
{
Info<< "ddtScheme<Type>::New(const fvMesh&, Istream&) : "
"constructing ddtScheme<Type>"
<< endl;
InfoInFunction << "Constructing ddtScheme<Type>" << endl;
}
if (schemeData.eof())
@ -166,7 +164,8 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
if (debug > 1)
{
Info<< "ddtCouplingCoeff mean max min = "
InfoInFunction
<< "ddtCouplingCoeff mean max min = "
<< gAverage(ddtCouplingCoeff.internalField())
<< " " << gMax(ddtCouplingCoeff.internalField())
<< " " << gMin(ddtCouplingCoeff.internalField())

4
src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C
View File

@ -51,9 +51,7 @@ tmp<divScheme<Type>> divScheme<Type>::New
{
if (fv::debug)
{
Info<< "divScheme<Type>::New(const fvMesh&, Istream&) : "
"constructing divScheme<Type>"
<< endl;
InfoInFunction << "Constructing divScheme<Type>" << endl;
}
if (schemeData.eof())

9
src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
View File

@ -54,9 +54,7 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
{
if (debug)
{
Info<< "LeastSquaresVectors::calcLeastSquaresVectors() :"
<< "Calculating least square gradient vectors"
<< endl;
InfoInFunction << "Calculating least square gradient vectors" << endl;
}
const fvMesh& mesh = this->mesh_;
@ -100,9 +98,8 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
if (debug)
{
Info<< "LeastSquaresVectors::calcLeastSquaresVectors() :"
<< "Finished calculating least square gradient vectors"
<< endl;
InfoInFunction
<< "Finished calculating least square gradient vectors" << endl;
}
}

11
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
{
if (debug)
{
Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
<< "Calculating least square gradient vectors"
<< endl;
InfoInFunction << "Calculating least square gradient vectors" << endl;
}
const fvMesh& mesh = mesh_;
@ -170,9 +168,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
if (debug)
{
Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
<< "Finished calculating least square gradient vectors"
<< endl;
InfoInFunction
<<"Finished calculating least square gradient vectors" << endl;
}
}

11
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
{
if (debug)
{
Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
<< "Calculating least square gradient vectors"
<< endl;
InfoInFunction << "Calculating least square gradient vectors" << endl;
}
const fvMesh& mesh = mesh_;
@ -209,9 +207,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
if (debug)
{
Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
<< "Finished calculating least square gradient vectors"
<< endl;
InfoInFunction
<< "Finished calculating least square gradient vectors" << endl;
}
}

11
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
{
if (debug)
{
Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
<< "Calculating least square gradient vectors"
<< endl;
InfoInFunction << "Calculating least square gradient vectors" << endl;
}
const fvMesh& mesh = mesh_;
@ -166,9 +164,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
if (debug)
{
Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
<< "Finished calculating least square gradient vectors"
<< endl;
InfoInFunction
<< "Finished calculating least square gradient vectors" << endl;
}
}

4
src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C
View File

@ -49,9 +49,7 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
{
if (fv::debug)
{
Info<< "laplacianScheme<Type, GType>::New(const fvMesh&, Istream&) : "
"constructing laplacianScheme<Type, GType>"
<< endl;
InfoInFunction << "Constructing laplacianScheme<Type, GType>" << endl;
}
if (schemeData.eof())

7
src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C
View File

@ -52,16 +52,15 @@ Foam::CentredFitSnGradData<Polynomial>::CentredFitSnGradData
{
if (debug)
{
Info<< "Contructing CentredFitSnGradData<Polynomial>" << endl;
InfoInFunction
<< "Contructing CentredFitSnGradData<Polynomial>" << endl;
}
calcFit();
if (debug)
{
Info<< "CentredFitSnGradData<Polynomial>::CentredFitSnGradData() :"
<< "Finished constructing polynomialFit data"
<< endl;
Info<< " Finished constructing polynomialFit data" << endl;
}
}

3
src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C
View File

@ -76,7 +76,8 @@ limitedSnGrad<Type>::correction
if (fv::debug)
{
Info<< "limitedSnGrad :: limiter min: " << min(limiter.internalField())
InfoInFunction
<< "limiter min: " << min(limiter.internalField())
<< " max: "<< max(limiter.internalField())
<< " avg: " << average(limiter.internalField()) << endl;
}

30
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -280,10 +280,8 @@ Foam::fvMatrix<Type>::fvMatrix
{
if (debug)
{
Info<< "fvMatrix<Type>(GeometricField<Type, fvPatchField, volMesh>&,"
" const dimensionSet&) : "
"constructing fvMatrix<Type> for field " << psi_.name()
<< endl;
InfoInFunction
<< "Constructing fvMatrix<Type> for field " << psi_.name() << endl;
}
// Initialise coupling coefficients
@ -334,9 +332,8 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
{
if (debug)
{
Info<< "fvMatrix<Type>::fvMatrix(const fvMatrix<Type>&) : "
<< "copying fvMatrix<Type> for field " << psi_.name()
<< endl;
InfoInFunction
<< "Copying fvMatrix<Type> for field " << psi_.name() << endl;
}
if (fvm.faceFluxCorrectionPtr_)
@ -381,9 +378,8 @@ Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
{
if (debug)
{
Info<< "fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>&) : "
<< "copying fvMatrix<Type> for field " << psi_.name()
<< endl;
InfoInFunction
<< "Copying fvMatrix<Type> for field " << psi_.name() << endl;
}
if (tfvm().faceFluxCorrectionPtr_)
@ -425,10 +421,8 @@ Foam::fvMatrix<Type>::fvMatrix
{
if (debug)
{
Info<< "fvMatrix<Type>"
"(GeometricField<Type, fvPatchField, volMesh>&, Istream&) : "
"constructing fvMatrix<Type> for field " << psi_.name()
<< endl;
InfoInFunction
<< "Constructing fvMatrix<Type> for field " << psi_.name() << endl;
}
// Initialise coupling coefficients
@ -463,9 +457,8 @@ Foam::fvMatrix<Type>::~fvMatrix()
{
if (debug)
{
Info<< "fvMatrix<Type>::~fvMatrix<Type>() : "
<< "destroying fvMatrix<Type> for field " << psi_.name()
<< endl;
InfoInFunction
<< "Destroying fvMatrix<Type> for field " << psi_.name() << endl;
}
if (faceFluxCorrectionPtr_)
@ -526,8 +519,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
if (debug)
{
InfoInFunction
<< "Relaxing " << psi_.name() << " by " << alpha
<< endl;
<< "Relaxing " << psi_.name() << " by " << alpha << endl;
}
Field<Type>& S = source();

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -125,8 +125,7 @@ void Foam::fvMesh::clearAddressing(const bool isMeshUpdate)
{
if (debug)
{
Info<< "fvMesh::clearAddressing(const bool) :"
<< " isMeshUpdate:" << isMeshUpdate << endl;
InfoInFunction << "isMeshUpdate: " << isMeshUpdate << endl;
}
if (isMeshUpdate)
@ -167,7 +166,7 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
{
if (debug)
{
Info<< "fvMesh::storeOldVol(const scalarField&) :"
InfoInFunction
<< " Storing old time volumes since from time " << curTimeIndex_
<< " and time now " << time().timeIndex()
<< " V:" << V.size()
@ -214,12 +213,12 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
if (debug)
{
Info<< "fvMesh::storeOldVol() :"
InfoInFunction
<< " Stored old time volumes V0:" << V0Ptr_->size()
<< endl;
if (V00Ptr_)
{
Info<< "fvMesh::storeOldVol() :"
InfoInFunction
<< " Stored oldold time volumes V00:" << V00Ptr_->size()
<< endl;
}
@ -265,8 +264,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
{
if (debug)
{
Info<< "Constructing fvMesh from IOobject"
<< endl;
InfoInFunction << "Constructing fvMesh from IOobject" << endl;
}
// Check the existance of the cell volumes and read if present
@ -376,7 +374,7 @@ Foam::fvMesh::fvMesh
{
if (debug)
{
Info<< "Constructing fvMesh from cellShapes" << endl;
InfoInFunction << "Constructing fvMesh from cellShapes" << endl;
}
}
@ -410,7 +408,7 @@ Foam::fvMesh::fvMesh
{
if (debug)
{
Info<< "Constructing fvMesh from components" << endl;
InfoInFunction << "Constructing fvMesh from components" << endl;
}
}
@ -443,7 +441,7 @@ Foam::fvMesh::fvMesh
{
if (debug)
{
Info<< "Constructing fvMesh from components" << endl;
InfoInFunction << "Constructing fvMesh from components" << endl;
}
}
@ -481,9 +479,7 @@ void Foam::fvMesh::removeFvBoundary()
{
if (debug)
{
Info<< "void fvMesh::removeFvBoundary(): "
<< "Removing boundary patches."
<< endl;
InfoInFunction << "Removing boundary patches." << endl;
}
// Remove fvBoundaryMesh data first.
@ -499,8 +495,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
{
if (debug)
{
Info<< "polyMesh::readUpdateState fvMesh::readUpdate() : "
<< "Updating fvMesh. ";
InfoInFunction << "Updating fvMesh. ";
}
polyMesh::readUpdateState state = polyMesh::readUpdate();
@ -568,7 +563,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
{
if (debug)
{
Info<< "fvMesh::mapFields :"
InfoInFunction
<< " nOldCells:" << meshMap.nOldCells()
<< " nCells:" << nCells()
<< " nOldFaces:" << meshMap.nOldFaces()

27
src/finiteVolume/fvMesh/fvMeshGeometry.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -81,9 +81,7 @@ void fvMesh::makeMagSf() const
{
if (debug)
{
Info<< "void fvMesh::makeMagSf() : "
<< "assembling mag face areas"
<< endl;
InfoInFunction << "Assembling mag face areas" << endl;
}
// It is an error to attempt to recalculate
@ -119,9 +117,7 @@ void fvMesh::makeC() const
{
if (debug)
{
Info<< "void fvMesh::makeC() : "
<< "assembling cell centres"
<< endl;
InfoInFunction << "Assembling cell centres" << endl;
}
// It is an error to attempt to recalculate
@ -161,9 +157,7 @@ void fvMesh::makeCf() const
{
if (debug)
{
Info<< "void fvMesh::makeCf() : "
<< "assembling face centres"
<< endl;
InfoInFunction << "Assembling face centres" << endl;
}
// It is an error to attempt to recalculate
@ -202,9 +196,8 @@ const volScalarField::DimensionedInternalField& fvMesh::V() const
{
if (debug)
{
Info<< "fvMesh::V() const: "
<< "constructing from primitiveMesh::cellVolumes()"
<< endl;
InfoInFunction
<< "Constructing from primitiveMesh::cellVolumes()" << endl;
}
VPtr_ = new slicedVolScalarField::DimensionedInternalField
@ -260,9 +253,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V00() const
{
if (debug)
{
Info<< "fvMesh::V00() const: "
<< "constructing from V0"
<< endl;
InfoInFunction << "Constructing from V0" << endl;
}
V00Ptr_ = new DimensionedField<scalar, volMesh>
@ -392,9 +383,7 @@ tmp<surfaceVectorField> fvMesh::delta() const
{
if (debug)
{
Info<< "void fvMesh::delta() : "
<< "calculating face deltas"
<< endl;
InfoInFunction << "Calculating face deltas" << endl;
}
tmp<surfaceVectorField> tdelta

6
src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,9 +37,7 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
{
if (debug)
{
Info<< "fvPatch::New(const polyPatch&, const fvBoundaryMesh&) : "
<< "constructing fvPatch"
<< endl;
InfoInFunction << "Constructing fvPatch" << endl;
}
polyPatchConstructorTable::iterator cstrIter =

6
src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
View File

@ -54,16 +54,14 @@ Foam::CentredFitData<Polynomial>::CentredFitData
{
if (debug)
{
Info<< "Contructing CentredFitData<Polynomial>" << endl;
InfoInFunction << "Contructing CentredFitData<Polynomial>" << endl;
}
calcFit();
if (debug)
{
Info<< "CentredFitData<Polynomial>::CentredFitData() :"
<< "Finished constructing polynomialFit data"
<< endl;
Info<< "Finished constructing polynomialFit data" << endl;
}
}

6
src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
View File

@ -55,16 +55,14 @@ Foam::UpwindFitData<Polynomial>::UpwindFitData
{
if (debug)
{
Info<< "Contructing UpwindFitData<Polynomial>" << endl;
InfoInFunction << "Contructing UpwindFitData<Polynomial>" << endl;
}
calcFit();
if (debug)
{
Info<< "UpwindFitData<Polynomial>::UpwindFitData() :"
<< "Finished constructing polynomialFit data"
<< endl;
Info<< " Finished constructing polynomialFit data" << endl;
}
}

13
src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,9 +67,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
{
if (debug)
{
Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
<< "Calculating skew correction vectors"
<< endl;
InfoInFunction << "Calculating skew correction vectors" << endl;
}
// Set local references to mesh data
@ -135,8 +133,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
if (debug)
{
Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
<< "skew coefficient = " << skewCoeff << endl;
InfoInFunction << "skew coefficient = " << skewCoeff << endl;
}
if (skewCoeff < 1e-5)
@ -150,9 +147,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
if (debug)
{
Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
<< "Finished constructing skew correction vectors"
<< endl;
Info<< " Finished constructing skew correction vectors" << endl;
}
}

2
src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C
View File

@ -89,7 +89,7 @@ Foam::tabulated6DoFAcceleration::acceleration() const
values_
);
Info<< "tabulated6DoFAcceleration::acceleration(): "
InfoInFunction
<< "Time = " << t << " accelerations: " << avs << endl;
return avs;

5
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,8 +46,7 @@ void Foam::ParticleTracks<CloudType>::write()
{
if (debug)
{
Info<< "void Foam::ParticleTracks<CloudType>::write()" << nl
<< "cloupPtr invalid" << endl;
InfoInFunction << "cloupPtr invalid" << endl;
}
}
}

6
src/mesh/blockMesh/curvedEdges/curvedEdge.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -81,9 +81,7 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
{
if (debug)
{
Info<< "curvedEdge::New(const pointField&, Istream&) : "
<< "constructing curvedEdge"
<< endl;
InfoInFunction << "Constructing curvedEdge" << endl;
}
const word edgeType(is);

4
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C
View File

@ -60,7 +60,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
procI = -1;
if (debug)
{
Info<< "AMIInterpolation::calcDistribution: "
InfoInFunction
<< "AMI split across multiple processors" << endl;
}
}
@ -69,7 +69,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
procI = findIndex(facesPresentOnProc, 1);
if (debug)
{
Info<< "AMIInterpolation::calcDistribution: "
InfoInFunction
<< "AMI local to processor" << procI << endl;
}
}

6
src/meshTools/searchableSurface/searchablePlate.C
View File

@ -31,10 +31,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchablePlate, 0);
addToRunTimeSelectionTable(searchableSurface, searchablePlate, dict);
}
@ -220,7 +218,7 @@ Foam::searchablePlate::searchablePlate
{
if (debug)
{
Info<< "searchablePlate::searchablePlate :"
InfoInFunction
<< " origin:" << origin_
<< " origin+span:" << origin_+span_
<< " normal:" << vector::componentNames[normalDir_]
@ -244,7 +242,7 @@ Foam::searchablePlate::searchablePlate
{
if (debug)
{
Info<< "searchablePlate::searchablePlate :"
InfoInFunction
<< " origin:" << origin_
<< " origin+span:" << origin_+span_
<< " normal:" << vector::componentNames[normalDir_]

10
src/meshTools/searchableSurface/triSurfaceMesh.C
View File

@ -98,7 +98,6 @@ addToRunTimeSelectionTable(searchableSurface, triSurfaceMesh, dict);
//}
//- Check file existence
const Foam::fileName& Foam::triSurfaceMesh::checkFile
(
const fileName& fName,
@ -690,10 +689,10 @@ void Foam::triSurfaceMesh::getNormal
if (info[i].hit())
{
label faceI = info[i].index();
//- Cached:
// Cached:
//normal[i] = faceNormals()[faceI];
//- Uncached
// Uncached
normal[i] = s[faceI].normal(pts);
normal[i] /= mag(normal[i]) + VSMALL;
}
@ -784,16 +783,12 @@ void Foam::triSurfaceMesh::getVolumeType
// - use cached volume type per each tree node
volType[pointI] = tree().getVolumeType(pt);
}
// Info<< "octree : " << pt << " = "
// << volumeType::names[volType[pointI]] << endl;
}
indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
}
//- Write using given format, version and compression
bool Foam::triSurfaceMesh::writeObject
(
IOstream::streamFormat fmt,
@ -815,7 +810,6 @@ bool Foam::triSurfaceMesh::writeObject
return false;
}
//return objectRegistry::writeObject(fmt, ver, cmp);
return true;
}

6
src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -112,7 +112,7 @@ Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
if (debug)
{
Info<< "pointToPointPlanarInterpolation::calcCoordinateSystem :"
InfoInFunction
<< " Used points " << p0 << ' ' << points[index1]
<< ' ' << points[index2]
<< " to define coordinate system with normal " << n << endl;
@ -204,7 +204,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
if (debug)
{
Info<< "pointToPointPlanarInterpolation::calcWeights :"
InfoInFunction
<< " Perturbing points with " << perturb_
<< " fraction of a random position inside " << bb
<< " to break any ties on regular meshes."

26
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
View File

@ -922,7 +922,7 @@ bool Foam::distributedTriSurfaceMesh::overlaps
triBb.max() = max(triBb.max(), p1);
triBb.max() = max(triBb.max(), p2);
//- Exact test of triangle intersecting bb
// Exact test of triangle intersecting bb
// Quick rejection. If whole bounding box of tri is outside cubeBb then
// there will be no intersection.
@ -1313,7 +1313,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
if (debug)
{
Info<< "Constructed from triSurface:" << endl;
InfoInFunction << "Constructed from triSurface:" << endl;
writeStats(Info);
labelList nTris(Pstream::nProcs());
@ -1390,7 +1390,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
if (debug)
{
Info<< "Read distributedTriSurface from " << io.objectPath()
InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
<< ':' << endl;
writeStats(Info);
@ -1473,7 +1473,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
if (debug)
{
Info<< "Read distributedTriSurface from " << io.objectPath()
InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
<< " and dictionary:" << endl;
writeStats(Info);
@ -2084,13 +2084,6 @@ void Foam::distributedTriSurfaceMesh::distribute
break;
}
//if (debug)
//{
// Info<< "old bb:" << procBb_ << endl << endl;
// Info<< "new bb:" << newProcBb << endl << endl;
// Info<< "Same:" << (newProcBb == procBb_) << endl;
//}
if (newProcBb == procBb_)
{
return;
@ -2111,9 +2104,8 @@ void Foam::distributedTriSurfaceMesh::distribute
Pstream::gatherList(nTris);
Pstream::scatterList(nTris);
Info<< "distributedTriSurfaceMesh::distribute : before distribution:"
<< endl
<< "\tproc\ttris" << endl;
InfoInFunction
<< "before distribution:" << endl << "\tproc\ttris" << endl;
forAll(nTris, procI)
{
@ -2368,9 +2360,8 @@ void Foam::distributedTriSurfaceMesh::distribute
Pstream::gatherList(nTris);
Pstream::scatterList(nTris);
Info<< "distributedTriSurfaceMesh::distribute : after distribution:"
<< endl
<< "\tproc\ttris" << endl;
InfoInFunction
<< "after distribution:" << endl << "\tproc\ttris" << endl;
forAll(nTris, procI)
{
@ -2381,7 +2372,6 @@ void Foam::distributedTriSurfaceMesh::distribute
}
//- Write using given format, version and compression
bool Foam::distributedTriSurfaceMesh::writeObject
(
IOstream::streamFormat fmt,

19
src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
View File

@ -56,8 +56,7 @@ void Foam::nearWallFields::calcAddressing()
if (debug)
{
Info<< "nearWallFields::calcAddressing() :"
<< " nPatchFaces:" << globalWalls.size() << endl;
InfoInFunction << "nPatchFaces: " << globalWalls.size() << endl;
}
// Construct cloud
@ -139,8 +138,7 @@ void Foam::nearWallFields::calcAddressing()
mesh.time().path()
/"wantedTracks_" + mesh.time().timeName() + ".obj"
);
Info<< "nearWallFields::calcAddressing() :"
<< "Dumping tracks to " << str.name() << endl;
InfoInFunction << "Dumping tracks to " << str.name() << endl;
forAllConstIter(Cloud<findCellParticle>, cloud, iter)
{
@ -202,8 +200,7 @@ void Foam::nearWallFields::calcAddressing()
mesh.time().path()
/"obtainedTracks_" + mesh.time().timeName() + ".obj"
);
Info<< "nearWallFields::calcAddressing() :"
<< "Dumping obtained to " << str.name() << endl;
InfoInFunction << "Dumping obtained to " << str.name() << endl;
forAll(cellToWalls_, cellI)
{
@ -256,7 +253,7 @@ Foam::nearWallFields::~nearWallFields()
{
if (debug)
{
Info<< "nearWallFields::~nearWallFields()" << endl;
InfoInFunction << endl;
}
}
@ -267,7 +264,7 @@ void Foam::nearWallFields::read(const dictionary& dict)
{
if (debug)
{
Info<< "nearWallFields::read(const dictionary&)" << endl;
InfoInFunction << endl;
}
if (active_)
@ -317,7 +314,7 @@ void Foam::nearWallFields::execute()
{
if (debug)
{
Info<< "nearWallFields:execute()" << endl;
InfoInFunction << endl;
}
@ -363,7 +360,7 @@ void Foam::nearWallFields::end()
{
if (debug)
{
Info<< "nearWallFields:end()" << endl;
InfoInFunction << endl;
}
if (active_)
@ -383,7 +380,7 @@ void Foam::nearWallFields::write()
{
if (debug)
{
Info<< "nearWallFields:write()" << endl;
InfoInFunction << endl;
}
if (active_)

2
src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

7
src/sampling/meshToMesh/meshToMeshParallelOps.C
View File

@ -63,7 +63,7 @@ Foam::label Foam::meshToMesh::calcDistribution
procI = -1;
if (debug)
{
Info<< "meshToMesh::calcDistribution: "
InfoInFunction
<< "Meshes split across multiple processors" << endl;
}
}
@ -72,7 +72,7 @@ Foam::label Foam::meshToMesh::calcDistribution
procI = findIndex(cellsPresentOnProc, 1);
if (debug)
{
Info<< "meshToMesh::calcDistribution: "
InfoInFunction
<< "Meshes local to processor" << procI << endl;
}
}
@ -138,7 +138,8 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
if (debug)
{
Info<< "Determining extent of src mesh per processor:" << nl
InfoInFunction
<< "Determining extent of src mesh per processor:" << nl
<< "\tproc\tbb" << endl;
forAll(procBb, procI)
{

13
src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -41,8 +41,8 @@ void Foam::meshToMesh0::calcAddressing()
{
if (debug)
{
Info<< "meshToMesh0::calculateAddressing() : "
<< "calculating mesh-to-mesh cell addressing" << endl;
InfoInFunction
<< "Calculating mesh-to-mesh cell addressing" << endl;
}
// set reference to cells
@ -62,8 +62,7 @@ void Foam::meshToMesh0::calcAddressing()
if (debug)
{
Info<< "meshToMesh0::calculateAddressing() : "
<< "Setting up rescue" << endl;
InfoInFunction << "Setting up rescue" << endl;
}
List<bool> boundaryCell(fromCells.size(), false);
@ -203,8 +202,8 @@ void Foam::meshToMesh0::calcAddressing()
if (debug)
{
Info<< "meshToMesh0::calculateAddressing() : "
<< "finished calculating mesh-to-mesh cell addressing" << endl;
InfoInFunction
<< "Finished calculating mesh-to-mesh cell addressing" << endl;
}
}

17
src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,8 +32,8 @@ void Foam::meshToMesh0::calculateInverseDistanceWeights() const
{
if (debug)
{
Info<< "meshToMesh0::calculateInverseDistanceWeights() : "
<< "calculating inverse distance weighting factors" << endl;
InfoInFunction
<< "Calculating inverse distance weighting factors" << endl;
}
if (inverseDistanceWeightsPtr_)
@ -134,8 +134,8 @@ void Foam::meshToMesh0::calculateInverseVolumeWeights() const
{
if (debug)
{
Info<< "meshToMesh0::calculateInverseVolumeWeights() : "
<< "calculating inverse volume weighting factors" << endl;
InfoInFunction
<< "Calculating inverse volume weighting factors" << endl;
}
if (inverseVolumeWeightsPtr_)
@ -197,8 +197,8 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
{
if (debug)
{
Info<< "meshToMesh0::calculateCellToCellAddressing() : "
<< "calculating cell to cell addressing" << endl;
InfoInFunction
<< "Calculating cell to cell addressing" << endl;
}
if (cellToCellAddressingPtr_)
@ -223,9 +223,6 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
overlapEngine.overlappingCells(fromMesh_, toMesh_, iTo);
if (overLapCells.size() > 0)
{
//Info << "To " << iTo << endl;
//Info << "cellToCell " << overLapCells << endl;
cellToCell[iTo].setSize(overLapCells.size());
forAll(overLapCells, j)
{

6
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
View File

@ -289,11 +289,13 @@ void Foam::sampledIsoSurface::getIsoFields() const
if (debug)
{
Info<< "sampledIsoSurface::getIsoFields() : volSubField "
InfoInFunction
<< "volSubField "
<< volSubFieldPtr_->name()
<< " min:" << min(*volSubFieldPtr_).value()
<< " max:" << max(*volSubFieldPtr_).value() << endl;
Info<< "sampledIsoSurface::getIsoFields() : pointSubField "
InfoInFunction
<< "pointSubField "
<< pointSubFieldPtr_->name()
<< " min:" << gMin(pointSubFieldPtr_->internalField())
<< " max:" << gMax(pointSubFieldPtr_->internalField()) << endl;

20
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,8 +75,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
{
if (debug)
{
Info<< "sampledIsoSurfaceCell::updateGeometry() : lookup "
<< isoField_ << endl;
InfoInFunction << "Lookup " << isoField_ << endl;
}
cellFldPtr = &fvm.lookupObject<volScalarField>(isoField_);
@ -87,8 +86,9 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
if (debug)
{
Info<< "sampledIsoSurfaceCell::updateGeometry() : reading "
<< isoField_ << " from time " <<fvm.time().timeName()
InfoInFunction
<< "Reading " << isoField_
<< " from time " <<fvm.time().timeName()
<< endl;
}
@ -212,15 +212,7 @@ Foam::sampledIsoSurfaceCell::sampledIsoSurfaceCell
facesPtr_(NULL),
prevTimeIndex_(-1),
meshCells_(0)
{
// dict.readIfPresent("zone", zoneKey_);
//
// if (debug && zoneKey_.size() && mesh.cellZones().findZoneID(zoneKey_) < 0)
// {
// Info<< "cellZone " << zoneKey_
// << " not found - using entire mesh" << endl;
// }
}
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //

19
src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -24,7 +24,6 @@ License
\*---------------------------------------------------------------------------*/
#include "sampledThresholdCellFaces.H"
#include "dictionary.H"
#include "volFields.H"
#include "volPointInterpolation.H"
@ -70,8 +69,7 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
{
if (debug)
{
Info<< "sampledThresholdCellFaces::updateGeometry() : lookup "
<< fieldName_ << endl;
InfoInFunction<< "Lookup " << fieldName_ << endl;
}
cellFldPtr = &fvm.lookupObject<volScalarField>(fieldName_);
@ -82,8 +80,9 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
if (debug)
{
Info<< "sampledThresholdCellFaces::updateGeometry() : reading "
<< fieldName_ << " from time " << fvm.time().timeName()
InfoInFunction
<< "Reading " << fieldName_
<< " from time " << fvm.time().timeName()
<< endl;
}
@ -167,14 +166,6 @@ Foam::sampledThresholdCellFaces::sampledThresholdCellFaces
<< "require at least one of 'lowerLimit' or 'upperLimit'" << endl
<< abort(FatalError);
}
// dict.readIfPresent("zone", zoneKey_);
//
// if (debug && zoneKey_.size() && mesh.cellZones().findZoneID(zoneKey_) < 0)
// {
// Info<< "cellZone " << zoneKey_
// << " not found - using entire mesh" << endl;
// }
}

3
src/surfMesh/MeshedSurface/MeshedSurface.C
View File

@ -600,8 +600,7 @@ bool Foam::MeshedSurface<Face>::stitchFaces
if (verbose)
{
Info<< "MeshedSurface::stitchFaces : Renumbering all faces"
<< endl;
InfoInFunction<< "Renumbering all faces" << endl;
}
// Set the coordinates to the merged ones