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

particleTracks, steadyParticleTracks: Standardised dictionary locations

Browse Source 
Settings for the particleTracks utility are now specified in
system/particleTracksDict. Correspondingly, settings for
steadyParticleTracks are now specified in
system/steadyParticleTracksDict.
This commit is contained in:
Will Bainbridge
2021-07-02 17:07:46 +01:00
parent e017a1e664
commit 677defdc5c
9 changed files with 14 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

24
applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
View File

@ -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;
// ************************************************************************* //

7
applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
View File

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

14
src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.C
View File

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

6
src/OpenFOAM/db/IOobjects/IOdictionary/systemDict.H
View File

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

24
tutorials/combustion/reactingFoam/Lagrangian/filter/constant/particleTrackProperties
View File

@ -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;
// ************************************************************************* //

4
tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/particleTrackProperties → tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/particleTracksDict
View File

@ -9,8 +9,8 @@ FoamFile
{
format ascii;
class dictionary;
location "constant";
object particleTrackProperties;
location "system";
object particleTracksDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/particleTrackDict → tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/steadyParticleTracksDict
View File

@ -9,8 +9,8 @@ FoamFile
{
format ascii;
class dictionary;
location "constant";
object particleTrackDict;
location "system";
object steadyParticleTracksDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/particleTrackDict → tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/steadyParticleTracksDict
View File

@ -9,8 +9,8 @@ FoamFile
{
format ascii;
class dictionary;
location "constant";
object particleTrackDict;
location "system";
object steadyParticleTracksDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //