diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H index 8a9b6e8dac..5604c11211 100644 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H @@ -1,13 +1,4 @@ -IOdictionary propsDict -( - IOobject - ( - "particleTrackProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED - ) -); +IOdictionary propsDict(systemDict("particleTracksDict", args, runTime)); const word cloudName(propsDict.lookup("cloudName")); diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties deleted file mode 100644 index b9fda9c4d7..0000000000 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties +++ /dev/null @@ -1,24 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - object particleTrackProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -cloudName reactingCloud1; - -sampleFrequency 1; - -maxPositions 1000000; - -setFormat vtk; - -// ************************************************************************* // diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H index fd2b9e9ac6..6302aed0ab 100644 --- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H +++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H @@ -1,9 +1,4 @@ -const word dictName("particleTrackDict"); - -IOdictionary propsDict -( - systemDict(dictName, args, runTime, word::null, runTime.constant()) -); +IOdictionary propsDict(systemDict("steadyParticleTracksDict", args, runTime)); word cloudName(propsDict.lookup("cloudName")); diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C b/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C index e3972c47d9..9ab5942f82 100644 --- a/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C +++ b/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C @@ -34,8 +34,7 @@ Foam::IOobject Foam::systemDictIO const word& dictName, const argList& args, const objectRegistry& ob, - const word& regionName, - const word& systemName + const word& regionName ) { fileName dictPath = fileName::null; @@ -79,7 +78,7 @@ Foam::IOobject Foam::systemDictIO IOobject ( dictName, - systemName == word::null ? ob.time().system() : systemName, + ob.time().system(), regionName == polyMesh::defaultRegion ? word::null : regionName, ob, IOobject::MUST_READ_IF_MODIFIED, @@ -94,15 +93,10 @@ Foam::IOdictionary Foam::systemDict const word& dictName, const argList& args, const objectRegistry& ob, - const word& regionName, - const word& systemName + const word& regionName ) { - return - IOdictionary - ( - systemDictIO(dictName, args, ob, regionName, systemName) - ); + return IOdictionary(systemDictIO(dictName, args, ob, regionName)); } diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.H b/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.H index 75e212d8b4..52b505ae70 100644 --- a/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.H +++ b/src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.H @@ -52,8 +52,7 @@ IOobject systemDictIO const word& dictName, const argList& args, const objectRegistry& ob, - const word& regionName = polyMesh::defaultRegion, - const word& systemName = word::null // defaults to ob.time().system() + const word& regionName = polyMesh::defaultRegion ); IOdictionary systemDict @@ -61,8 +60,7 @@ IOdictionary systemDict const word& dictName, const argList& args, const objectRegistry& ob, - const word& regionName = polyMesh::defaultRegion, - const word& systemName = word::null // defaults to ob.time().system() + const word& regionName = polyMesh::defaultRegion ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/particleTrackProperties b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/particleTrackProperties deleted file mode 100644 index e1c56b911f..0000000000 --- a/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/particleTrackProperties +++ /dev/null @@ -1,24 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object particleTrackProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -cloudName reactingCloud1; - -sampleFrequency 1; - -maxPositions 1000000; - - -// ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/particleTrackProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/particleTracksDict similarity index 90% rename from tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/particleTrackProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/particleTracksDict index 86c6af0586..65fcad071e 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/particleTrackProperties +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/particleTracksDict @@ -9,8 +9,8 @@ FoamFile { format ascii; class dictionary; - location "constant"; - object particleTrackProperties; + location "system"; + object particleTracksDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/particleTrackDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/steadyParticleTracksDict similarity index 90% rename from tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/particleTrackDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/steadyParticleTracksDict index 34206489a2..3d8b8ae0c8 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/particleTrackDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/steadyParticleTracksDict @@ -9,8 +9,8 @@ FoamFile { format ascii; class dictionary; - location "constant"; - object particleTrackDict; + location "system"; + object steadyParticleTracksDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/particleTrackDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/steadyParticleTracksDict similarity index 90% rename from tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/particleTrackDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/steadyParticleTracksDict index 34206489a2..3d8b8ae0c8 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/particleTrackDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/steadyParticleTracksDict @@ -9,8 +9,8 @@ FoamFile { format ascii; class dictionary; - location "constant"; - object particleTrackDict; + location "system"; + object steadyParticleTracksDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //