diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C index dff08b5d0..9ad0ab483 100644 --- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C +++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationPolygonIntersection.C @@ -192,7 +192,7 @@ GGIInterpolation::polygonIntersection ( "GGIInterpolation::" "polygonIntersection" - ) << "Intersection might be wrong wrong: clipping side " + ) << "Intersection might be wrong. Clipping side " << intersectionArea/clippingArea << " subject: " << intersectionArea/subjectArea << endl; } diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C index b82fa0e99..82d50cc45 100644 --- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C +++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C @@ -52,7 +52,7 @@ GGIInterpolation::faceBoundBoxExtendSpanFraction_ template const label - GGIInterpolation::octreeSearchMinNLevel_ +GGIInterpolation::octreeSearchMinNLevel_ ( debug::optimisationSwitch("GGIOctreeSearchMinNLevel", 3) ); diff --git a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H index 313971bae..0b3f73cb8 100644 --- a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H +++ b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H @@ -279,9 +279,8 @@ public: } - // Destructor - - virtual ~ggiPolyPatch(); + //- Destructor + virtual ~ggiPolyPatch(); // Member functions diff --git a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C index 59e29599a..52b14ec62 100644 --- a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C +++ b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C @@ -31,7 +31,6 @@ Author // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// New. HJ, 12/Jun/2011 template Foam::tmp > Foam::ggiPolyPatch::fastExpand ( @@ -40,22 +39,6 @@ Foam::tmp > Foam::ggiPolyPatch::fastExpand { // Check and expand the field from patch size to zone size // with communication - - // Algorithm: - // 1) Master processor holds maps of all zone addressing (data provided) - // and all remote zone addressing (data required) - // 2) Each processor will send the locally active data to the master - // 3) Master assembles all the data - // 4) Master sends to all processors the data they need to receive - // - // Notes: - // A) If the size of zone addressing is zero, data is not sent - // B) Communicated data on each processor has the size of live faces - // C) Expanded data will be equal to actual data from other processors - // only for the faces marked in remote; for other faces, it will be - // equal to zero - // D) On processor zero, complete data is available - // HJ, 4/Jun/2011 if (ff.size() != size()) { FatalErrorIn @@ -81,6 +64,22 @@ Foam::tmp > Foam::ggiPolyPatch::fastExpand << abort(FatalError); } + // Algorithm: + // 1) Master processor holds maps of all zone addressing (data provided) + // and all remote zone addressing (data required) + // 2) Each processor will send the locally active data to the master + // 3) Master assembles all the data + // 4) Master sends to all processors the data they need to receive + // + // Notes: + // A) If the size of zone addressing is zero, data is not sent + // B) Communicated data on each processor has the size of live faces + // C) Expanded data will be equal to actual data from other processors + // only for the faces marked in remote; for other faces, it will be + // equal to zero + // D) On processor zero, complete data is available + // HJ, 4/Jun/2011 + // HR, 10/Jul/2013 // This function requires send-receive-addressing, but usage is not // symmetric across processors. Hence trigger re-calculate at this point