Skip to content
Snippets Groups Projects
Commit 4bee32c5 authored by Henry's avatar Henry
Browse files

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

parents 97b65b81 065ebbf9
Branches
Tags
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -239,7 +239,11 @@ void Foam::cyclicAMIPolyPatch::resetAMI() const ...@@ -239,7 +239,11 @@ void Foam::cyclicAMIPolyPatch::resetAMI() const
AMIPtr_.clear(); AMIPtr_.clear();
const polyPatch& nbr = neighbPatch(); const polyPatch& nbr = neighbPatch();
pointField nbrPoints = neighbPatch().localPoints(); pointField nbrPoints
(
neighbPatch().boundaryMesh().mesh().points(),
neighbPatch().meshPoints()
);
if (debug) if (debug)
{ {
...@@ -326,6 +330,9 @@ void Foam::cyclicAMIPolyPatch::initMovePoints ...@@ -326,6 +330,9 @@ void Foam::cyclicAMIPolyPatch::initMovePoints
) )
{ {
polyPatch::initMovePoints(pBufs, p); polyPatch::initMovePoints(pBufs, p);
// See below. Clear out any local geometry
primitivePatch::movePoints(p);
} }
...@@ -339,6 +346,10 @@ void Foam::cyclicAMIPolyPatch::movePoints ...@@ -339,6 +346,10 @@ void Foam::cyclicAMIPolyPatch::movePoints
calcTransforms(); calcTransforms();
// Note: resetAMI is called whilst in geometry update. So the slave
// side might not have reached 'movePoints'. Is explicitly handled by
// - clearing geometry of neighbour inside initMovePoints
// - not using localPoints() inside resetAMI
resetAMI(); resetAMI();
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment