fvSolution: fields and equations entries in relaxationFactors are now individually optional

This commit is contained in:
Henry
2014-02-03 18:05:09 +00:00
parent a4fbc96d4a
commit cad94eb90e

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,7 +35,7 @@ License
namespace Foam namespace Foam
{ {
defineDebugSwitchWithName(solution, "solution", 0); defineDebugSwitchWithName(solution, "solution", 0);
} }
// List of sub-dictionaries to rewrite // List of sub-dictionaries to rewrite
@ -60,10 +60,17 @@ void Foam::solution::read(const dictionary& dict)
if (dict.found("relaxationFactors")) if (dict.found("relaxationFactors"))
{ {
const dictionary& relaxDict(dict.subDict("relaxationFactors")); const dictionary& relaxDict(dict.subDict("relaxationFactors"));
if (relaxDict.found("fields")) if (relaxDict.found("fields") || relaxDict.found("equations"))
{ {
fieldRelaxDict_ = relaxDict.subDict("fields"); if (relaxDict.found("fields"))
eqnRelaxDict_ = relaxDict.subDict("equations"); {
fieldRelaxDict_ = relaxDict.subDict("fields");
}
if (relaxDict.found("equations"))
{
eqnRelaxDict_ = relaxDict.subDict("equations");
}
} }
else else
{ {