Time: Removed graphFormat
setFormat no longer defaults to the value of graphFormat optionally set in controlDict and must be set in the functionObject dictionary. boundaryFoam, financialFoam and pdfPlot still require a graphFormat entry in controlDict but this is now read directly rather than by Time.
This commit is contained in:
@ -71,11 +71,7 @@ bool Foam::functionObjects::histogram::read(const dictionary& dict)
|
||||
min_ = dict.lookupOrDefault<scalar>("min", 0);
|
||||
dict.lookup("nBins") >> nBins_;
|
||||
|
||||
formatterPtr_ = setWriter::New
|
||||
(
|
||||
dict.lookupOrDefault("setFormat", time_.graphFormat()),
|
||||
dict
|
||||
);
|
||||
formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -245,11 +245,7 @@ bool Foam::functionObjects::layerAverage::read(const dictionary& dict)
|
||||
|
||||
fields_ = dict.lookup<wordList>("fields");
|
||||
|
||||
formatter_ = setWriter::New
|
||||
(
|
||||
dict.lookupOrDefault("setFormat", time_.graphFormat()),
|
||||
dict
|
||||
);
|
||||
formatter_ = setWriter::New(dict.lookup("setFormat"), dict);
|
||||
|
||||
calcLayers();
|
||||
|
||||
|
||||
@ -658,11 +658,7 @@ bool Foam::functionObjects::patchCutLayerAverage::read(const dictionary& dict)
|
||||
)
|
||||
];
|
||||
|
||||
formatter_ = setWriter::New
|
||||
(
|
||||
dict.lookupOrDefault("setFormat", time_.graphFormat()),
|
||||
dict
|
||||
);
|
||||
formatter_ = setWriter::New(dict.lookup("setFormat"), dict);
|
||||
|
||||
nOptimiseIter_ = dict.lookupOrDefault("nOptimiseIter", 2);
|
||||
|
||||
|
||||
@ -371,11 +371,7 @@ bool Foam::functionObjects::regionSizeDistribution::read(const dictionary& dict)
|
||||
dict.lookup("nBins") >> nBins_;
|
||||
dict.lookup("fields") >> fields_;
|
||||
|
||||
formatterPtr_ = setWriter::New
|
||||
(
|
||||
dict.lookupOrDefault("setFormat", time_.graphFormat()),
|
||||
dict
|
||||
);
|
||||
formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -181,11 +181,7 @@ bool Foam::functionObjects::streamlines::read(const dictionary& dict)
|
||||
dict.subDict("seedSampleSet")
|
||||
);
|
||||
|
||||
formatterPtr_ = setWriter::New
|
||||
(
|
||||
dict.lookupOrDefault("setFormat", time_.graphFormat()),
|
||||
dict
|
||||
);
|
||||
formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user