From 78964897ce8f5ac998a83d78d45cf26f7f194e3f Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Fri, 4 Nov 2016 12:28:28 +0000 Subject: [PATCH] BUG: readFields function object - corrected reading of fields from file. Fixes #289 --- src/OpenFOAM/db/IOobject/IOobjectTemplates.C | 9 ++++++--- .../field/readFields/readFieldsTemplates.C | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C index b1e39564a5..1ef06e3415 100644 --- a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C +++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C @@ -69,9 +69,12 @@ bool Foam::IOobject::typeHeaderOk(const bool checkType) { if (checkType && headerClassName_ != Type::typeName) { - IOWarningInFunction(*isPtr) - << "unexpected class name " << headerClassName_ - << " expected " << Type::typeName << endl; + if (debug) + { + IOWarningInFunction(*isPtr) + << "unexpected class name " << headerClassName_ + << " expected " << Type::typeName << endl; + } ok = false; } diff --git a/src/functionObjects/field/readFields/readFieldsTemplates.C b/src/functionObjects/field/readFields/readFieldsTemplates.C index fee32c5627..07d73044c7 100644 --- a/src/functionObjects/field/readFields/readFieldsTemplates.C +++ b/src/functionObjects/field/readFields/readFieldsTemplates.C @@ -60,7 +60,7 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName) IOobject::NO_WRITE ); - if (fieldHeader.typeHeaderOk(false)) + if (fieldHeader.typeHeaderOk(true)) { // Store field on mesh database Log << " Reading " << fieldName << endl; @@ -68,7 +68,7 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName) mesh_.objectRegistry::store(vfPtr); return true; } - else if (fieldHeader.typeHeaderOk(false)) + else if (fieldHeader.typeHeaderOk(true)) { // Store field on mesh database Log << " Reading " << fieldName << endl;