From 475ed5cc32d2c28f5d1064e7c8be3bcfe105deeb Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 14 Mar 2023 17:39:28 +0100 Subject: [PATCH] STYLE: readOnProc/writeOnProc instead of 'valid' for IO --- applications/test/IOField/Test-IOField.C | 14 +++-- .../foamFormatConvert/foamFormatConvert.C | 9 ++- .../unmappedPassivePositionParticleCloud.H | 2 +- .../IOobjects/CompactIOField/CompactIOField.C | 20 +++--- .../IOobjects/CompactIOField/CompactIOField.H | 8 +-- .../IOobjects/CompactIOList/CompactIOList.C | 6 +- .../IOobjects/CompactIOList/CompactIOList.H | 2 +- src/OpenFOAM/db/IOobjects/IOField/IOField.C | 37 ++++++----- src/OpenFOAM/db/IOobjects/IOField/IOField.H | 5 +- .../decomposedBlockData/decomposedBlockData.C | 2 +- .../decomposedBlockData/decomposedBlockData.H | 2 +- .../db/IOstreams/Fstreams/masterOFstream.C | 10 +-- .../db/IOstreams/Fstreams/masterOFstream.H | 8 +-- src/OpenFOAM/db/Time/Time.H | 2 +- src/OpenFOAM/db/Time/TimeIO.C | 4 +- .../db/objectRegistry/objectRegistry.C | 4 +- .../db/objectRegistry/objectRegistry.H | 2 +- src/OpenFOAM/db/regIOobject/regIOobject.H | 12 ++-- src/OpenFOAM/db/regIOobject/regIOobjectRead.C | 10 +-- .../db/regIOobject/regIOobjectWrite.C | 8 +-- .../collatedFileOperation.C | 6 +- .../collatedFileOperation.H | 2 +- .../fileOperation/fileOperation.C | 4 +- .../fileOperation/fileOperation.H | 10 +-- .../masterUncollatedFileOperation.C | 32 ++++++---- .../masterUncollatedFileOperation.H | 10 +-- .../uncollatedFileOperation.C | 8 +-- .../uncollatedFileOperation.H | 4 +- src/OpenFOAM/global/profiling/profiling.C | 2 +- src/OpenFOAM/global/profiling/profiling.H | 2 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 4 +- .../polyBoundaryMesh/polyBoundaryMesh.H | 2 +- .../coordinate/systems/coordinateSystems.C | 10 +-- .../coordinate/systems/coordinateSystems.H | 4 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 8 +-- .../dynamicRefineFvMesh/dynamicRefineFvMesh.H | 2 +- .../motionSolvers/motionSolver/motionSolver.C | 2 +- .../motionSolvers/motionSolver/motionSolver.H | 2 +- .../polyTopoChange/hexRef8/hexRef8.C | 10 +-- .../polyTopoChange/hexRef8/hexRef8.H | 2 +- .../faMesh/faBoundaryMesh/faBoundaryMesh.C | 4 +- .../faMesh/faBoundaryMesh/faBoundaryMesh.H | 2 +- src/finiteArea/faMesh/faMesh.C | 2 +- src/finiteArea/faMesh/faMesh.H | 2 +- src/finiteVolume/fvMesh/fvMesh.C | 12 ++-- src/finiteVolume/fvMesh/fvMesh.H | 4 +- .../field/streamLine/streamLineParticle.C | 12 ++-- .../Templates/DSMCParcel/DSMCParcelIO.C | 17 +++--- src/lagrangian/basic/Cloud/Cloud.H | 2 +- src/lagrangian/basic/Cloud/CloudIO.C | 16 ++--- src/lagrangian/basic/IOPosition/IOPosition.C | 7 ++- src/lagrangian/basic/IOPosition/IOPosition.H | 4 +- .../basic/particle/particleTemplates.C | 16 ++--- .../CollidingParcel/CollidingParcelIO.C | 44 ++++++------- .../KinematicParcel/KinematicParcelIO.C | 48 +++++++-------- .../Templates/MPPICParcel/MPPICParcelIO.C | 9 ++- .../ReactingHeterogeneousParcelIO.C | 21 ++++--- .../ReactingMultiphaseParcelIO.C | 23 ++++--- .../ReactingParcel/ReactingParcelIO.C | 14 +++-- .../Templates/ThermoParcel/ThermoParcelIO.C | 12 ++-- .../AveragingMethod/AveragingMethod.C | 10 +-- .../AveragingMethod/AveragingMethod.H | 2 +- .../molecule/molecule/moleculeIO.C | 50 ++++++++------- .../solidParticle/solidParticleIO.C | 11 ++-- .../Templates/SprayParcel/SprayParcelIO.C | 61 ++++++++++--------- .../triSurfaceMesh/triSurfaceMesh.C | 2 +- .../triSurfaceMesh/triSurfaceMesh.H | 2 +- src/meshTools/topoSet/topoSets/cellZoneSet.C | 6 +- src/meshTools/topoSet/topoSets/cellZoneSet.H | 2 +- src/meshTools/topoSet/topoSets/faceZoneSet.C | 6 +- src/meshTools/topoSet/topoSets/faceZoneSet.H | 2 +- src/meshTools/topoSet/topoSets/pointZoneSet.C | 6 +- src/meshTools/topoSet/topoSets/pointZoneSet.H | 2 +- .../incompressiblePrimalSolver.H | 1 - .../dynamicOversetFvMesh.C | 7 ++- .../dynamicOversetFvMesh.H | 2 +- src/overset/oversetFvMesh/oversetFvMeshBase.C | 8 +-- src/overset/oversetFvMesh/oversetFvMeshBase.H | 2 +- .../staticOversetFvMesh/staticOversetFvMesh.C | 6 +- .../staticOversetFvMesh/staticOversetFvMesh.H | 2 +- .../distributedTriSurfaceMesh.C | 4 +- .../distributedTriSurfaceMesh.H | 2 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.C | 4 +- .../rigidBodyMeshMotion/rigidBodyMeshMotion.H | 2 +- .../rigidBodyMeshMotionSolver.C | 4 +- .../rigidBodyMeshMotionSolver.H | 2 +- .../sixDoFRigidBodyMotionSolver.C | 4 +- .../sixDoFRigidBodyMotionSolver.H | 2 +- .../MeshedSurfaceIOAllocator.C | 6 +- .../MeshedSurfaceIOAllocator.H | 2 +- src/surfMesh/polySurface/polySurface.H | 2 +- src/surfMesh/polySurface/polySurfaceIO.C | 2 +- src/surfMesh/surfMesh/surfMesh.H | 2 +- src/surfMesh/surfMesh/surfMeshIO.C | 6 +- 94 files changed, 415 insertions(+), 383 deletions(-) diff --git a/applications/test/IOField/Test-IOField.C b/applications/test/IOField/Test-IOField.C index 478d917359..d921dc09b0 100644 --- a/applications/test/IOField/Test-IOField.C +++ b/applications/test/IOField/Test-IOField.C @@ -46,35 +46,39 @@ using namespace Foam; template void doWrite(const IOobject& io, const label sz) { + const bool writeOnProc = (sz > 0); + IOField fld(io, sz); forAll(fld, i) { fld[i] = i + 1000.25 + (0.25 * i); } Pout<< "writing:" << fld << endl; - fld.write(sz > 0); + fld.write(writeOnProc); } template<> void doWrite(const IOobject& io, const label sz) { + const bool writeOnProc = (sz > 0); + IOField fld(io, sz); forAll(fld, i) { fld[i] = i % 2; } Pout<< "writing:" << fld << endl; - fld.write(sz > 0); + fld.write(writeOnProc); } template void doRead(const IOobject& io, const label sz) { - bool valid = (sz > 0); - Pout<< " valid:" << valid << endl; - IOField fld(io, valid); + const bool readOnProc = (sz > 0); + Pout<< " readOnProc:" << readOnProc << endl; + IOField fld(io, readOnProc); Pout<< " wanted:" << sz << " actually read:" << fld.size() << endl; if (fld.size() != sz) diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C index 45734f1ef5..e95503d021 100644 --- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C +++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C @@ -203,7 +203,7 @@ bool writeOptionalMeshObject const word& name, const fileName& meshDir, Time& runTime, - const bool valid + const bool writeOnProc ) { IOobject io @@ -218,8 +218,7 @@ bool writeOptionalMeshObject ); bool writeOk = false; - - bool haveFile = io.typeHeaderOk>(false); + const bool haveFile = io.typeHeaderOk>(false); // Make sure all know if there is a valid class name wordList classNames(1, io.headerClassName()); @@ -230,10 +229,10 @@ bool writeOptionalMeshObject { Info<< " Reading " << classNames[0] << " : " << name << endl; - T meshObject(io, valid && haveFile); + T meshObject(io, writeOnProc && haveFile); Info<< " Writing " << name << endl; - writeOk = meshObject.regIOobject::write(valid && haveFile); + writeOk = meshObject.regIOobject::write(writeOnProc && haveFile); } return writeOk; diff --git a/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H b/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H index 74cc738f15..031e04801c 100644 --- a/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H +++ b/applications/utilities/parallelProcessing/redistributePar/unmappedPassivePositionParticleCloud.H @@ -94,7 +94,7 @@ public: {} //- Disable writing objects - virtual bool writeObject(IOstreamOption, const bool valid) const + virtual bool writeObject(IOstreamOption, const bool writeOnProc) const { return true; } diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C index e89d103913..b37ae44d6b 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C +++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C @@ -32,11 +32,11 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -void Foam::CompactIOField::readFromStream(const bool valid) +void Foam::CompactIOField::readFromStream(const bool readOnProc) { - Istream& is = readStream(word::null, valid); + Istream& is = readStream(word::null, readOnProc); - if (valid) + if (readOnProc) { if (headerClassName() == IOField::typeName) { @@ -93,19 +93,19 @@ template Foam::CompactIOField::CompactIOField ( const IOobject& io, - const bool valid + const bool readOnProc ) : regIOobject(io) { if (readOpt() == IOobject::MUST_READ) { - readFromStream(valid); + readFromStream(readOnProc); } else if (isReadOptional()) { - bool haveFile = headerOk(); - readFromStream(valid && haveFile); + const bool haveFile = headerOk(); + readFromStream(readOnProc && haveFile); } } @@ -176,7 +176,7 @@ template bool Foam::CompactIOField::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { if (streamOpt.format() == IOstreamOption::ASCII) @@ -186,7 +186,7 @@ bool Foam::CompactIOField::writeObject const_cast(typeName) = IOField::typeName; - bool good = regIOobject::writeObject(streamOpt, valid); + bool good = regIOobject::writeObject(streamOpt, writeOnProc); // Restore type const_cast(typeName) = oldTypeName; @@ -194,7 +194,7 @@ bool Foam::CompactIOField::writeObject return good; } - return regIOobject::writeObject(streamOpt, valid); + return regIOobject::writeObject(streamOpt, writeOnProc); } diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H index fe7baa3a7e..506a0e0c67 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H +++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H @@ -76,8 +76,8 @@ class CompactIOField { // Private Member Functions - //- Read according to header type - void readFromStream(const bool valid = true); + //- Read according to header type, with optional 'on-proc' value + void readFromStream(const bool readOnProc = true); //- Read if IOobject flags set. Return true if read. // Reads according to the header type @@ -99,7 +99,7 @@ public: explicit CompactIOField(const IOobject& io); //- Construct from IOobject, with local processor conditional reading - CompactIOField(const IOobject& io, const bool valid); + CompactIOField(const IOobject& io, const bool readOnProc); //- Construct from IOobject and zero size (if not read) CompactIOField(const IOobject& io, Foam::zero); @@ -124,7 +124,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; virtual bool writeData(Ostream& os) const; diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C index 3780264f83..eb9ec7c591 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C +++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C @@ -169,7 +169,7 @@ template bool Foam::CompactIOList::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { if @@ -193,7 +193,7 @@ bool Foam::CompactIOList::writeObject const_cast(typeName) = IOList::typeName; - bool good = regIOobject::writeObject(streamOpt, valid); + bool good = regIOobject::writeObject(streamOpt, writeOnProc); // Change type back const_cast(typeName) = oldTypeName; @@ -201,7 +201,7 @@ bool Foam::CompactIOList::writeObject return good; } - return regIOobject::writeObject(streamOpt, valid); + return regIOobject::writeObject(streamOpt, writeOnProc); } diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H index 20312ff262..77d599428f 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H +++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H @@ -127,7 +127,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; virtual bool writeData(Ostream&) const; diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C index 516971f8c0..3c4a7a9eb5 100644 --- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C +++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C @@ -30,13 +30,25 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +template +void Foam::IOField::readFromStream(const bool readOnProc) +{ + Istream& is = readStream(typeName, readOnProc); + + if (readOnProc) + { + is >> *this; + } + close(); +} + + template bool Foam::IOField::readContents() { if (isReadRequired() || (isReadOptional() && headerOk())) { - readStream(typeName) >> *this; - close(); + readFromStream(); return true; } @@ -59,7 +71,7 @@ Foam::IOField::IOField(const IOobject& io) template -Foam::IOField::IOField(const IOobject& io, const bool valid) +Foam::IOField::IOField(const IOobject& io, const bool readOnProc) : regIOobject(io) { @@ -68,25 +80,12 @@ Foam::IOField::IOField(const IOobject& io, const bool valid) if (isReadRequired()) { - Istream& is = readStream(typeName, valid); - - if (valid) - { - is >> *this; - } - close(); + readFromStream(readOnProc); } else if (isReadOptional()) { - bool haveFile = headerOk(); - - Istream& is = readStream(typeName, haveFile && valid); - - if (valid && haveFile) - { - is >> *this; - } - close(); + const bool haveFile = headerOk(); + readFromStream(readOnProc && haveFile); } } diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H index bb6bff2584..3132244c2b 100644 --- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H +++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H @@ -59,6 +59,9 @@ class IOField { // Private Member Functions + //- Read with optional 'on-proc' value + void readFromStream(const bool readOnProc = true); + //- Read if IOobject flags set. Return true if read. bool readContents(); @@ -80,7 +83,7 @@ public: explicit IOField(const IOobject& io); //- Construct from IOobject, with local processor conditional reading - IOField(const IOobject& io, const bool valid); + IOField(const IOobject& io, const bool readOnProc); //- Construct from IOobject and zero size (if not read) IOField(const IOobject& io, Foam::zero); diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C index 1d5105688b..aff5bd271e 100644 --- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C +++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C @@ -1002,7 +1002,7 @@ bool Foam::decomposedBlockData::writeData(Ostream& os) const bool Foam::decomposedBlockData::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { autoPtr osPtr; diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H index 247a7006f2..bedc5e5e5e 100644 --- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H +++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.H @@ -188,7 +188,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C index 58f1caddf3..79da7ae93b 100644 --- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C +++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C @@ -101,7 +101,7 @@ void Foam::masterOFstream::commit() if (uniform) { - if (Pstream::master() && valid_) + if (Pstream::master() && writeOnProc_) { checkWrite(pathName_, this->str()); } @@ -116,7 +116,7 @@ void Foam::masterOFstream::commit() // Send my (valid) buffer to master if (!Pstream::master()) { - if (valid_) + if (writeOnProc_) { string s(this->str()); @@ -131,7 +131,7 @@ void Foam::masterOFstream::commit() if (Pstream::master()) { // Write (valid) master data - if (valid_) + if (writeOnProc_) { checkWrite(filePaths[Pstream::masterNo()], this->str()); } @@ -173,7 +173,7 @@ Foam::masterOFstream::masterOFstream const fileName& pathName, IOstreamOption streamOpt, IOstreamOption::appendType append, - const bool valid + const bool writeOnProc ) : OStringStream(streamOpt), @@ -181,7 +181,7 @@ Foam::masterOFstream::masterOFstream atomic_(atomic), compression_(streamOpt.compression()), append_(append), - valid_(valid) + writeOnProc_(writeOnProc) {} diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H index aa75227b94..4abeaf17e8 100644 --- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H +++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.H @@ -68,7 +68,7 @@ class masterOFstream const IOstreamOption::appendType append_; //- Should file be written (on this processor) - const bool valid_; + const bool writeOnProc_; // Private Member Functions @@ -100,7 +100,7 @@ public: const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), IOstreamOption::appendType append = IOstreamOption::NON_APPEND, - const bool valid = true + const bool writeOnProc = true ); //- Construct (with worldComm) @@ -110,7 +110,7 @@ public: const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), IOstreamOption::appendType append = IOstreamOption::NON_APPEND, - const bool valid = true + const bool writeOnProc = true ) : masterOFstream @@ -119,7 +119,7 @@ public: pathname, streamOpt, append, - valid + writeOnProc ) {} diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H index ec329333e7..f9a410114f 100644 --- a/src/OpenFOAM/db/Time/Time.H +++ b/src/OpenFOAM/db/Time/Time.H @@ -465,7 +465,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; //- Write the objects immediately (not at end of iteration) diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C index d41f0485f5..5f54fc28dc 100644 --- a/src/OpenFOAM/db/Time/TimeIO.C +++ b/src/OpenFOAM/db/Time/TimeIO.C @@ -547,7 +547,7 @@ bool Foam::Time::writeTimeDict() const bool Foam::Time::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { if (writeTime()) @@ -556,7 +556,7 @@ bool Foam::Time::writeObject if (writeOK) { - writeOK = objectRegistry::writeObject(streamOpt, valid); + writeOK = objectRegistry::writeObject(streamOpt, writeOnProc); } if (writeOK) diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C index 9f730d0375..13f1b5f16e 100644 --- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C +++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C @@ -500,7 +500,7 @@ bool Foam::objectRegistry::readIfModified() bool Foam::objectRegistry::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { bool ok = true; @@ -521,7 +521,7 @@ bool Foam::objectRegistry::writeObject if (iter.val()->writeOpt() != IOobjectOption::NO_WRITE) { - ok = iter.val()->writeObject(streamOpt, valid) && ok; + ok = iter.val()->writeObject(streamOpt, writeOnProc) && ok; } } diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H index d8a56712bb..f0cff91d5c 100644 --- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H +++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H @@ -585,7 +585,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H index bdd4d9ec25..ea84d29dc3 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.H +++ b/src/OpenFOAM/db/regIOobject/regIOobject.H @@ -114,7 +114,7 @@ private: // Private Member Functions //- Construct object stream, read header if not already constructed - void readStream(const bool valid); + void readStream(const bool readOnProc); //- No copy assignment void operator=(const regIOobject&) = delete; @@ -306,7 +306,7 @@ public: bool headerOk(); //- Return Istream and check object type against that given - Istream& readStream(const word&, const bool valid = true); + Istream& readStream(const word&, const bool readOnProc = true); //- Close Istream void close(); @@ -347,11 +347,11 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; //- Write using setting from DB - virtual bool write(const bool valid = true) const; + virtual bool write(const bool writeOnProc = true) const; // Other @@ -378,10 +378,10 @@ public: IOstreamOption::streamFormat fmt, IOstreamOption::versionNumber ver, IOstreamOption::compressionType cmp, - const bool valid + const bool writeOnProc ) const { - return writeObject(IOstreamOption(fmt, ver, cmp), valid); + return writeObject(IOstreamOption(fmt, ver, cmp), writeOnProc); } }; diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C index 9de632967e..7f47d0f818 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C +++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C @@ -83,7 +83,7 @@ bool Foam::regIOobject::readHeaderOk // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::regIOobject::readStream(const bool valid) +void Foam::regIOobject::readStream(const bool readOnProc) { if (readOpt() == IOobject::NO_READ) { @@ -117,7 +117,7 @@ void Foam::regIOobject::readStream(const bool valid) } } - isPtr_ = fileHandler().readStream(*this, objPath, type(), valid); + isPtr_ = fileHandler().readStream(*this, objPath, type(), readOnProc); } } @@ -125,7 +125,7 @@ void Foam::regIOobject::readStream(const bool valid) Foam::Istream& Foam::regIOobject::readStream ( const word& expectName, - const bool valid + const bool readOnProc ) { if (IFstream::debug) @@ -140,14 +140,14 @@ Foam::Istream& Foam::regIOobject::readStream // Construct IFstream if not already constructed if (!isPtr_) { - readStream(valid); + readStream(readOnProc); // Check the className of the regIOobject // dictionary is an allowable name in case the actual class // instantiated is a dictionary if ( - valid + readOnProc && expectName.size() && headerClassName() != expectName && headerClassName() != "dictionary" diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C index 42864ee98a..44dcdcd449 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C +++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C @@ -35,7 +35,7 @@ License bool Foam::regIOobject::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { if (!good()) @@ -107,7 +107,7 @@ bool Foam::regIOobject::writeObject bool osGood = false; if (!masterOnly || Pstream::master()) { - osGood = fileHandler().writeObject(*this, streamOpt, valid); + osGood = fileHandler().writeObject(*this, streamOpt, writeOnProc); } else { @@ -131,12 +131,12 @@ bool Foam::regIOobject::writeObject } -bool Foam::regIOobject::write(const bool valid) const +bool Foam::regIOobject::write(const bool writeOnProc) const { return writeObject ( IOstreamOption(time().writeFormat(), time().writeCompression()), - valid + writeOnProc ); } diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C index ec67865fca..e12779bf69 100644 --- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C +++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C @@ -364,7 +364,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject ( const regIOobject& io, IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { const Time& tm = io.time(); @@ -392,7 +392,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject pathName, streamOpt, IOstreamOption::NON_APPEND, - valid + writeOnProc ); // If any of these fail, return @@ -436,7 +436,7 @@ bool Foam::fileOperations::collatedFileOperation::writeObject pathName, streamOpt, IOstreamOption::NON_APPEND, - valid + writeOnProc ); // If any of these fail, return diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H index b789fee4a9..fdfd59c2c4 100644 --- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H +++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.H @@ -162,7 +162,7 @@ public: ( const regIOobject&, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const; // Other diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C index 62a485d85b..4fcef621cf 100644 --- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C +++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C @@ -801,10 +801,10 @@ bool Foam::fileOperation::writeObject ( const regIOobject& io, IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { - if (valid) + if (writeOnProc) { const fileName pathName(io.objectPath()); diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H index 982ac5dfe4..8da0f46275 100644 --- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H +++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.H @@ -433,7 +433,7 @@ public: regIOobject&, const fileName&, const word& typeName, - const bool valid = true + const bool readOnProc = true ) const = 0; //- Top-level read @@ -447,14 +447,14 @@ public: //- Writes a regIOobject (so header, contents and divider). // Returns success state. Default action is to write to - // the objectPath using writeData. If !valid the + // the objectPath using writeData. If !writeOnProc the // file does not need to be written (this is used e.g. to // suppress empty local lagrangian data) virtual bool writeObject ( const regIOobject& io, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const; @@ -477,7 +477,7 @@ public: ( const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const = 0; //- Generate an OSstream that writes a file @@ -486,7 +486,7 @@ public: IOstreamOption::atomicType atomic, const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const = 0; diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C index df2c0822c8..de391d0b0c 100644 --- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C +++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C @@ -1835,7 +1835,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream regIOobject& io, const fileName& fName, const word& typeName, - const bool valid + const bool readOnProc ) const { if (debug) @@ -1843,7 +1843,7 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream Pout<< "masterUncollatedFileOperation::readStream :" << " object : " << io.name() << " global : " << io.global() - << " fName : " << fName << " valid:" << valid << endl; + << " fName : " << fName << " readOnProc:" << readOnProc << endl; } @@ -2027,10 +2027,13 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream filePaths[Pstream::myProcNo()] = fName; Pstream::gatherList(filePaths); - boolList procValid(UPstream::listGatherValues(valid)); + boolList procValid + ( + UPstream::listGatherValues(readOnProc) + ); // NB: local proc validity information required on sub-ranks too! procValid.resize(Pstream::nProcs()); - procValid[Pstream::myProcNo()] = valid; + procValid[Pstream::myProcNo()] = readOnProc; return read(io, Pstream::worldComm, true, filePaths, procValid); } @@ -2041,10 +2044,13 @@ Foam::fileOperations::masterUncollatedFileOperation::readStream filePaths[Pstream::myProcNo(comm_)] = fName; Pstream::gatherList(filePaths, Pstream::msgType(), comm_); - boolList procValid(UPstream::listGatherValues(valid, comm_)); + boolList procValid + ( + UPstream::listGatherValues(readOnProc, comm_) + ); // NB: local proc validity information required on sub-ranks too! procValid.resize(Pstream::nProcs(comm_)); - procValid[Pstream::myProcNo(comm_)] = valid; + procValid[Pstream::myProcNo(comm_)] = readOnProc; // Uniform in local comm const bool uniform = uniformFile(filePaths); @@ -2139,7 +2145,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::writeObject ( const regIOobject& io, IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { fileName pathName(io.objectPath()); @@ -2147,7 +2153,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::writeObject if (debug) { Pout<< "masterUncollatedFileOperation::writeObject :" - << " io:" << pathName << " valid:" << valid << endl; + << " io:" << pathName << " writeOnProc:" << writeOnProc << endl; } // Make sure to pick up any new times @@ -2156,7 +2162,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::writeObject // Update meta-data for current state const_cast(io).updateMetaData(); - autoPtr osPtr(NewOFstream(pathName, streamOpt, valid)); + autoPtr osPtr(NewOFstream(pathName, streamOpt, writeOnProc)); OSstream& os = *osPtr; // If any of these fail, return (leave error handling to Ostream class) @@ -2406,7 +2412,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream ( const fileName& pathName, IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { return autoPtr @@ -2416,7 +2422,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream pathName, streamOpt, IOstreamOption::NON_APPEND, - valid + writeOnProc ) ); } @@ -2428,7 +2434,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream IOstreamOption::atomicType atomic, const fileName& pathName, IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { return autoPtr @@ -2439,7 +2445,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewOFstream pathName, streamOpt, IOstreamOption::NON_APPEND, - valid + writeOnProc ) ); } diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H index 54ce0dbd38..225102ab4d 100644 --- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H +++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H @@ -662,13 +662,13 @@ public: ) const; //- Reads header for regIOobject and returns an ISstream - // to read the contents. + //- to read the contents. virtual autoPtr readStream ( regIOobject&, const fileName&, const word& typeName, - const bool valid = true + const bool readOnProc = true ) const; //- Top-level read @@ -686,7 +686,7 @@ public: ( const regIOobject& io, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const; //- Generate an ISstream that reads a file @@ -697,7 +697,7 @@ public: ( const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const; //- Generate an OSstream that writes a file @@ -706,7 +706,7 @@ public: IOstreamOption::atomicType atomic, const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const; diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C index 39181c4702..8acc5692ad 100644 --- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C +++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C @@ -548,10 +548,10 @@ Foam::fileOperations::uncollatedFileOperation::readStream regIOobject& io, const fileName& fName, const word& typeName, - const bool valid + const bool writeOnProc ) const { - if (!valid) + if (!writeOnProc) { return autoPtr(new dummyISstream()); } @@ -718,7 +718,7 @@ Foam::fileOperations::uncollatedFileOperation::NewOFstream ( const fileName& pathName, IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { return autoPtr(new OFstream(pathName, streamOpt)); @@ -731,7 +731,7 @@ Foam::fileOperations::uncollatedFileOperation::NewOFstream IOstreamOption::atomicType atomic, const fileName& pathName, IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { return autoPtr(new OFstream(atomic, pathName, streamOpt)); diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H index 66949b2adc..d81c54d86d 100644 --- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H +++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H @@ -291,7 +291,7 @@ public: ( const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const; //- Generate an OSstream that writes a file @@ -300,7 +300,7 @@ public: IOstreamOption::atomicType, const fileName& pathname, IOstreamOption streamOpt = IOstreamOption(), - const bool valid = true + const bool writeOnProc = true ) const; }; diff --git a/src/OpenFOAM/global/profiling/profiling.C b/src/OpenFOAM/global/profiling/profiling.C index 74fb946cb9..7d4f10908f 100644 --- a/src/OpenFOAM/global/profiling/profiling.C +++ b/src/OpenFOAM/global/profiling/profiling.C @@ -386,7 +386,7 @@ bool Foam::profiling::writeData(Ostream& os) const bool Foam::profiling::writeObject ( IOstreamOption, - const bool valid + const bool writeOnProc ) const { return diff --git a/src/OpenFOAM/global/profiling/profiling.H b/src/OpenFOAM/global/profiling/profiling.H index fe711bad20..472a6b2c18 100644 --- a/src/OpenFOAM/global/profiling/profiling.H +++ b/src/OpenFOAM/global/profiling/profiling.H @@ -260,7 +260,7 @@ public: virtual bool writeObject ( IOstreamOption /*ignore*/, - const bool valid + const bool writeOnProc ) const; }; diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C index 5f7e691c76..2f2ce8a568 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C @@ -1246,11 +1246,11 @@ bool Foam::polyBoundaryMesh::writeData(Ostream& os) const bool Foam::polyBoundaryMesh::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { streamOpt.compression(IOstreamOption::UNCOMPRESSED); - return regIOobject::writeObject(streamOpt, valid); + return regIOobject::writeObject(streamOpt, writeOnProc); } diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H index 6230d222f4..8787136c47 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H @@ -315,7 +315,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; diff --git a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C index 296f9aae28..54a95185d2 100644 --- a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C +++ b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.C @@ -46,11 +46,11 @@ static const char* headerTypeCompat = "IOPtrList"; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::coordinateSystems::readFromStream(const bool valid) +void Foam::coordinateSystems::readFromStream(const bool readOnProc) { - Istream& is = readStream(word::null, valid); + Istream& is = readStream(word::null, readOnProc); - if (valid) + if (readOnProc) { if (headerClassName() == typeName) { @@ -308,14 +308,14 @@ bool Foam::coordinateSystems::writeData(Ostream& os) const bool Foam::coordinateSystems::writeObject ( IOstreamOption, - const bool valid + const bool writeOnProc ) const { // Force ASCII, uncompressed return regIOobject::writeObject ( IOstreamOption(IOstreamOption::ASCII), - valid + writeOnProc ); } diff --git a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H index de5b756425..3f4b483f8a 100644 --- a/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H +++ b/src/OpenFOAM/primitives/coordinate/systems/coordinateSystems.H @@ -84,7 +84,7 @@ class coordinateSystems // Private Member Functions //- Read "coordinateSystems" or older "IOPtrList" - void readFromStream(const bool valid = true); + void readFromStream(const bool readOnProc = true); //- Read if IOobject flags set. Return true if read. bool readContents(); @@ -184,7 +184,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid = true + const bool writeOnProc = true ) const; diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C index 5d5ad7e906..7c9eae6219 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C @@ -1486,7 +1486,7 @@ bool Foam::dynamicRefineFvMesh::update() bool Foam::dynamicRefineFvMesh::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { // Force refinement data to go to the current time directory. @@ -1494,9 +1494,9 @@ bool Foam::dynamicRefineFvMesh::writeObject bool writeOk = ( - //dynamicFvMesh::writeObject(streamOpt, valid) - dynamicMotionSolverListFvMesh::writeObject(streamOpt, valid) - && meshCutter_.write(valid) + //dynamicFvMesh::writeObject(streamOpt, writeOnProc) + dynamicMotionSolverListFvMesh::writeObject(streamOpt, writeOnProc) + && meshCutter_.write(writeOnProc) ); if (dumpLevel_) diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H index 53e245f702..99ece8c4ff 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H @@ -280,7 +280,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; }; diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C index 8ec0424182..1e2c396d35 100644 --- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C +++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C @@ -217,7 +217,7 @@ void Foam::motionSolver::updateMesh(const mapPolyMesh& mpm) bool Foam::motionSolver::writeObject ( IOstreamOption, - const bool valid + const bool writeOnProc ) const { return true; diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H index 576f4931b3..6e5d2e04a4 100644 --- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H +++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H @@ -174,7 +174,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; //- Read dynamicMeshDict dictionary diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C index 2a361e6bbd..81bb134441 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C @@ -5690,16 +5690,16 @@ void Foam::hexRef8::setUnrefinement // Write refinement to polyMesh directory. -bool Foam::hexRef8::write(const bool valid) const +bool Foam::hexRef8::write(const bool writeOnProc) const { bool writeOk = - cellLevel_.write(valid) - && pointLevel_.write(valid) - && level0Edge_.write(valid); + cellLevel_.write(writeOnProc) + && pointLevel_.write(writeOnProc) + && level0Edge_.write(writeOnProc); if (history_.active()) { - writeOk = writeOk && history_.write(valid); + writeOk = writeOk && history_.write(writeOnProc); } else { diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H index d82f7b4fef..d013c92a58 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H @@ -588,7 +588,7 @@ public: void setInstance(const fileName& inst); //- Force writing refinement+history to polyMesh directory. - bool write(const bool valid = true) const; + bool write(const bool writeOnProc = true) const; //- Helper: remove all relevant files from mesh instance static void removeFiles(const polyMesh&); diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C index 9dee45cd56..47fc2ff480 100644 --- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C +++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C @@ -909,14 +909,14 @@ bool Foam::faBoundaryMesh::writeData(Ostream& os) const bool Foam::faBoundaryMesh::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { // Allow/disallow compression? // 1. keep readable // 2. save some space // ??? streamOpt.compression(IOstreamOption::UNCOMPRESSED); - return regIOobject::writeObject(streamOpt, valid); + return regIOobject::writeObject(streamOpt, writeOnProc); } diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H index e3945375ea..ca64a6380c 100644 --- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H +++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.H @@ -244,7 +244,7 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C index 12d34152be..46719c6b86 100644 --- a/src/finiteArea/faMesh/faMesh.C +++ b/src/finiteArea/faMesh/faMesh.C @@ -1044,7 +1044,7 @@ Foam::boolList& Foam::faMesh::correctPatchPointNormals() const } -bool Foam::faMesh::write(const bool valid) const +bool Foam::faMesh::write(const bool writeOnProc) const { faceLabels_.write(); boundary_.write(); diff --git a/src/finiteArea/faMesh/faMesh.H b/src/finiteArea/faMesh/faMesh.H index 7ccfa6c268..a512b9de59 100644 --- a/src/finiteArea/faMesh/faMesh.H +++ b/src/finiteArea/faMesh/faMesh.H @@ -947,7 +947,7 @@ public: //- Write mesh - virtual bool write(const bool valid = true) const; + virtual bool write(const bool writeOnProc = true) const; // Member Operators diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C index 9d1765ad0d..f2759e7cdd 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -1048,13 +1048,13 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm) bool Foam::fvMesh::writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const { bool ok = true; if (phiPtr_) { - ok = phiPtr_->write(valid); + ok = phiPtr_->write(writeOnProc); // NOTE: The old old time mesh phi might be necessary for certain // solver smooth restart using second order time schemes. //ok = phiPtr_->oldTime().write(); @@ -1062,16 +1062,16 @@ bool Foam::fvMesh::writeObject if (V0Ptr_ && V0Ptr_->writeOpt() == IOobject::AUTO_WRITE) { // For second order restarts we need to write V0 - ok = V0Ptr_->write(valid); + ok = V0Ptr_->write(writeOnProc); } - return ok && polyMesh::writeObject(streamOpt, valid); + return ok && polyMesh::writeObject(streamOpt, writeOnProc); } -bool Foam::fvMesh::write(const bool valid) const +bool Foam::fvMesh::write(const bool writeOnProc) const { - return polyMesh::write(valid); + return polyMesh::write(writeOnProc); } diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H index 4b76ea8515..1d0d9b1fa2 100644 --- a/src/finiteVolume/fvMesh/fvMesh.H +++ b/src/finiteVolume/fvMesh/fvMesh.H @@ -508,11 +508,11 @@ public: virtual bool writeObject ( IOstreamOption streamOpt, - const bool valid + const bool writeOnProc ) const; //- Write mesh using IO settings from time - virtual bool write(const bool valid = true) const; + virtual bool write(const bool writeOnProc = true) const; // Member Operators diff --git a/src/functionObjects/field/streamLine/streamLineParticle.C b/src/functionObjects/field/streamLine/streamLineParticle.C index 41c2bb8e8d..c18415d524 100644 --- a/src/functionObjects/field/streamLine/streamLineParticle.C +++ b/src/functionObjects/field/streamLine/streamLineParticle.C @@ -388,21 +388,21 @@ void Foam::streamLineParticle::hitWallPatch void Foam::streamLineParticle::readFields(Cloud& c) { - const bool valid = c.size(); + const bool readOnProc = c.size(); particle::readFields(c); IOField