BUG: readFields function object - corrected reading of fields from file. Fixes #289

This commit is contained in:
Andrew Heather
2016-11-04 12:28:28 +00:00
parent 82f9089b6a
commit 78964897ce
2 changed files with 8 additions and 5 deletions

View File

@ -68,10 +68,13 @@ bool Foam::IOobject::typeHeaderOk(const bool checkType)
if (readHeader(*isPtr)) if (readHeader(*isPtr))
{ {
if (checkType && headerClassName_ != Type::typeName) if (checkType && headerClassName_ != Type::typeName)
{
if (debug)
{ {
IOWarningInFunction(*isPtr) IOWarningInFunction(*isPtr)
<< "unexpected class name " << headerClassName_ << "unexpected class name " << headerClassName_
<< " expected " << Type::typeName << endl; << " expected " << Type::typeName << endl;
}
ok = false; ok = false;
} }

View File

@ -60,7 +60,7 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
IOobject::NO_WRITE IOobject::NO_WRITE
); );
if (fieldHeader.typeHeaderOk<VolFieldType>(false)) if (fieldHeader.typeHeaderOk<VolFieldType>(true))
{ {
// Store field on mesh database // Store field on mesh database
Log << " Reading " << fieldName << endl; Log << " Reading " << fieldName << endl;
@ -68,7 +68,7 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
mesh_.objectRegistry::store(vfPtr); mesh_.objectRegistry::store(vfPtr);
return true; return true;
} }
else if (fieldHeader.typeHeaderOk<SurfaceFieldType>(false)) else if (fieldHeader.typeHeaderOk<SurfaceFieldType>(true))
{ {
// Store field on mesh database // Store field on mesh database
Log << " Reading " << fieldName << endl; Log << " Reading " << fieldName << endl;