zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Preempt commit conflict.

Browse Source
This commit is contained in:
graham
2010-07-23 13:19:20 +01:00
parent 7af7032861
commit 7e5a3aa529
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
View File

@ -78,9 +78,18 @@ Foam::featureEdgeMesh::featureEdgeMesh(const IOobject& io)
if if
( (
io.readOpt() == IOobject::MUST_READ io.readOpt() == IOobject::MUST_READ
|| io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
|| (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk()) || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
) )
{ {
if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
{
WarningIn("featureEdgeMesh::featureEdgeMesh(const IOobject&)")
<< "Specified IOobject::MUST_READ_IF_MODIFIED but class"
<< " does not support automatic rereading."
<< endl;
}
dictionary edgeMeshDict(readStream(typeName)); dictionary edgeMeshDict(readStream(typeName));
edgeMesh::operator= edgeMesh::operator=