diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C index c6c3cde57d..2ecfa7e32b 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C +++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl/pimpleControl.C @@ -48,11 +48,19 @@ Foam::pimpleControl::pimpleControl(fvMesh& mesh, const word& algorithmName) { printCorrResidualControls(nCorrPimple_); } - else + + Info<< nl << algorithmName << ": Operating solver in " + << (mesh.steady() ? "steady-state" : mesh.transient() ? "transient" : + "mixed steady-state/transient") << " mode with " << nCorrPimple_ + << " outer corrector" << (nCorrPimple_ == 1 ? "" : "s") << nl; + + if (nCorrPimple_ == 1) { - Info<< nl << algorithmName << ": Operating solver in PISO mode" << nl - << endl; + Info<< algorithmName << ": Operating solver in " + << (mesh.steady() ? "SIMPLE" : "PISO") << " mode" << nl; } + + Info<< nl << endl; } diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C index c5ef81459f..5ceb8d203b 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C +++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleMultiRegionControl/pimpleMultiRegionControl.C @@ -78,12 +78,17 @@ Foam::pimpleMultiRegionControl::pimpleMultiRegionControl pimpleControls_(), solidControls_() { + bool allSteady = true, allTransient = true; + forAll(pimpleMeshes, i) { pimpleControls_.append ( new pimpleNoLoopControl(pimpleMeshes[i], algorithmName) ); + + allSteady = allSteady && pimpleMeshes[i].steady(); + allTransient = allTransient && pimpleMeshes[i].transient(); } forAll(solidMeshes, i) @@ -92,6 +97,9 @@ Foam::pimpleMultiRegionControl::pimpleMultiRegionControl ( new solidNoLoopControl(solidMeshes[i], algorithmName) ); + + allSteady = allSteady && solidMeshes[i].steady(); + allTransient = allTransient && solidMeshes[i].transient(); } read(); @@ -120,11 +128,18 @@ Foam::pimpleMultiRegionControl::pimpleMultiRegionControl } } - if (nCorrPimple_ == 1) + Info<< nl << algorithmName << ": Operating solver in " + << (allSteady ? "steady-state" : allTransient ? "transient" : + "mixed steady-state/transient") << " mode with " << nCorrPimple_ + << " outer corrector" << (nCorrPimple_ == 1 ? "" : "s") << nl; + + if ((allSteady || allTransient) && nCorrPimple_ == 1) { - Info<< nl << algorithmName << ": Operating solver in PISO mode" << nl - << endl; + Info<< algorithmName << ": Operating solver in " + << (allSteady ? "SIMPLE" : "PISO") << " mode" << nl; } + + Info<< nl << endl; } diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C index 6ec9f8f96b..768a65810f 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C +++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleNoLoopControl/pimpleNoLoopControl.C @@ -79,7 +79,8 @@ bool Foam::pimpleNoLoopControl::read() } // The SIMPLErho keyword is maintained here for backwards compatibility - simpleRho_ = dict().lookupOrDefault("SIMPLErho", false); + simpleRho_ = mesh().steady(); + simpleRho_ = dict().lookupOrDefault("SIMPLErho", simpleRho_); simpleRho_ = dict().lookupOrDefault("simpleRho", simpleRho_); turbOnFinalIterOnly_ =