From 04dd989911c37253406b0ee93b68f63726df4475 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 16 Jun 2023 14:51:30 +0100
Subject: [PATCH] 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.
---
 .../legacy/basic/financialFoam/financialFoam.C      |  2 +-
 .../populationBalanceSizeDistribution.C             |  6 +-----
 applications/solvers/boundaryFoam/makeGraphs.H      |  2 +-
 .../lagrangian/particleTracks/createFields.H        |  5 +----
 .../postProcessing/miscellaneous/pdfPlot/pdfPlot.C  |  2 +-
 applications/utilities/postProcessing/noise/noise.C |  2 +-
 src/OpenFOAM/db/Time/Time.C                         |  4 ----
 src/OpenFOAM/db/Time/Time.H                         |  9 ---------
 src/OpenFOAM/db/Time/TimeIO.C                       |  3 +--
 src/functionObjects/field/histogram/histogram.C     |  6 +-----
 .../field/layerAverage/layerAverage.C               |  6 +-----
 .../patchCutLayerAverage/patchCutLayerAverage.C     |  6 +-----
 .../regionSizeDistribution/regionSizeDistribution.C |  6 +-----
 src/functionObjects/field/streamlines/streamlines.C |  6 +-----
 .../SizeDistribution/SizeDistribution.C             | 13 +------------
 src/randomProcesses/fft/writeEk.C                   |  2 +-
 src/sampling/sampledSet/sampledSets/sampledSets.C   |  5 +----
 .../angledDuctExplicitFixedCoeff/system/controlDict |  2 --
 tutorials/fluid/squareBend/system/controlDict       |  2 --
 tutorials/fluid/squareBendLiq/system/controlDict    |  2 --
 .../fluid/squareBendLiqSteady/system/controlDict    |  2 --
 .../angledDuctExplicit/system/controlDict           |  2 --
 .../angledDuctImplicit/system/controlDict           |  2 --
 .../dnsFoam/boxTurb16/system/controlDict            |  2 --
 .../angledDuctExplicit/system/controlDict           |  2 --
 .../angledDuctImplicit/system/controlDict           |  2 --
 .../smallPoolFire2D/system/controlDict              |  2 --
 .../smallPoolFire3D/system/controlDict              |  2 --
 .../shockFluid/obliqueShock/system/controlDict      |  2 --
 .../solidDisplacement/plateHole/system/controlDict  |  2 --
 30 files changed, 15 insertions(+), 96 deletions(-)

diff --git a/applications/legacy/basic/financialFoam/financialFoam.C b/applications/legacy/basic/financialFoam/financialFoam.C
index ded7bcab1e..bafd3493cb 100644
--- a/applications/legacy/basic/financialFoam/financialFoam.C
+++ b/applications/legacy/basic/financialFoam/financialFoam.C
@@ -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
diff --git a/applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C b/applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C
index 2e82e13605..1c659c3687 100644
--- a/applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C
+++ b/applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C
@@ -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;
 }
diff --git a/applications/solvers/boundaryFoam/makeGraphs.H b/applications/solvers/boundaryFoam/makeGraphs.H
index c95860061b..5c41037892 100644
--- a/applications/solvers/boundaryFoam/makeGraphs.H
+++ b/applications/solvers/boundaryFoam/makeGraphs.H
@@ -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
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index 0e189b90d3..5b82b02c40 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -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"));
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
index b78f46ca45..d4f7269fb5 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
@@ -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(),
diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index 8529f400a7..b2ad7d9323 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -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;
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index fc40a4d551..f2e87239bb 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -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)
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 11ea6dcb47..75ad786f3a 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -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
             {
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index ce46c796ea..3e2ff2d114 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -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_);
diff --git a/src/functionObjects/field/histogram/histogram.C b/src/functionObjects/field/histogram/histogram.C
index ce10e50e1b..6a9afc0572 100644
--- a/src/functionObjects/field/histogram/histogram.C
+++ b/src/functionObjects/field/histogram/histogram.C
@@ -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;
 }
diff --git a/src/functionObjects/field/layerAverage/layerAverage.C b/src/functionObjects/field/layerAverage/layerAverage.C
index c4e55c411e..7a33dee0bd 100644
--- a/src/functionObjects/field/layerAverage/layerAverage.C
+++ b/src/functionObjects/field/layerAverage/layerAverage.C
@@ -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();
 
diff --git a/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C b/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C
index 1763fd6b2c..24348d1faf 100644
--- a/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C
+++ b/src/functionObjects/field/patchCutLayerAverage/patchCutLayerAverage.C
@@ -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);
 
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 37c51820d0..587a67ed63 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -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;
 }
diff --git a/src/functionObjects/field/streamlines/streamlines.C b/src/functionObjects/field/streamlines/streamlines.C
index a8ee70e486..72b5cf06b8 100644
--- a/src/functionObjects/field/streamlines/streamlines.C
+++ b/src/functionObjects/field/streamlines/streamlines.C
@@ -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;
 }
diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/SizeDistribution/SizeDistribution.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/SizeDistribution/SizeDistribution.C
index 5ace063638..522eb5397d 100644
--- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/SizeDistribution/SizeDistribution.C
+++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/SizeDistribution/SizeDistribution.C
@@ -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))
 {}
 
 
diff --git a/src/randomProcesses/fft/writeEk.C b/src/randomProcesses/fft/writeEk.C
index 47397a66d6..8c9971f38c 100644
--- a/src/randomProcesses/fft/writeEk.C
+++ b/src/randomProcesses/fft/writeEk.C
@@ -58,7 +58,7 @@ void writeEk
 
     autoPtr<setWriter> writer
     (
-        setWriter::New(U.time().graphFormat())
+        setWriter::New(U.time().controlDict().lookup("graphFormat"))
     );
 
     writer->write
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index c94aa7c903..89cd7d8d83 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -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);
diff --git a/tutorials/fluid/angledDuctExplicitFixedCoeff/system/controlDict b/tutorials/fluid/angledDuctExplicitFixedCoeff/system/controlDict
index 08a570069e..88cf2ef7a1 100644
--- a/tutorials/fluid/angledDuctExplicitFixedCoeff/system/controlDict
+++ b/tutorials/fluid/angledDuctExplicitFixedCoeff/system/controlDict
@@ -44,8 +44,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/fluid/squareBend/system/controlDict b/tutorials/fluid/squareBend/system/controlDict
index e02c5b9f6a..1967959bed 100644
--- a/tutorials/fluid/squareBend/system/controlDict
+++ b/tutorials/fluid/squareBend/system/controlDict
@@ -44,8 +44,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/fluid/squareBendLiq/system/controlDict b/tutorials/fluid/squareBendLiq/system/controlDict
index 0c0ab94399..c6ed95403d 100644
--- a/tutorials/fluid/squareBendLiq/system/controlDict
+++ b/tutorials/fluid/squareBendLiq/system/controlDict
@@ -44,8 +44,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/fluid/squareBendLiqSteady/system/controlDict b/tutorials/fluid/squareBendLiqSteady/system/controlDict
index e02c5b9f6a..1967959bed 100644
--- a/tutorials/fluid/squareBendLiqSteady/system/controlDict
+++ b/tutorials/fluid/squareBendLiqSteady/system/controlDict
@@ -44,8 +44,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
index 9505061e31..2c42bfae2b 100644
--- a/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -42,8 +42,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
index 5bdd2f26a2..d2129568fd 100644
--- a/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/legacy/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -42,8 +42,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/legacy/incompressible/dnsFoam/boxTurb16/system/controlDict b/tutorials/legacy/incompressible/dnsFoam/boxTurb16/system/controlDict
index 0015a9c36c..f17981c14b 100644
--- a/tutorials/legacy/incompressible/dnsFoam/boxTurb16/system/controlDict
+++ b/tutorials/legacy/incompressible/dnsFoam/boxTurb16/system/controlDict
@@ -44,7 +44,5 @@ timePrecision   6;
 
 runTimeModifiable true;
 
-graphFormat     raw;
-
 
 // ************************************************************************* //
diff --git a/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
index 9470048a9a..faa4774d1e 100644
--- a/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -42,8 +42,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
index bd2a96693f..96caf960a9 100644
--- a/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -42,8 +42,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 
diff --git a/tutorials/multicomponentFluid/smallPoolFire2D/system/controlDict b/tutorials/multicomponentFluid/smallPoolFire2D/system/controlDict
index 26a0f48452..a58d46d777 100644
--- a/tutorials/multicomponentFluid/smallPoolFire2D/system/controlDict
+++ b/tutorials/multicomponentFluid/smallPoolFire2D/system/controlDict
@@ -43,8 +43,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable yes;
 
 adjustTimeStep  yes;
diff --git a/tutorials/multicomponentFluid/smallPoolFire3D/system/controlDict b/tutorials/multicomponentFluid/smallPoolFire3D/system/controlDict
index 32277bc38a..2ac0841943 100644
--- a/tutorials/multicomponentFluid/smallPoolFire3D/system/controlDict
+++ b/tutorials/multicomponentFluid/smallPoolFire3D/system/controlDict
@@ -43,8 +43,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable yes;
 
 adjustTimeStep  yes;
diff --git a/tutorials/shockFluid/obliqueShock/system/controlDict b/tutorials/shockFluid/obliqueShock/system/controlDict
index 32edec617f..13653c5b12 100644
--- a/tutorials/shockFluid/obliqueShock/system/controlDict
+++ b/tutorials/shockFluid/obliqueShock/system/controlDict
@@ -44,8 +44,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;
 
 adjustTimeStep  yes;
diff --git a/tutorials/solidDisplacement/plateHole/system/controlDict b/tutorials/solidDisplacement/plateHole/system/controlDict
index fd4cd53b1c..e52bda986b 100644
--- a/tutorials/solidDisplacement/plateHole/system/controlDict
+++ b/tutorials/solidDisplacement/plateHole/system/controlDict
@@ -44,8 +44,6 @@ timeFormat      general;
 
 timePrecision   6;
 
-graphFormat     raw;
-
 runTimeModifiable true;