From 482f8ceeb4475c1f425dc3bdcfaa6bf19bb875d4 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 20 Dec 2016 10:09:11 +0000 Subject: [PATCH 1/3] BUG: localMin scheme - was using minMod instead of min --- .../surfaceInterpolation/schemes/localMin/localMin.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H index 46ade29b19..e077a5f0c6 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H @@ -146,7 +146,7 @@ public: forAll(vff, facei) { - vff[facei] = minMod(vf[own[facei]], vf[nei[facei]]); + vff[facei] = min(vf[own[facei]], vf[nei[facei]]); } typename GeometricField:: @@ -167,7 +167,7 @@ public: forAll(pff, i) { - pff[i] = minMod(pif[i], pnf[i]); + pff[i] = min(pif[i], pnf[i]); } } else From 6ee70e4b4d5f936215665e532f90e367857b5ddf Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 20 Dec 2016 11:17:51 +0000 Subject: [PATCH 2/3] BUG: surfaceInterpolate function object - corrected evaluation. Foxes #335 --- .../surfaceInterpolate/surfaceInterpolateTemplates.C | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C index 8aa1aed42d..4d845bf535 100644 --- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C +++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C @@ -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)); } } } From 953594286f9227ef652b7095504ba06a4568139b Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 20 Dec 2016 13:09:15 +0000 Subject: [PATCH 3/3] BUG: fieldAverage - read state properties using getDict. Fixes #358 --- src/functionObjects/field/fieldAverage/fieldAverage.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.C b/src/functionObjects/field/fieldAverage/fieldAverage.C index ad1ce8d969..6aa9b84db6 100644 --- a/src/functionObjects/field/fieldAverage/fieldAverage.C +++ b/src/functionObjects/field/fieldAverage/fieldAverage.C @@ -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"));