decomposePar: Do not register Lagrangian IOFields as the names may conflict with those of volFields

Required change to IOobjectList to support the optional no-registration specification
This commit is contained in:
Henry
2015-02-12 21:59:17 +00:00
parent 50268fb910
commit 525a0b3e0f
7 changed files with 36 additions and 21 deletions

View File

@ -123,7 +123,8 @@ const labelIOList& procAddressing
procMesh.meshSubDir, procMesh.meshSubDir,
procMesh, procMesh,
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
) )
) )
); );
@ -582,7 +583,10 @@ int main(int argc, char *argv[])
( (
mesh, mesh,
runTime.timeName(), runTime.timeName(),
cloud::prefix/cloudDirs[i] cloud::prefix/cloudDirs[i],
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
); );
IOobject* positionsPtr = sprayObjs.lookup(word("positions")); IOobject* positionsPtr = sprayObjs.lookup(word("positions"));
@ -664,7 +668,10 @@ int main(int argc, char *argv[])
( (
mesh, mesh,
runTime.timeName(), runTime.timeName(),
cloud::prefix/cloudDirs[cloudI] cloud::prefix/cloudDirs[cloudI],
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
); );
lagrangianFieldDecomposer::readFields lagrangianFieldDecomposer::readFields

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,7 +48,8 @@ Foam::dimFieldDecomposer::decomposeField
procMesh_.time().timeName(), procMesh_.time().timeName(),
procMesh_, procMesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
procMesh_, procMesh_,
field.dimensions(), field.dimensions(),

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -69,7 +69,6 @@ void Foam::domainDecomposition::mark
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// from components
Foam::domainDecomposition::domainDecomposition(const IOobject& io) Foam::domainDecomposition::domainDecomposition(const IOobject& io)
: :
fvMesh(io), fvMesh(io),

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -140,7 +140,8 @@ Foam::lagrangianFieldDecomposer::decomposeField
cloud::prefix/cloudName, cloud::prefix/cloudName,
procMesh_, procMesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
procField procField
) )
@ -171,7 +172,8 @@ Foam::lagrangianFieldDecomposer::decomposeFieldField
cloud::prefix/cloudName, cloud::prefix/cloudName,
procMesh_, procMesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
procField procField
) )

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,7 +83,8 @@ Foam::pointFieldDecomposer::decomposeField
procMesh_().time().timeName(), procMesh_().time().timeName(),
procMesh_(), procMesh_(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
procMesh_, procMesh_,
field.dimensions(), field.dimensions(),
@ -107,6 +108,4 @@ void Foam::pointFieldDecomposer::decomposeFields
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* // // ************************************************************************* //

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -40,7 +40,10 @@ Foam::IOobjectList::IOobjectList
( (
const objectRegistry& db, const objectRegistry& db,
const fileName& instance, const fileName& instance,
const fileName& local const fileName& local,
IOobject::readOption r,
IOobject::writeOption w,
bool registerObject
) )
: :
HashPtrTable<IOobject>() HashPtrTable<IOobject>()
@ -69,8 +72,9 @@ Foam::IOobjectList::IOobjectList
newInstance, newInstance,
local, local,
db, db,
IOobject::MUST_READ, r,
IOobject::NO_WRITE w,
registerObject
); );
if (objectPtr->headerOk()) if (objectPtr->headerOk())
@ -91,7 +95,7 @@ Foam::IOobjectList::IOobjectList(const IOobjectList& ioOL)
{} {}
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::IOobjectList::~IOobjectList() Foam::IOobjectList::~IOobjectList()
{} {}

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -70,7 +70,10 @@ public:
( (
const objectRegistry& db, const objectRegistry& db,
const fileName& instance, const fileName& instance,
const fileName& local = "" const fileName& local = "",
IOobject::readOption r = IOobject::MUST_READ,
IOobject::writeOption w = IOobject::NO_WRITE,
bool registerObject = true
); );
//- Construct as copy //- Construct as copy