From fe2307d2f1a0b99f71360473b58959f579860488 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 22 Nov 2011 12:52:35 +0000
Subject: [PATCH] BUG: volPointInterpolation: cyclicAMI inclusion into
coupled() test
---
.../volPointInterpolation/volPointInterpolate.C | 6 +++++-
.../volPointInterpolation/volPointInterpolation.C | 12 +++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 2e5f2345a7f..1e0aa90e410 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -235,7 +235,11 @@ tmp<Field<Type> > volPointInterpolation::flatBoundaryField
{
label bFaceI = bm[patchI].patch().start() - mesh.nInternalFaces();
- if (!isA<emptyFvPatch>(bm[patchI]) && !bm[patchI].coupled())
+ if
+ (
+ !isA<emptyFvPatch>(bm[patchI])
+ && !vf.boundaryField()[patchI].coupled()
+ )
{
SubList<Type>
(
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
index c4ed18d3e35..cb47e0a101c 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
@@ -31,6 +31,8 @@ License
#include "coupledPointPatchFields.H"
#include "pointConstraint.H"
+#include "surfaceFields.H"
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@@ -75,11 +77,19 @@ void volPointInterpolation::calcBoundaryAddressing()
const polyBoundaryMesh& pbm = mesh().boundaryMesh();
+ // Get precalculated volField only so we can use coupled() tests for
+ // cyclicAMI
+ const surfaceScalarField& magSf = mesh().magSf();
+
forAll(pbm, patchI)
{
const polyPatch& pp = pbm[patchI];
- if (!isA<emptyPolyPatch>(pp) && !pp.coupled())
+ if
+ (
+ !isA<emptyPolyPatch>(pp)
+ && !magSf.boundaryField()[patchI].coupled()
+ )
{
label bFaceI = pp.start()-mesh().nInternalFaces();
--
GitLab