ENH: have MUST_READ_IF_MODIFIED on IOdictionary construction

This commit is contained in:
mattijs
2010-06-02 09:48:07 +01:00
parent dd475e3c6b
commit c51a2b0f63
192 changed files with 779 additions and 411 deletions

117
TODO
View File

@ -1,100 +1,23 @@
- allocate/free tags.
Not tested.
OK - test blockMesh with cyclics
unitTestCases/singleCyclic/
OK - test cyclics sequential running.
unitTestCases/singleCyclic/
OK - test decomposePar
tested channel395
OK - FaceCellWave
unitTestCases/twoCavityCyclicForWallDistance/
OK - non-parallel finite volume : channelFoam
unitTestCases/channel395-splitCyclic vs. channel395-dev
OK - parallel finite volume with processorCyclic: channelFoam
unitTestCases/channel395-splitCyclic vs. channel395-dev
OK - preProcessing/foamUpgradeCyclics
OK - gamg - sequential.
Tested on channel395-splitCyclic with GAMG.
OK - gamg parallel.
Tested on channel395-splitCyclic with GAMG.
- initTransfer in GAMGprocessorInterfaces using nonblocking+tags
untested.
OK - cyclic baffles.
Tested on t-junction-with-fan
OK. - jumpCyclics/fanFvPatchField. All usages of jump() now need to account
for being owner() or not.
Tested on t-junction-with-fan.
OK - regionSplit
tested on singleCyclic
OK - pointFields on cyclics. volPointInterpolation.
tested on channel395-splitCyclic
OK - fvMeshSubset
tested on singleCyclic
OK - pointEdgeWave (maybe test through inversePointDistanceDiffusivity?)
tested on twoCavityCyclicForWallDistance
OK - scotchDecomp
tested with testCalcCSR on twoCavityCyclicForWallDistance
NOT WORKING - fvMeshDistribute to split cyclic patches into ones
with different separation.
tested on singleCyclic
OK - test createPatch pointSync
note: only works if face-centre position of 0th faces is ok since uses
this for separation. Should in fact make cyclic planar using patch centre and
normal?
test on twoCavityCyclicForWallDistance with point (0 1 0) set to (0 1.001 0)
NO PROBLEM - renumberMesh
It doesn't do renumbering through cyclics.
OK - rotational cyclics.
Tested on movingCone-with-cyclics
OK - LUscalarMatrix::convert still expects interfaces to be cyclic
tested on channel395 with 'directSolveCoarsest true;'
OK - grep for size()/2
- all tutorials with cyclics:
OK - incompressible/DNS/dnsFoam/boxTurb16
OK - incompressible/channelFoam/channel395
slight differences due to divergence. combustion/XiFoam/les/pitzDaily3D
OK - no cyclics. combustion/fireFoam/les/smallPoolFire2D
discreteMethods/dsmcFoam/freeSpacePeriodic
discreteMethods/dsmcFoam/wedge15Ma5
discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon
OK - incompressible/boundaryFoam/boundaryLaunderSharma
OK - incompressible/boundaryFoam/boundaryWallFunctions
OK - incompressible/boundaryFoam/boundaryWallFunctionsProfile
OK - needs createBaffles. incompressible/pimpleFoam/t-junction-with-fan
OK - incompressible/simpleSRFFoam/mixer
OK - needs createBaffles. lagrangian/porousExplicitSourceReactingParcelFoam/filter
needs special coupledbcs. lagrangian/reactingParcelFilmFoam/multipleBoxes
- check
new fvMesh
new fvMeshSubset
for consistency with createMesh.H
- Check the following:
doc/changes/inotify.txt
OK - createBaffles
- have foamUpgradeCyclics split 'value' field
- activeBaffleVelocity
- kivaToFoam/readKivaGrid.H sorts cyclics (but in incorrect order?)
- isoSurface.C
- referredCellList.C
- work out scheduled communication?
OK - add neighbourPatch checking to 16x.

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"turbulenceProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -23,7 +23,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -39,7 +39,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -62,7 +62,7 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
"combustionProperties",
Su.mesh().time().constant(),
Su.mesh(),
IOobject::MUST_READ
IOobject::MUST_READ_IF_MODIFIED
)
),
thermo

View File

@ -110,7 +110,7 @@
"PDRProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"combustionProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"combustionProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary combustionProperties
"combustionProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -65,7 +65,7 @@ IOdictionary combustionProperties
"combustionProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -9,7 +9,7 @@ IOdictionary thermophysicalProperties
"thermophysicalProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary mdEquilibrationDict
"mdEquilibrationDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"physicalProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -21,7 +21,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"financialProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -36,7 +36,7 @@ Foam::regionProperties::regionProperties(const Time& runTime)
"regionProperties",
runTime.time().constant(),
runTime.db(),
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),

View File

@ -44,7 +44,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -6,7 +6,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary gravitationalProperties
"gravitationalProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -97,7 +97,7 @@
"additionalControls",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -7,7 +7,7 @@ IOdictionary chemistryProperties
"chemistryProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -91,7 +91,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -5,7 +5,7 @@
"RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -46,7 +46,7 @@ Foam::phaseChangeTwoPhaseMixture::New
"transportProperties",
U.time().constant(),
U.db(),
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -50,7 +50,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -184,7 +184,7 @@
"RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -153,7 +153,7 @@
"interfacialProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -56,7 +56,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
"kineticTheoryProperties",
Ua_.time().constant(),
Ua_.mesh(),
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),

View File

@ -5,7 +5,7 @@
"ppProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"mechanicalProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"thermalProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -48,7 +48,7 @@ int main(int argc, char *argv[])
"dataEntryProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -116,7 +116,7 @@ int main(int argc, char *argv[])
dictName,
"system",
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -57,7 +57,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -56,7 +56,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -57,7 +57,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -58,7 +58,7 @@ int main(int argc, char *argv[])
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -639,7 +639,7 @@ int main(int argc, char *argv[])
"motionProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);
@ -669,7 +669,7 @@ int main(int argc, char *argv[])
"autoRefineMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -74,7 +74,7 @@ void checkSnapMesh
"snapMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -346,7 +346,7 @@ int main(int argc, char *argv[])
"modifyMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -78,7 +78,7 @@ Foam::edgeStats::edgeStats(const polyMesh& mesh)
"motionProperties",
mesh.time().constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);

View File

@ -346,7 +346,7 @@ int main(int argc, char *argv[])
"selectCellsDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -29,7 +29,7 @@
runTime.timeName(),
"uniform",
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -29,7 +29,7 @@
runTime.timeName(),
"uniform",
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -121,7 +121,7 @@ int main(int argc, char *argv[])
: dictPath
),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@ -137,7 +137,7 @@ int main(int argc, char *argv[])
runTime.constant(),
polyMeshDir,
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -218,7 +218,7 @@ int main(int argc, char *argv[])
runTimeExtruded.constant(),
regionDir,
runTimeExtruded,
IOobject::MUST_READ
IOobject::MUST_READ_IF_MODIFIED
)
);

View File

@ -144,7 +144,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -157,7 +157,7 @@ int main(int argc, char *argv[])
"snappyHexMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -532,7 +532,7 @@ int main(int argc, char *argv[])
: word::null
),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -39,7 +39,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
"mirrorMeshDict",
time().system(),
*this,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),

View File

@ -7,7 +7,7 @@
"mirrorMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -334,7 +334,7 @@ int main(int argc, char *argv[])
"refineMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -483,7 +483,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -298,7 +298,7 @@ int main(int argc, char *argv[])
args.options()["toleranceDict"],
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -83,7 +83,7 @@ int main(int argc, char *argv[])
(
dictPath,
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
: IOobject
@ -91,7 +91,7 @@ int main(int argc, char *argv[])
dictName,
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
)

View File

@ -163,7 +163,7 @@ int main(int argc, char *argv[])
runTime.time().system(),
regionDir, // use region if non-standard
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -94,7 +94,7 @@ Foam::domainDecomposition::domainDecomposition(const IOobject& io)
"decomposeParDict",
time().system(),
*this,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
),

View File

@ -581,7 +581,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
"foamDataToFluentDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -26,7 +26,7 @@
if (io.headerOk())
{
io.readOpt() = IOobject::MUST_READ;
io.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
IOdictionary timeObject(io);
timeObject.lookup("index") >> timeIndex;

View File

@ -5,7 +5,7 @@ IOdictionary conversionProperties
"conversionProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -444,7 +444,7 @@ void Foam::vtkPV3Foam::updateFoamMesh()
meshRegion_,
dbPtr_().timeName(),
dbPtr_(),
IOobject::MUST_READ
IOobject::MUST_READ_IF_MODIFIED
)
);

View File

@ -315,7 +315,7 @@ void Foam::vtkPV3blockMesh::updateFoamMesh()
dbPtr_().constant(),
polyMesh::meshSubDir,
dbPtr_(),
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -260,7 +260,7 @@ void Foam::readerDatabase::loadMesh()
meshPtr_ = new fvMeshSubset
(
*runTimePtr_,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::AUTO_WRITE
);

View File

@ -5,7 +5,7 @@ IOdictionary propsDict
"particleTrackProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ
IOobject::MUST_READ_IF_MODIFIED
)
);

View File

@ -62,7 +62,7 @@ namespace Foam
args["dict"],
runTime.system(),
runTime,
IOobject::MUST_READ
IOobject::MUST_READ_IF_MODIFIED
)
);
@ -130,7 +130,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@ -140,7 +140,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"LESProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@ -184,7 +184,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -214,7 +214,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@ -224,7 +224,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"LESProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
@ -266,7 +266,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -5,7 +5,7 @@
"pdfDict",
runTime.constant(),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -69,7 +69,7 @@ int main(int argc, char *argv[])
"postChannelDict",
mesh.time().constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -98,7 +98,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"thermodynamicProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"thermodynamicProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -81,7 +81,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"RASProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);
@ -90,7 +90,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"LESProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
);
@ -174,7 +174,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -299,7 +299,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
"transportProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@
"boxTurbDict",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -292,7 +292,7 @@ int main(int argc, char *argv[])
"changeDictionaryDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -405,7 +405,7 @@ int main(int argc, char *argv[])
fieldName,
instance,
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -50,7 +50,7 @@ int main(int argc, char *argv[])
"dsmcInitialiseDict",
mesh.time().system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -7,7 +7,7 @@ IOdictionary engineGeometry
"engineGeometry",
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -279,7 +279,7 @@ void rewriteField
fieldName,
runTime.timeName(),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
"fvSolution",
runTime.system(),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -291,7 +291,7 @@ int main(int argc, char *argv[])
"mapFieldsDict",
runTimeTarget.system(),
runTimeTarget,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
@ -310,7 +310,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeSource.system(),
runTimeSource,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -375,7 +375,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeTarget.system(),
runTimeTarget,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -446,7 +446,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeSource.system(),
runTimeSource,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
@ -464,7 +464,7 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTimeTarget.system(),
runTimeTarget,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -44,7 +44,7 @@ int main(int argc, char *argv[])
"mdInitialiseDict",
runTime.system(),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -186,7 +186,7 @@ int main(int argc, char *argv[])
"setFieldsDict",
runTime.system(),
mesh,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -47,7 +47,7 @@ int main(int argc, char *argv[])
"wallFunctionDict",
runTime.constant(),
mesh,
IOobject::MUST_READ
IOobject::MUST_READ_IF_MODIFIED
)
);

View File

@ -241,7 +241,7 @@ int main(int argc, char *argv[])
importName,
runTime.constant(),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);

View File

@ -62,7 +62,7 @@ int main(int argc, char *argv[])
"BurcatCpData",
runTime.constant(),
runTime,
IOobject::MUST_READ,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)

View File

@ -30,6 +30,7 @@ Class
#include "IOstreams.H"
#include "Pstream.H"
#include "PackedList.H"
#include "PstreamReduceOps.H"
#ifdef FOAM_USE_STAT
# include "OSspecific.H"
@ -57,12 +58,14 @@ const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
namespace Foam
{
class fileStateEqOp
// Reduction operator for PackedList of fileState
class reduceFileStates
{
public:
void operator()(unsigned int& x, const unsigned int& y) const
unsigned int operator()(const unsigned int x, const unsigned int y)
const
{
// x,y are list of 2bits representing fileState
// x,y are sets of 2bits representing fileState
unsigned int mask = 3u;
unsigned int shift = 0;
@ -82,7 +85,17 @@ namespace Foam
shift += 2;
mask <<= 2;
}
x = result;
return result;
}
};
// Combine operator for PackedList of fileState
class combineReduceFileStates
{
public:
void operator()(unsigned int& x, const unsigned int y) const
{
x = reduceFileStates()(x, y);
}
};
}
@ -323,7 +336,19 @@ void Foam::fileMonitor::updateStates(const bool syncPar) const
// Save local state for warning message below
PackedList<2> thisProcStats(stats);
Pstream::listCombineGather(stats.storage(), fileStateEqOp());
if (stats.storage().size() == 1)
{
// Optimisation valid for most cases.
reduce(stats.storage()[0], reduceFileStates());
}
else
{
Pstream::listCombineGather
(
stats.storage(),
combineReduceFileStates()
);
}
i = 0;
forAllIter(Map<fileState>, state_, iter)

Some files were not shown because too many files have changed in this diff Show More