ENH: function obejct updates

This commit is contained in:
andy
2013-10-04 16:44:58 +01:00
parent 184a4c7c67
commit 837ca32397
35 changed files with 261 additions and 195 deletions

View File

@ -102,7 +102,7 @@ Foam::CourantNo::CourantNo
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}

View File

@ -77,7 +77,7 @@ Foam::DESModelRegions::DESModelRegions
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}
@ -160,7 +160,7 @@ void Foam::DESModelRegions::write()
if (log_)
{
Info<< type() << " " << name_ << " output:" << nl;
Info<< type() << " " << name_ << " output:" << nl;
}
volScalarField& DESModelRegions =
@ -204,7 +204,7 @@ void Foam::DESModelRegions::write()
gSum(DESModelRegions.internalField()*mesh.V())
/gSum(mesh.V())*100.0;
if (Pstream::master())
if (Pstream::master() && log_)
{
file() << obr_.time().timeName() << token::TAB
<< prc << token::TAB << 100.0 - prc << endl;

View File

@ -65,7 +65,7 @@ Foam::Lambda2::Lambda2
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}

View File

@ -68,7 +68,7 @@ Foam::Peclet::Peclet
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}

View File

@ -64,7 +64,7 @@ Foam::Q::Q
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}

View File

@ -67,7 +67,7 @@ Foam::dsmcFields::dsmcFields
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}

View File

@ -213,7 +213,7 @@ Foam::pressureTools::pressureTools
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}

View File

@ -101,7 +101,7 @@ Foam::wallShearStress::wallShearStress
name_(name),
obr_(obr),
active_(true),
log_(false),
log_(true),
patchSet_()
{
// Check if the available mesh is an fvMesh, otherwise deactivate
@ -117,7 +117,7 @@ Foam::wallShearStress::wallShearStress
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}
@ -166,7 +166,7 @@ void Foam::wallShearStress::read(const dictionary& dict)
{
if (active_)
{
log_ = dict.lookupOrDefault<Switch>("log", false);
log_ = dict.lookupOrDefault<Switch>("log", true);
const fvMesh& mesh = refCast<const fvMesh>(obr_);
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
@ -177,7 +177,7 @@ void Foam::wallShearStress::read(const dictionary& dict)
wordReList(dict.lookupOrDefault("patches", wordReList()))
);
Info<< type() << " output:" << nl;
Info<< type() << " " << name_ << ":" << nl;
if (patchSet_.empty())
{

View File

@ -195,7 +195,7 @@ Foam::yPlusLES::yPlusLES
name_(name),
obr_(obr),
active_(true),
log_(false),
log_(true),
phiName_("phi"),
UName_("U")
{
@ -212,7 +212,7 @@ Foam::yPlusLES::yPlusLES
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}
@ -254,7 +254,7 @@ void Foam::yPlusLES::read(const dictionary& dict)
{
if (active_)
{
log_ = dict.lookupOrDefault<Switch>("log", false);
log_ = dict.lookupOrDefault<Switch>("log", true);
phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
}
}
@ -313,9 +313,7 @@ void Foam::yPlusLES::write()
if (log_)
{
Info<< type() << " " << name_ << " output:" << nl
<< " writing field " << yPlusLES.name() << nl
<< endl;
Info<< " writing field " << yPlusLES.name() << nl << endl;
}
yPlusLES.write();

View File

@ -183,7 +183,7 @@ Foam::yPlusRAS::yPlusRAS
name_(name),
obr_(obr),
active_(true),
log_(false),
log_(true),
phiName_("phi")
{
// Check if the available mesh is an fvMesh, otherwise deactivate
@ -199,7 +199,7 @@ Foam::yPlusRAS::yPlusRAS
"const dictionary&, "
"const bool"
")"
) << "No fvMesh available, deactivating." << nl
) << "No fvMesh available, deactivating " << name_ << nl
<< endl;
}
@ -241,7 +241,7 @@ void Foam::yPlusRAS::read(const dictionary& dict)
{
if (active_)
{
log_ = dict.lookupOrDefault<Switch>("log", false);
log_ = dict.lookupOrDefault<Switch>("log", true);
phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
}
}
@ -298,9 +298,7 @@ void Foam::yPlusRAS::write()
if (log_)
{
Info<< type() << " " << name_ << " output:" << nl
<< " writing field " << yPlusRAS.name() << nl
<< endl;
Info<< " writing field " << yPlusRAS.name() << nl << endl;
}
yPlusRAS.write();