From 8ad0f550bafc3b4c8db71123d18fc5295eee0cdb Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 20 Apr 2016 17:26:14 +0100
Subject: [PATCH] BUG: AMIInterpolation: tgtMagSf not adapted for sent over
patches
---
.../AMIInterpolation/AMIInterpolation.C | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index 1fa157adf4b..e5dcad0c8d5 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -962,6 +962,13 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
newTgtPoints
);
+ scalarField newTgtMagSf(newTgtPatch.size());
+ forAll(newTgtPatch, faceI)
+ {
+ newTgtMagSf[faceI] = newTgtPatch[faceI].mag(newTgtPatch.points());
+ }
+
+
// calculate AMI interpolation
autoPtr<AMIMethod<SourcePatch, TargetPatch> > AMIPtr
(
@@ -971,7 +978,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
srcPatch,
newTgtPatch,
srcMagSf_,
- tgtMagSf_,
+ newTgtMagSf,
triMode_,
reverseTarget_,
requireMatch_ && (lowWeightCorrection_ < 0)
@@ -993,6 +1000,11 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
// tgtAddress_ : per newTgtPatch (not tgtPatch) face a list of the
// srcPatch faces it overlaps
+ if (debug)
+ {
+ writeFaceConnectivity(srcPatch, newTgtPatch, srcAddress_);
+ }
+
// Rework newTgtPatch indices into globalIndices of tgtPatch
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1056,11 +1068,6 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
List<Map<label> > cMap;
srcMapPtr_.reset(new mapDistribute(globalSrcFaces, tgtAddress_, cMap));
tgtMapPtr_.reset(new mapDistribute(globalTgtFaces, srcAddress_, cMap));
-
- if (debug)
- {
- writeFaceConnectivity(srcPatch, newTgtPatch, srcAddress_);
- }
}
else
{
--
GitLab