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

Merge branch 'develop' of https://develop.openfoam.com/Development/OpenFOAM-plus into develop

Browse Source
This commit is contained in:
Mark Olesen
2016-12-20 15:43:51 +01:00
parent f816c2d0bc 953594286f
commit 484e59aefb
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/functionObjects/field/fieldAverage/fieldAverage.C
View File

@ -235,7 +235,7 @@ void Foam::functionObjects::fieldAverage::readAveragingProperties()
if (foundProperty(fieldName))
{
dictionary fieldDict;
getProperty(fieldName, fieldDict);
getDict(fieldName, fieldDict);
totalIter_[fieldi] = readLabel(fieldDict.lookup("totalIter"));
totalTime_[fieldi] = readScalar(fieldDict.lookup("totalTime"));

11
src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C
View File

@ -50,21 +50,20 @@ void Foam::functionObjects::surfaceInterpolate::interpolateFields()
if (fieldMap.found(fld.name()))
{
//const word sName = "interpolate(" + fld.name() + ')';
// const word sName = "interpolate(" + fld.name() + ')';
word& sName = fieldMap[fld.name()];
if (obr_.found(sName))
{
Log << " surface field " << sName << " already exists"
<< endl;
Log << " updating field " << sName << endl;
}
else
{
store(sName, linearInterpolate(fld));
Log << " interpolated " << fld.name() << " to create "
Log << " interpolating " << fld.name() << " to create "
<< sName << endl;
}
store(sName, linearInterpolate(fld));
}
}
}