ENH: {simple|pimple}Control - output on construction controlled by a 'verbose' flag

This commit is contained in:
Andrew Heather
2019-06-18 14:20:55 +01:00
parent e184e1e72c
commit 56547863c1
4 changed files with 70 additions and 42 deletions

View File

@ -138,7 +138,12 @@ void Foam::pimpleControl::setFirstIterFlag(const bool check, const bool force)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::pimpleControl::pimpleControl(fvMesh& mesh, const word& dictName)
Foam::pimpleControl::pimpleControl
(
fvMesh& mesh,
const word& dictName,
const bool verbose
)
:
solutionControl(mesh, dictName),
solveFlow_(true),
@ -151,8 +156,9 @@ Foam::pimpleControl::pimpleControl(fvMesh& mesh, const word& dictName)
{
read();
Info<< nl
<< algorithmName_;
if (verbose)
{
Info<< nl << algorithmName_;
if (nCorrPIMPLE_ > 1)
{
@ -181,6 +187,7 @@ Foam::pimpleControl::pimpleControl(fvMesh& mesh, const word& dictName)
}
Info<< endl;
}
}

View File

@ -121,7 +121,12 @@ public:
// Constructors
//- Construct from mesh and the name of control sub-dictionary
pimpleControl(fvMesh& mesh, const word& dictName="PIMPLE");
pimpleControl
(
fvMesh& mesh,
const word& dictName = "PIMPLE",
const bool verbose = true
);
//- Destructor

View File

@ -91,21 +91,31 @@ bool Foam::simpleControl::criteriaSatisfied()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::simpleControl::simpleControl(fvMesh& mesh, const word& dictName)
Foam::simpleControl::simpleControl
(
fvMesh& mesh,
const word& dictName,
const bool verbose
)
:
solutionControl(mesh, dictName),
initialised_(false)
{
read();
Info<< nl
<< algorithmName_;
if (verbose)
{
Info<< nl << algorithmName_;
if (residualControl_.empty())
{
Info<< ": no convergence criteria found. Calculations will run for "
<< mesh_.time().endTime().value() - mesh_.time().startTime().value()
<< " steps." << nl;
const scalar duration =
mesh_.time().endTime().value()
- mesh_.time().startTime().value();
Info<< ": no convergence criteria found. "
<< "Calculations will run for " << duration << " steps."
<< nl;
}
else
{
@ -118,6 +128,7 @@ Foam::simpleControl::simpleControl(fvMesh& mesh, const word& dictName)
}
}
Info<< endl;
}
}

View File

@ -93,7 +93,12 @@ public:
// Constructors
//- Construct from mesh and the name of control sub-dictionary
simpleControl(fvMesh& mesh, const word& dictName="SIMPLE");
simpleControl
(
fvMesh& mesh,
const word& dictName = "SIMPLE",
const bool verbose = true
);
//- Destructor