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

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

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

13
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
View File

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

7
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
View File

@ -121,7 +121,12 @@ public:
// Constructors // Constructors
//- Construct from mesh and the name of control sub-dictionary //- 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 //- Destructor

23
src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
View File

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

7
src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
View File

@ -93,7 +93,12 @@ public:
// Constructors // Constructors
//- Construct from mesh and the name of control sub-dictionary //- 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 //- Destructor