Compare commits

..

17 Commits

Author SHA1 Message Date
622f476b32 ENH: additional SHA1Digest constructors and methods
- data_bytes(), size_bytes() methods to support broadcasting or
  gather/scatter content. Additional construct from raw bytes
  to support transmitted content.
2023-03-20 11:36:50 +01:00
7389ce15ce STYLE: readOnProc/writeOnProc instead of 'valid' for IO 2023-03-16 11:20:09 +01:00
f801e99f9e STYLE: use readValueEntry in BCs. Assign Zero for refValue/refGrad 2023-03-16 11:20:08 +01:00
34e36b83ab ENH: initEvaluate()/evaluate() for faePatchField, fvsPatchField
- no-op implementations, but makes the call to
  GeometricBoundaryField::evaluate() less dependent on PatchField type

- add updated()/manipulatedMatrix() methods to faePatchField,
  fvsPatchField etc. These are mostly no-ops, but provide name
  compatible with fvPatchField etc.
2023-03-16 11:15:35 +01:00
1d81190881 ENH: consistent reported topoSet counts (#2719) 2023-03-10 17:02:19 +00:00
25bc7d65f7 STYLE: prefer REGISTER/NO_REGISTER instead of true/false for IOobject
- self-documenting
2023-03-10 14:16:32 +00:00
20566a87f5 ENH: provide getter/setter interface to standard communicators
- similar to UPstream::parRun(), the setter returns the previous value.

  The accessors are prefixed with 'comm':
  Eg, commGlobal(), commWarn(), commWorld(), commSelf().
  This distinguishes them from any existing variables (eg, worldComm)
  and arguably more similar to MPI_COMM_WORLD etc...

  If demand-driven communicators are added in the future, the function
  call syntax can help encapsulate that.

  Previously:

      const label oldWarnComm = UPstream::warnComm;
      const label oldWorldComm = UPstream::worldComm;
      UPstream::warnComm = myComm;
      UPstream::worldComm = myComm;
      ...

      UPstream::warnComm = oldWarnComm;
      UPstream::worldComm = oldWorldComm;

  Now:
      const label oldWarnComm = UPstream::commWarn(myComm);
      const label oldWorldComm = UPstream::commWorld(myComm);
      ...

      UPstream::commWarn(oldWarnComm);
      UPstream::commWorld(oldWorldComm);

STYLE: check (warnComm >= 0) instead of (warnComm != -1)
2023-03-09 16:01:04 +00:00
06df44a588 COMP: protect against null tmp field (freestream BC) 2023-03-09 09:43:29 +00:00
b519a8e128 ENH: add finite-area uniformFixedValue
- deprecate timeVaryingUniformFixed (now redundant)
2023-03-08 15:32:34 +00:00
26400d7534 ENH: add finite-area extrapolatedCalculated BC 2023-03-08 15:31:01 +00:00
b17422ef1a ENH: use readValueEntry, readMixedEntries for simpler program control 2023-03-08 15:30:04 +00:00
42dba36832 ENH: consistent handling of "value" for faePatchField
- base level now explicity equivalent to LAZY_READ with overriding as
  required

- clearer documentation for reading of "value" for faPatchField
2023-03-08 12:02:41 +00:00
063227baed ENH: support readOption handling for patch fields (base level)
- constructing with valueRequired as a bool is still supported,
  but now also support more refined requirements
  (eg, NO_READ, MUST_READ, LAZY_READ)

- continue with LAZY_READ for finite-area fields
2023-03-07 17:24:28 +00:00
7e9b5dbc78 TUT: adjust height limiter and outflow BC for drippingChair 2023-03-03 20:55:10 +01:00
94df19a93a ENH: add finiteArea outletInlet patch type
STYLE: use readValueEntry and Field assign to simplify code
2023-03-03 18:53:58 +01:00
2ef89bf9d3 Merge branch 'primitiveMeshOptimization' into 'develop'
ENH: improved point-cell and cell-point topology methods (#2715)

See merge request Development/openfoam!597
2023-03-03 16:36:55 +00:00
074749a722 ENH: improved point-cell and cell-point topology methods (#2715) 2023-03-03 16:36:54 +00:00
696 changed files with 3977 additions and 2774 deletions

View File

@ -109,7 +109,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(Nv.dimensions(), Zero)

View File

@ -12,7 +12,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar("Ydefault", dimless, 1)
@ -29,7 +29,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar("p", dimPressure, p0)
@ -46,7 +46,7 @@ Info<< "Creating base fields for time " << runTime.timeName() << endl;
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar("T", dimTemperature, T0)

View File

@ -103,14 +103,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
<< exit(FatalIOError);
}
if (dict.found("value"))
{
fvPatchField<scalar>::operator=
(
scalarField("value", dict, p.size())
);
}
else
if (!this->readValueEntry(dict))
{
fvPatchField<scalar>::operator=(patchInternalField());
}

View File

@ -105,18 +105,15 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
<< exit(FatalIOError);
}
if (dict.found("value"))
if (this->readValueEntry(dict))
{
fvPatchField<vector>::operator=
(
vectorField("value", dict, p.size())
);
const auto* hasRefValue = dict.findEntry("refValue", keyType::LITERAL);
const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
if (dict.found("refValue") && dict.found("valueFraction"))
if (hasRefValue && hasFrac)
{
this->refValue() = vectorField("refValue", dict, p.size());
this->valueFraction() =
scalarField("valueFraction", dict, p.size());
this->refValue().assign(*hasRefValue, p.size());
this->valueFraction().assign(*hasFrac, p.size());
}
else
{

View File

@ -243,14 +243,12 @@ turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
<< exit(FatalError);
}
fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
if (dict.found("refValue"))
this->readValueEntry(dict, IOobjectOption::MUST_READ);
if (this->readMixedEntries(dict))
{
// Full restart
refValue() = scalarField("refValue", dict, p.size());
refGrad() = scalarField("refGradient", dict, p.size());
valueFraction() = scalarField("valueFraction", dict, p.size());
}
else
{

View File

@ -44,7 +44,7 @@ IOobject turbulencePropertiesHeader
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(false))

View File

@ -9,7 +9,7 @@ IOobject io
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOdictionary>())
@ -32,4 +32,4 @@ if (io.typeHeaderOk<IOdictionary>())
);
}
// ************************************************************************* //

View File

@ -84,7 +84,7 @@ Foam::surfaceTensionModels::liquidProperties::sigma() const
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh_,
dimSigma

View File

@ -724,7 +724,7 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::laserDTRM::Rp() const
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh_,
dimensionedScalar(dimPower/dimVolume/pow4(dimTemperature), Zero)

View File

@ -97,7 +97,7 @@ Foam::radiation::localDensityAbsorptionEmission::aCont(const label bandI) const
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh_,
dimensionedScalar(inv(dimLength), Zero)
@ -130,7 +130,7 @@ Foam::radiation::localDensityAbsorptionEmission::eCont(const label bandI) const
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh_,
dimensionedScalar(inv(dimLength), Zero)
@ -163,7 +163,7 @@ Foam::radiation::localDensityAbsorptionEmission::ECont(const label bandI) const
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)

View File

@ -46,7 +46,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false // Do not register
IOobject::NO_REGISTER
)
);

View File

@ -30,7 +30,7 @@
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimless,

View File

@ -48,7 +48,7 @@ Foam::phaseChangeTwoPhaseMixture::New
U.db(),
IOobject::MUST_READ,
IOobject::NO_WRITE,
false // Do not register
IOobject::NO_REGISTER
)
);

View File

@ -69,7 +69,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
size
);
@ -101,7 +101,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
@ -125,7 +125,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
size
);
@ -157,7 +157,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -46,35 +46,39 @@ using namespace Foam;
template<class Type>
void doWrite(const IOobject& io, const label sz)
{
const bool writeOnProc = (sz > 0);
IOField<Type> 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<bool>(const IOobject& io, const label sz)
{
const bool writeOnProc = (sz > 0);
IOField<bool> fld(io, sz);
forAll(fld, i)
{
fld[i] = i % 2;
}
Pout<< "writing:" << fld << endl;
fld.write(sz > 0);
fld.write(writeOnProc);
}
template<class Type>
void doRead(const IOobject& io, const label sz)
{
bool valid = (sz > 0);
Pout<< " valid:" << valid << endl;
IOField<Type> fld(io, valid);
const bool readOnProc = (sz > 0);
Pout<< " readOnProc:" << readOnProc << endl;
IOField<Type> fld(io, readOnProc);
Pout<< " wanted:" << sz << " actually read:" << fld.size() << endl;
if (fld.size() != sz)

View File

@ -92,8 +92,8 @@ int main(int argc, char *argv[])
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedVector(Zero)

View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -67,7 +67,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -116,7 +116,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -63,7 +63,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -51,7 +51,7 @@ void printInfo(const label comm)
<< " sub:" << UPstream::subProcs(comm) << nl;
if (UPstream::selfComm == comm)
if (UPstream::commSelf() == comm)
{
Pout<< "self all:" << UPstream::allProcs(comm)
<< " sub:" << UPstream::subProcs(comm) << nl;
@ -86,32 +86,32 @@ int main(int argc, char *argv[])
<< "nProcs = " << UPstream::nProcs()
<< " with " << UPstream::nComms() << " predefined comm(s)" << nl;
Info<< "worldComm : ";
printInfo(UPstream::worldComm);
Info<< "comm-world : ";
printInfo(UPstream::commWorld());
Info<< "selfComm : ";
printInfo(UPstream::selfComm);
Info<< "comm-self : ";
printInfo(UPstream::commSelf());
Info<< nl;
// Reductions (using MPI intrinsics)
{
label val = Pstream::myProcNo(UPstream::worldComm);
label val = Pstream::myProcNo(UPstream::commWorld());
label worldVal = returnReduce
(
val,
sumOp<label>(),
Pstream::msgType(),
UPstream::worldComm
UPstream::msgType(),
UPstream::commWorld()
);
label selfVal = returnReduce
(
val,
sumOp<label>(),
Pstream::msgType(),
UPstream::selfComm
UPstream::msgType(),
UPstream::commSelf()
);
Pout<< "value " << val
@ -123,8 +123,8 @@ int main(int argc, char *argv[])
{
Pair<label> val
(
Pstream::myProcNo(UPstream::worldComm),
Pstream::myProcNo(UPstream::worldComm)
Pstream::myProcNo(UPstream::commWorld()),
Pstream::myProcNo(UPstream::commWorld())
);
Pair<label> worldVal = val;
@ -133,8 +133,8 @@ int main(int argc, char *argv[])
(
worldVal,
minFirstEqOp<label>(),
Pstream::msgType(),
UPstream::worldComm
UPstream::msgType(),
UPstream::commWorld()
);
Pair<label> selfVal = val;
@ -143,8 +143,8 @@ int main(int argc, char *argv[])
(
worldVal,
minFirstEqOp<label>(),
Pstream::msgType(),
UPstream::selfComm
UPstream::msgType(),
UPstream::commSelf()
);
Pout<< "value " << val

View File

@ -150,11 +150,7 @@ int main(int argc, char *argv[])
Pout<< "localValue :" << localValue << endl;
label comm = Pstream::allocateCommunicator
(
UPstream::worldComm,
top
);
label comm = UPstream::allocateCommunicator(UPstream::worldComm, top);
Pout<< "allocated comm :" << comm << endl;
Pout<< "comm myproc :" << Pstream::myProcNo(comm)
@ -173,7 +169,7 @@ int main(int argc, char *argv[])
Pout<< "sum :" << sum << endl;
}
Pstream::freeCommunicator(comm);
UPstream::freeCommunicator(comm);
Pout<< "End\n" << endl;

View File

@ -88,12 +88,12 @@ int main(int argc, char *argv[])
//- Process IDs within a given communicator
Info<< "procIDs: "
<< flatOutput(UPstream::procID(UPstream::worldComm)) << endl;
<< flatOutput(UPstream::procID(UPstream::commWorld())) << endl;
rankInfo(UPstream::worldComm);
rankInfo(UPstream::commWorld());
Pout<< endl;
const int myProci = UPstream::myProcNo(UPstream::worldComm);
const int myProci = UPstream::myProcNo(UPstream::commWorld());
int localRanki = myProci;
labelList subRanks;
@ -101,9 +101,9 @@ int main(int argc, char *argv[])
#if 1
// With first ranks
subRanks = identity(UPstream::nProcs(UPstream::worldComm) / 2);
subRanks = identity(UPstream::nProcs(UPstream::commWorld()) / 2);
newComm.reset(UPstream::worldComm, subRanks);
newComm.reset(UPstream::commWorld(), subRanks);
localRanki = UPstream::myProcNo(newComm);
Pout.prefix() =
@ -120,14 +120,14 @@ int main(int argc, char *argv[])
#if 1
// With every other rank
subRanks = identity(UPstream::nProcs(UPstream::worldComm));
subRanks = identity(UPstream::nProcs(UPstream::commWorld()));
for (label& val : subRanks)
{
if (val % 2) val = -1;
}
newComm.reset(UPstream::worldComm, subRanks);
newComm.reset(UPstream::commWorld(), subRanks);
localRanki = UPstream::myProcNo(newComm);
Pout.prefix() =
@ -165,19 +165,19 @@ int main(int argc, char *argv[])
}
if (Pstream::parRun() && args.found("host-comm"))
{
// Host communicator, based on the current worldComm
// Host communicator, based on the current world communicator
// Use hostname
// Lowest rank per hostname is the IO rank
label numprocs = UPstream::nProcs(UPstream::globalComm);
label numprocs = UPstream::nProcs(UPstream::commGlobal());
stringList hosts(numprocs);
hosts[Pstream::myProcNo(UPstream::globalComm)] = hostName();
hosts[Pstream::myProcNo(UPstream::commGlobal())] = hostName();
labelList hostIDs_;
// Compact
if (Pstream::master(UPstream::globalComm))
if (Pstream::master(UPstream::commGlobal()))
{
DynamicList<word> hostNames(numprocs);
hostIDs_.resize_nocopy(numprocs);
@ -196,10 +196,10 @@ int main(int argc, char *argv[])
}
}
Pstream::broadcasts(UPstream::globalComm, hostIDs_);
Pstream::broadcasts(UPstream::commGlobal(), hostIDs_);
const label myHostId =
hostIDs_[Pstream::myProcNo(UPstream::globalComm)];
hostIDs_[Pstream::myProcNo(UPstream::commGlobal())];
DynamicList<label> subRanks;
forAll(hostIDs_, proci)
@ -210,11 +210,11 @@ int main(int argc, char *argv[])
}
}
// Allocate new communicator with globalComm as its parent
// Allocate new communicator with global communicator as its parent
const label hostComm =
UPstream::allocateCommunicator
(
UPstream::globalComm, // parent
UPstream::commGlobal(),
subRanks,
true
);

View File

@ -204,7 +204,7 @@ int main(int argc, char *argv[])
*dummyTimePtr,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // do not register
IOobject::NO_REGISTER
);
Info<< "Testing searchable sphere" << endl;

View File

@ -510,7 +510,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
std::move(surf)
);

View File

@ -74,7 +74,7 @@ autoPtr<IOdictionary> meshDictPtr;
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false, // no registerObject
IOobject::NO_REGISTER,
true // is globalObject
);

View File

@ -16,7 +16,7 @@
runTime,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOdictionary>(true))

View File

@ -16,7 +16,7 @@
runTime,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOdictionary>(true))

View File

@ -16,7 +16,7 @@
runTime,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOdictionary>(true))

View File

@ -16,7 +16,7 @@
runTime,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOdictionary>(true))

View File

@ -191,7 +191,7 @@ int main(int argc, char *argv[])
runTime, // registry
IOobject::NO_READ,
IOobject::NO_WRITE,
false // Do not register
IOobject::NO_REGISTER
)
);

View File

@ -73,7 +73,7 @@ autoPtr<IOdictionary> meshDictPtr;
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (!meshDictIO.typeHeaderOk<IOdictionary>(true))

View File

@ -679,7 +679,7 @@ int main(int argc, char *argv[])
runTimeExtruded, //mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
)
);
@ -774,7 +774,7 @@ int main(int argc, char *argv[])
runTimeExtruded,
IOobject::READ_IF_PRESENT, // Read fv* if present
IOobject::AUTO_WRITE,
false
IOobject::NO_REGISTER
),
mesh
);

View File

@ -1272,7 +1272,7 @@ void extrudeGeometricProperties
regionMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
regionMesh.nFaces()
);
@ -1356,7 +1356,7 @@ void extrudeGeometricProperties
regionMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
regionMesh.nCells()
);
@ -2389,10 +2389,10 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_REGISTER
),
Zero,
false
Foam::zero{},
false // syncPar
);
// Add the new patches
@ -2559,7 +2559,7 @@ int main(int argc, char *argv[])
regionMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
extruder.cellToFaceMap()
);
@ -2575,7 +2575,7 @@ int main(int argc, char *argv[])
regionMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
extruder.faceToFaceMap()
);
@ -2592,7 +2592,7 @@ int main(int argc, char *argv[])
regionMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
extruder.faceToEdgeMap()
);
@ -2609,7 +2609,7 @@ int main(int argc, char *argv[])
regionMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
extruder.pointToPointMap()
);

View File

@ -153,7 +153,7 @@ int main(int argc, char *argv[])
runTimeExtruded,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
@ -204,7 +204,7 @@ int main(int argc, char *argv[])
runTimeExtruded,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
std::move(poly2DMesh.points()),
std::move(poly2DMesh.faces()),

View File

@ -726,7 +726,7 @@ Foam::backgroundMeshDecomposition::backgroundMeshDecomposition
runTime_,
IOobject::MUST_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_REGISTER
)
),
meshCutter_

View File

@ -387,7 +387,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<pointScalarField>(true))
@ -404,7 +404,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
mesh.time(),
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -176,55 +176,43 @@ void Foam::fileControl::initialVertices
{
Info<< " Reading points from file : " << pointsFile_ << endl;
pointIOField pointsTmp
pts = pointIOField::readContents
(
IOobject
(
pointsFile_,
runTime_.constant(),
runTime_,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::MUST_READ
)
);
pts.transfer(pointsTmp);
Info<< " Reading sizes from file : " << sizesFile_ << endl;
scalarIOField sizesTmp
sizes = scalarIOField::readContents
(
IOobject
(
sizesFile_,
runTime_.constant(),
runTime_,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::MUST_READ
)
);
sizes.transfer(sizesTmp);
Info<< " Reading alignments from file : " << alignmentsFile_ << endl;
triadIOField alignmentsTmp
alignments = triadIOField::readContents
(
IOobject
(
alignmentsFile_,
runTime_.constant(),
runTime_,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::MUST_READ
)
);
alignments.transfer(alignmentsTmp);
if ((pts.size() != sizes.size()) || (pts.size() != alignments.size()))
{
FatalErrorInFunction

View File

@ -299,8 +299,8 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
// "tetDualMesh"/polyMesh::meshSubDir,
// runTime_,
// IOobject::NO_READ,
// IOobject::AUTO_WRITE,
// false
// IOobject::NO_WRITE,
// IOobject::NO_REGISTER
// ),
// labelUIndList
// (
@ -346,8 +346,8 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
// "tetDualMesh"/polyMesh::meshSubDir,
// runTime_,
// IOobject::NO_READ,
// IOobject::AUTO_WRITE,
// false
// IOobject::NO_WRITE,
// IOobject::NO_REGISTER
// ),
// points
// );
@ -605,7 +605,7 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
runTime_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
patchNames,
patchDicts

View File

@ -603,7 +603,7 @@ int main(int argc, char *argv[])
fvm.time(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
fvm,
dimensionedScalar(dimLength, Zero)
@ -668,7 +668,7 @@ int main(int argc, char *argv[])
fvm.time(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
pointMesh::New(fvm),
dimensionedScalar(dimLength, Zero)

View File

@ -619,8 +619,8 @@ int main(int argc, char *argv[])
"triSurface",
runTime, // registry
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
s
);

View File

@ -327,8 +327,8 @@ int main(int argc, char *argv[])
"triSurface",
runTime, // registry
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
s
);

View File

@ -158,7 +158,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
std::move(poly2DMesh.points()),
std::move(poly2DMesh.faces()),

View File

@ -134,8 +134,8 @@ void writeSurfaceField
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -193,8 +193,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -227,8 +227,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -279,8 +279,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -316,8 +316,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -351,8 +351,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -386,8 +386,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -416,8 +416,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -445,8 +445,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimVolume, Zero),
@ -476,8 +476,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -511,8 +511,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar("minTetVolume", dimless, GREAT),
@ -577,8 +577,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar("minPyrVolume", dimless, GREAT),
@ -650,8 +650,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -701,8 +701,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(scalar(-1)),
@ -740,8 +740,8 @@ void Foam::writeFields
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(scalar(-1)),

View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -90,7 +90,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -73,7 +73,7 @@ tmp<volScalarField> createScalarField
(
const fvMesh& mesh,
const word& name,
const labelList& elems
const labelUList& elems
)
{
tmp<volScalarField> tfld
@ -87,7 +87,7 @@ tmp<volScalarField> createScalarField
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -1343,7 +1343,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
refData.updateMesh(map());
@ -1387,7 +1387,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
map().cellMap()
).write();
@ -1402,7 +1402,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
map().faceMap()
).write();
@ -1417,7 +1417,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
map().pointMap()
).write();

View File

@ -150,7 +150,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -913,7 +913,7 @@ void createAndWriteRegion
newMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
map().pointMap()
);
@ -932,7 +932,7 @@ void createAndWriteRegion
newMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
newMesh().nFaces()
);
@ -970,7 +970,7 @@ void createAndWriteRegion
newMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
map().cellMap()
);
@ -989,7 +989,7 @@ void createAndWriteRegion
newMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
labelList(nNewPatches, -1)
);
@ -1409,7 +1409,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
cellRegion
);
@ -1429,7 +1429,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, Zero),
@ -1716,7 +1716,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh
);

View File

@ -414,7 +414,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -106,7 +106,7 @@ bool writeZones
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
bool writeOk = false;
@ -203,7 +203,7 @@ bool writeOptionalMeshObject
const word& name,
const fileName& meshDir,
Time& runTime,
const bool valid
const bool writeOnProc
)
{
IOobject io
@ -214,12 +214,11 @@ bool writeOptionalMeshObject
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
bool writeOk = false;
bool haveFile = io.typeHeaderOk<IOField<label>>(false);
const bool haveFile = io.typeHeaderOk<IOField<label>>(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;

View File

@ -31,8 +31,8 @@ Description
\*---------------------------------------------------------------------------*/
#ifndef writeMeshObject_H
#define writeMeshObject_H
#ifndef Foam_writeMeshObject_H
#define Foam_writeMeshObject_H
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -59,7 +59,7 @@ inline bool writeMeshObject
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
bool writeOk = false;

View File

@ -94,7 +94,7 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
mesh,
dimensioned<Type>(dimless, Zero)

View File

@ -189,7 +189,7 @@ autoPtr<labelIOList> procAddressing
procMesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false // do not register
IOobject::NO_REGISTER
)
);
}
@ -505,7 +505,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
decompDictFile,
args.getOrDefault<label>("domains", 0),
@ -543,7 +543,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false // do not register
IOobject::NO_REGISTER
),
decompDictFile
)
@ -653,7 +653,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
decompDictFile
);
@ -683,7 +683,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
procIds
);
@ -816,7 +816,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false // not registered
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<faBoundaryMesh>(true))

View File

@ -91,7 +91,7 @@ Foam::domainDecomposition::domainDecomposition
*this,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
)
: nullptr
@ -221,7 +221,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
*this,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
@ -767,7 +767,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
procMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
std::move(procPoints)
);
@ -831,7 +831,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
procMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
baseMeshData,
procCellAddressing_[proci],
@ -907,7 +907,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
procMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false // not registered
IOobject::NO_REGISTER
);
// pointProcAddressing

View File

@ -153,7 +153,7 @@ void Foam::domainDecompositionDryRun::execute
// mesh_,
// IOobject::NO_READ,
// IOobject::NO_WRITE,
// false
// IOobject::NO_REGISTER
// ),
// std::move(cellToProc)
// );

View File

@ -48,7 +48,7 @@ void Foam::domainDecompositionDryRun::writeVolField
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
this->mesh(),
dimensionedScalar("cellDist", dimless, -1),

View File

@ -49,7 +49,7 @@ void Foam::domainDecomposition::writeVolField
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
this->mesh(),
dimensionedScalar("cellDist", dimless, -1),

View File

@ -780,7 +780,7 @@ int main(int argc, char *argv[])
procMesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
)
);
@ -822,7 +822,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
cellMaps,
pointMaps,
@ -853,7 +853,7 @@ int main(int argc, char *argv[])
procMesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
)
);
@ -895,7 +895,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
cellMaps,
pointMaps,

View File

@ -353,7 +353,7 @@ boundBox procBounds
procDb,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
@ -382,7 +382,7 @@ void writeDistribution
masterMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
masterMesh.nCells()
);
@ -418,7 +418,7 @@ void writeDistribution
masterMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
masterMesh,
dimensionedScalar("cellDist", dimless, -1),
@ -498,7 +498,7 @@ void writeMaps
procMesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // Do not register
IOobject::NO_REGISTER
);

View File

@ -114,7 +114,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFields
srcMesh_,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
label(0)
);
@ -130,7 +130,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFields
tgtMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (field.size())
@ -218,7 +218,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFieldFields
srcMesh_,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
label(0)
);
@ -235,7 +235,7 @@ Foam::label Foam::parLagrangianDistributor::distributeFieldFields
tgtMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (field.size())
@ -363,7 +363,7 @@ Foam::label Foam::parLagrangianDistributor::distributeStoredFields
tgtMesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (field.size())

View File

@ -397,7 +397,7 @@ void writeDecomposition
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
decomp
);
@ -415,7 +415,7 @@ void writeDecomposition
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // do not register
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(name, dimless, -1),
@ -891,7 +891,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
hexRef8Data refData(io);
@ -2592,7 +2592,7 @@ int main(int argc, char *argv[])
areaProcMeshPtr->thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
faDistMap
).write();

View File

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

View File

@ -49,7 +49,7 @@ if (timeDirs.size() > 1)
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // no register
IOobject::NO_REGISTER
).typeHeaderOk<pointIOField>(true, false)
)
{

View File

@ -42,7 +42,7 @@ label timeIndex = 0;
runTime,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false // no register
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOdictionary>(true, false))

View File

@ -55,7 +55,7 @@ Foam::label Foam::checkData
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // no register
IOobject::NO_REGISTER
).typeHeaderOk<volScalarField>(false, false);
if (!good)

View File

@ -7,7 +7,7 @@
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // no register
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<pointIOField>(true, false))

View File

@ -211,7 +211,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false, // no register
IOobject::NO_REGISTER,
true // global-like
)
);

View File

@ -169,7 +169,7 @@ void fieldInterpolator::interpolate()
objects_[fieldName]->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
fieldName,
selectedTimeNames,

View File

@ -10,7 +10,7 @@
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
)
);

View File

@ -84,7 +84,7 @@ void blendField
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (fieldHeader.typeHeaderOk<volScalarField>(true))
@ -122,7 +122,7 @@ void calcOmegaField
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (omegaHeader.typeHeaderOk<volScalarField>(true))
@ -159,7 +159,7 @@ void setField
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (fldHeader.typeHeaderOk<volScalarField>(true))

View File

@ -548,7 +548,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
const_cast<word&>(IOPtrList<entry>::typeName) = oldTypeName;
@ -672,7 +672,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (fieldHeader.typeHeaderOk<localIOdictionary>(false))

View File

@ -59,7 +59,7 @@ Foam::IOPtrList<Foam::entry> Foam::boundaryInfo::readBoundaryDict
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
@ -75,8 +75,7 @@ Foam::IOPtrList<Foam::entry> Foam::boundaryInfo::readBoundaryDict
if (!procPatch)
{
label nFaces = dict.get<label>("nFaces");
reduce(nFaces, sumOp<label>());
if (nFaces == 0)
if (returnReduceAnd(nFaces == 0))
{
addPatch = false;
}

View File

@ -108,7 +108,7 @@ Foam::dictionary Foam::solverTemplate::readFluidFieldTemplates
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -89,7 +89,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
boundary.size()
);

View File

@ -287,7 +287,7 @@ void rewriteField
runTime,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
const_cast<word&>(IOdictionary::typeName) = oldTypeName;
@ -455,7 +455,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOPtrList<entry>>(false))
@ -489,7 +489,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
if (io.typeHeaderOk<IOPtrList<entry>>(false))

View File

@ -82,7 +82,7 @@ void MapLagrangianFields
meshTarget,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
addParticles.size()
);
@ -121,7 +121,7 @@ void MapLagrangianFields
meshTarget,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
addParticles.size()
);
@ -159,7 +159,7 @@ void MapLagrangianFields
meshTarget,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
addParticles.size()
);

View File

@ -67,7 +67,7 @@ int readNumProcs
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false // do not register
IOobject::NO_REGISTER
),
args.getOrDefault<fileName>(optionName, "")
)
@ -360,7 +360,7 @@ int main(int argc, char *argv[])
runTimeTarget,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -81,7 +81,7 @@ void MapLagrangianFields
meshTarget,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
addParticles.size()
);
@ -123,7 +123,7 @@ void MapLagrangianFields
meshTarget,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
min(fieldSource.size(), addParticles.size()) // handle 0 size
);
@ -172,7 +172,7 @@ void MapLagrangianFields
meshTarget,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
min(fieldSource.size(), addParticles.size()) // handle 0 size
);

View File

@ -313,7 +313,7 @@ int main(int argc, char *argv[])
runTimeTarget,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -58,7 +58,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);

View File

@ -47,16 +47,14 @@ int main(int argc, char *argv[])
const dictionary NURBSdict
(
IOdictionary
IOdictionary::readContents
(
IOobject
(
"dynamicMeshDict",
mesh.time().constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::MUST_READ
)
).subDict("volumetricBSplinesMotionSolverCoeffs")
);

View File

@ -197,7 +197,7 @@ int main(int argc, char *argv[])
mesh.thisDb(),
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
);
const bool headOk = fieldHeader.typeHeaderOk<IOdictionary>(false);

View File

@ -163,7 +163,7 @@ bool setField
mesh.thisDb(),
IOobject::MUST_READ,
IOobject::NO_WRITE,
false // No register
IOobject::NO_REGISTER
),
mesh
);

View File

@ -148,7 +148,7 @@ IOobject createIOobject
mesh,
rOpt,
IOobject::NO_WRITE,
false // do not register
IOobject::NO_REGISTER
);
}
@ -377,7 +377,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false // do not register
IOobject::NO_REGISTER
),
mesh,
dimensionedScalar(dimless, scalar(1)),

View File

@ -480,7 +480,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
@ -824,7 +824,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
nCoarseFaces
);
@ -1273,7 +1273,7 @@ int main(int argc, char *argv[])
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
std::move(globalFaceFaces)
);

View File

@ -1811,7 +1811,7 @@ int main(int argc, char *argv[])
runTime, // registry
IOobject::NO_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
feMesh.points(),
feMesh.edges()

View File

@ -639,8 +639,8 @@ int main(int argc, char *argv[])
"triSurface",
runTime, // registry
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
IOobject::NO_WRITE,
IOobject::NO_REGISTER
),
feMesh.points(),
feMesh.edges()

View File

@ -228,7 +228,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
args.getOrDefault<fileName>("dict", "")
);

View File

@ -188,7 +188,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
args.getOrDefault<fileName>("dict", "")
);

View File

@ -200,7 +200,7 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
),
args.getOrDefault<fileName>("dict", "")
);

View File

@ -81,12 +81,11 @@ int main(int argc, char *argv[])
runTime,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
IOobject::NO_REGISTER
)
);
const scalar P = 1e5;
const scalar T = 3000.0;

View File

@ -93,10 +93,7 @@ CONSTRUCT
/*
//Initialise with the value entry if evaluation is not possible
FVPATCHF::operator=
(
FIELD("value", dict, p.size())
);
this->readValueEntry(dict, IOobjectOption::MUST_READ);
this->refValue() = *this;
*/
}

View File

@ -32,11 +32,11 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class T, class BaseType>
void Foam::CompactIOField<T, BaseType>::readFromStream(const bool valid)
void Foam::CompactIOField<T, BaseType>::readFromStream(const bool readOnProc)
{
Istream& is = readStream(word::null, valid);
Istream& is = readStream(word::null, readOnProc);
if (valid)
if (readOnProc)
{
if (headerClassName() == IOField<T>::typeName)
{
@ -93,19 +93,19 @@ template<class T, class BaseType>
Foam::CompactIOField<T, BaseType>::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<class T, class BaseType>
bool Foam::CompactIOField<T, BaseType>::writeObject
(
IOstreamOption streamOpt,
const bool valid
const bool writeOnProc
) const
{
if (streamOpt.format() == IOstreamOption::ASCII)
@ -186,7 +186,7 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
const_cast<word&>(typeName) = IOField<T>::typeName;
bool good = regIOobject::writeObject(streamOpt, valid);
bool good = regIOobject::writeObject(streamOpt, writeOnProc);
// Restore type
const_cast<word&>(typeName) = oldTypeName;
@ -194,7 +194,7 @@ bool Foam::CompactIOField<T, BaseType>::writeObject
return good;
}
return regIOobject::writeObject(streamOpt, valid);
return regIOobject::writeObject(streamOpt, writeOnProc);
}

View File

@ -77,7 +77,7 @@ class CompactIOField
// Private Member Functions
//- Read according to header type
void readFromStream(const bool valid = true);
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;

View File

@ -169,7 +169,7 @@ template<class T, class BaseType>
bool Foam::CompactIOList<T, BaseType>::writeObject
(
IOstreamOption streamOpt,
const bool valid
const bool writeOnProc
) const
{
if
@ -193,7 +193,7 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
const_cast<word&>(typeName) = IOList<T>::typeName;
bool good = regIOobject::writeObject(streamOpt, valid);
bool good = regIOobject::writeObject(streamOpt, writeOnProc);
// Change type back
const_cast<word&>(typeName) = oldTypeName;
@ -201,7 +201,7 @@ bool Foam::CompactIOList<T, BaseType>::writeObject
return good;
}
return regIOobject::writeObject(streamOpt, valid);
return regIOobject::writeObject(streamOpt, writeOnProc);
}

View File

@ -127,7 +127,7 @@ public:
virtual bool writeObject
(
IOstreamOption streamOpt,
const bool valid
const bool writeOnProc
) const;
virtual bool writeData(Ostream&) const;

View File

@ -59,7 +59,7 @@ Foam::IOField<Type>::IOField(const IOobject& io)
template<class Type>
Foam::IOField<Type>::IOField(const IOobject& io, const bool valid)
Foam::IOField<Type>::IOField(const IOobject& io, const bool readOnProc)
:
regIOobject(io)
{
@ -68,9 +68,9 @@ Foam::IOField<Type>::IOField(const IOobject& io, const bool valid)
if (isReadRequired())
{
Istream& is = readStream(typeName, valid);
Istream& is = readStream(typeName, readOnProc);
if (valid)
if (readOnProc)
{
is >> *this;
}
@ -78,11 +78,11 @@ Foam::IOField<Type>::IOField(const IOobject& io, const bool valid)
}
else if (isReadOptional())
{
bool haveFile = headerOk();
const bool haveFile = headerOk();
Istream& is = readStream(typeName, haveFile && valid);
Istream& is = readStream(typeName, readOnProc && haveFile);
if (valid && haveFile)
if (readOnProc && haveFile)
{
is >> *this;
}

View File

@ -80,7 +80,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);

View File

@ -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<OSstream> osPtr;

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