Function1: Rationalized construction to support the simpler sub-dictionary format

e.g.
    ramp
    {
        type     quadratic;
        start    200;
        duration 1.6;
    }

but the old format is supported for backward compatibility:

    ramp linear;
    rampCoeffs
    {
        start    200;
        duration 1.6;
    }
This commit is contained in:
Henry Weller
2017-03-16 20:53:08 +00:00
parent b1199f6559
commit 2e2bfd237a
16 changed files with 116 additions and 80 deletions

View File

@ -34,11 +34,10 @@ Foam::Function1Types::TableFile<Type>::TableFile
const dictionary& dict
)
:
TableBase<Type>(entryName, dict.subDict(entryName + "Coeffs")),
TableBase<Type>(entryName, dict),
fName_("none")
{
const dictionary coeffs(dict.subDict(entryName + "Coeffs"));
coeffs.lookup("file") >> fName_;
dict.lookup("file") >> fName_;
fileName expandedFile(fName_);
IFstream is(expandedFile.expand());