Commit 6c99006f authored by mattijs's avatar mattijs
Browse files

ENH: polyMesh: allow *zones only at faces instance. Fixes #982.

parent f0cada17
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,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-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
...@@ -216,7 +216,13 @@ Foam::polyMesh::polyMesh(const IOobject& io) ...@@ -216,7 +216,13 @@ Foam::polyMesh::polyMesh(const IOobject& io)
IOobject IOobject
( (
"boundary", "boundary",
time().findInstance(meshDir(), "boundary"), time().findInstance // allow 'newer' boundary file
(
meshDir(),
"boundary",
IOobject::MUST_READ,
faces_.instance()
),
meshSubDir, meshSubDir,
*this, *this,
IOobject::MUST_READ, IOobject::MUST_READ,
...@@ -235,12 +241,13 @@ Foam::polyMesh::polyMesh(const IOobject& io) ...@@ -235,12 +241,13 @@ Foam::polyMesh::polyMesh(const IOobject& io)
IOobject IOobject
( (
"pointZones", "pointZones",
time().findInstance //time().findInstance
( //(
meshDir(), // meshDir(),
"pointZones", // "pointZones",
IOobject::READ_IF_PRESENT // IOobject::READ_IF_PRESENT
), //),
faces_.instance(),
meshSubDir, meshSubDir,
*this, *this,
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
...@@ -253,12 +260,13 @@ Foam::polyMesh::polyMesh(const IOobject& io) ...@@ -253,12 +260,13 @@ Foam::polyMesh::polyMesh(const IOobject& io)
IOobject IOobject
( (
"faceZones", "faceZones",
time().findInstance //time().findInstance
( //(
meshDir(), // meshDir(),
"faceZones", // "faceZones",
IOobject::READ_IF_PRESENT // IOobject::READ_IF_PRESENT
), //),
faces_.instance(),
meshSubDir, meshSubDir,
*this, *this,
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
...@@ -271,12 +279,13 @@ Foam::polyMesh::polyMesh(const IOobject& io) ...@@ -271,12 +279,13 @@ Foam::polyMesh::polyMesh(const IOobject& io)
IOobject IOobject
( (
"cellZones", "cellZones",
time().findInstance //time().findInstance
( //(
meshDir(), // meshDir(),
"cellZones", // "cellZones",
IOobject::READ_IF_PRESENT // IOobject::READ_IF_PRESENT
), //),
faces_.instance(),
meshSubDir, meshSubDir,
*this, *this,
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment