zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Time: Removed graphFormat

Browse Source 
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:
Henry Weller
2023-06-16 14:51:30 +01:00
parent 561e20036b
commit 04dd989911
30 changed files with 15 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/legacy/basic/financialFoam/financialFoam.C
View File

@ -82,7 +82,7 @@ int main(int argc, char *argv[])
if (runTime.writeTime())
{
setWriter::New(runTime.graphFormat())->write
setWriter::New(runTime.controlDict().lookup("graphFormat"))->write
(
runTime.globalPath()
/functionObjects::writeFile::outputPrefix

6
applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C
View File

@ -408,11 +408,7 @@ bool Foam::functionObjects::populationBalanceSizeDistribution::read
fvMeshFunctionObject::read(dict);
formatterPtr_ = setWriter::New
(
dict.lookupOrDefault("setFormat", time_.graphFormat()),
dict
);
formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
return false;
}

2
applications/solvers/boundaryFoam/makeGraphs.H
View File

@ -13,7 +13,7 @@ const volSymmTensorField R
runTime.write();
setWriter::New(runTime.graphFormat())->write
setWriter::New(runTime.controlDict().lookup("graphFormat"))->write
(
runTime.globalPath()
/functionObjects::writeFile::outputPrefix

5
applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
View File

@ -6,7 +6,4 @@ label sampleFrequency(propsDict.lookup<label>("sampleFrequency"));
label maxPositions(propsDict.lookup<label>("maxPositions"));
word setFormat
(
propsDict.lookupOrDefault<word>("setFormat", runTime.graphFormat())
);
word setFormat(propsDict.lookup<word>("setFormat"));

2
applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
View File

@ -75,7 +75,7 @@ int main(int argc, char *argv[])
x[i] = xMin + i*(xMax - xMin)/(nIntervals - 1);
}
setWriter::New(runTime.graphFormat())->write
setWriter::New(runTime.controlDict().lookup("graphFormat"))->write
(
pdfPath,
args.executable(),

2
applications/utilities/postProcessing/noise/noise.C
View File

@ -155,7 +155,7 @@ int main(int argc, char *argv[])
// Graph format
const word graphFormat
(
dict.lookupOrDefault<word>("graphFormat", runTime.graphFormat())
dict.lookupOrDefault<word>("graphFormat", "raw")
);
Info<< "Reading data file" << endl;

4
src/OpenFOAM/db/Time/Time.C
View File

@ -385,7 +385,6 @@ Foam::Time::Time
writeFormat_(IOstream::ASCII),
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
cacheTemporaryObjects_(true),
functionObjects_
@ -484,7 +483,6 @@ Foam::Time::Time
writeFormat_(IOstream::ASCII),
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
cacheTemporaryObjects_(true),
functionObjects_(*this, enableFunctionObjects)
@ -550,7 +548,6 @@ Foam::Time::Time
writeFormat_(IOstream::ASCII),
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
cacheTemporaryObjects_(true),
functionObjects_(*this, enableFunctionObjects)
@ -611,7 +608,6 @@ Foam::Time::Time
writeFormat_(IOstream::ASCII),
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
cacheTemporaryObjects_(true),
functionObjects_(*this, enableFunctionObjects)

9
src/OpenFOAM/db/Time/Time.H
View File

@ -190,9 +190,6 @@ private:
//- Default output compression
IOstream::compressionType writeCompression_;
//- Default graph format
word graphFormat_;
//- Is temporary object cache enabled
mutable bool cacheTemporaryObjects_;
@ -301,12 +298,6 @@ public:
return writeCompression_;
}
//- Default graph format
const word& graphFormat() const
{
return graphFormat_;
}
//- Supports re-reading
const Switch& runTimeModifiable() const
{

3
src/OpenFOAM/db/Time/TimeIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -202,7 +202,6 @@ void Foam::Time::readDict()
}
}
controlDict_.readIfPresent("graphFormat", graphFormat_);
controlDict_.readIfPresent("runTimeModifiable", runTimeModifiable_);
userTime_->read(controlDict_);

6
src/functionObjects/field/histogram/histogram.C
View File

@ -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;
}

6
src/functionObjects/field/layerAverage/layerAverage.C
View File

@ -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();

6
src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C
View File

@ -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);

6
src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
View File

@ -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;
}

6
src/functionObjects/field/streamlines/streamlines.C
View File

@ -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;
}

13
src/lagrangian/parcel/submodels/CloudFunctionObjects/SizeDistribution/SizeDistribution.C
View File

@ -108,18 +108,7 @@ Foam::SizeDistribution<CloudType>::SizeDistribution
:
CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
nPoints_(dict.lookup<label>("nPoints")),
formatter_
(
setWriter::New
(
dict.lookupOrDefault
(
"setFormat",
owner.mesh().time().graphFormat()
),
dict
)
)
formatter_(setWriter::New(dict.lookup("setFormat"), dict))
{}

2
src/randomProcesses/fft/writeEk.C
View File

@ -58,7 +58,7 @@ void writeEk
autoPtr<setWriter> writer
(
setWriter::New(U.time().graphFormat())
setWriter::New(U.time().controlDict().lookup("graphFormat"))
);
writer->write

5
src/sampling/sampledSet/sampledSets/sampledSets.C
View File

@ -145,10 +145,7 @@ bool Foam::functionObjects::sampledSets::read(const dictionary& dict)
dict.lookup("interpolationScheme") >> interpolationScheme_;
const word writeType
(
dict.lookupOrDefault("setFormat", time_.graphFormat())
);
const word writeType(dict.lookup("setFormat"));
// Define the set formatter
formatter_ = setWriter::New(writeType, dict);

2
tutorials/fluid/angledDuctExplicitFixedCoeff/system/controlDict
View File

@ -44,8 +44,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/fluid/squareBend/system/controlDict
View File

@ -44,8 +44,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/fluid/squareBendLiq/system/controlDict
View File

@ -44,8 +44,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/fluid/squareBendLiqSteady/system/controlDict
View File

@ -44,8 +44,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
View File

@ -42,8 +42,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
View File

@ -42,8 +42,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/legacy/incompressible/dnsFoam/boxTurb16/system/controlDict
View File

@ -44,7 +44,5 @@ timePrecision 6;
runTimeModifiable true;
graphFormat raw;
// ************************************************************************* //

2
tutorials/legacy/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
View File

@ -42,8 +42,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
View File

@ -42,8 +42,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;

2
tutorials/multicomponentFluid/smallPoolFire2D/system/controlDict
View File

@ -43,8 +43,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable yes;
adjustTimeStep yes;

2
tutorials/multicomponentFluid/smallPoolFire3D/system/controlDict
View File

@ -43,8 +43,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable yes;
adjustTimeStep yes;

2
tutorials/shockFluid/obliqueShock/system/controlDict
View File

@ -44,8 +44,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;
adjustTimeStep yes;

2
tutorials/solidDisplacement/plateHole/system/controlDict
View File

@ -44,8 +44,6 @@ timeFormat general;
timePrecision 6;
graphFormat raw;
runTimeModifiable true;