diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.C index 4bc35db57..4d818a408 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/ggi/ggiFvPatchField.C @@ -189,9 +189,6 @@ tmp > ggiFvPatchField::patchNeighbourField() const // Note: bridging now takes into account fully uncovered and partially // covered faces. VV, 18/Oct/2017. ggiPatch_.bridge(bridgeField, pnf); - - // Correct partially overlapping (partially bridged) faces - ggiPatch_.correctPartialFaces(bridgeField, pnf); } return tpnf; diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/ggi/ggiFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/ggi/ggiFvPatch.H index 06eaea307..c063d185d 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/ggi/ggiFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/ggi/ggiFvPatch.H @@ -154,18 +154,6 @@ public: return ggiPolyPatch_.bridge(bridgeField, ff); } - //- Correct partially overlapping (partially bridged) faces - template - void correctPartialFaces - ( - const Field& bridgeField, - Field& ff - ) - const - { - return ggiPolyPatch_.correctPartialFaces(bridgeField, ff); - } - // Interface transfer functions diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H b/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H index 21fc570cd..48dcf2f1c 100644 --- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H +++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationTemplate.H @@ -501,28 +501,6 @@ class GGIInterpolation const scalarField& coveredFractions ); - //- Correct partially covered faces given addressing - template - static void correctPartiallyCoveredFaces - ( - const Field& bridgeField, - Field& result, - const labelList& partiallyCoveredAddr, - const scalarField& coveredFractions - ); - - //- Correct partially covered faces given addressing for masked faces - // only - template - static void maskedCorrectPartiallyCoveredFaces - ( - const Field& bridgeField, - Field& result, - const labelList& mask, - const labelList& partiallyCoveredAddr, - const scalarField& coveredFractions - ); - //- Is a transform required? inline bool doTransform() const { @@ -687,24 +665,6 @@ public: const labelList& mask ) const; - //- Correct partially covered master patch field - template - void correctPartialMaster - ( - const Field& bridgeField, - Field& ff - ) const; - - //- Correct partially covered master patch field, only for marked master - // faces - template - void maskedCorrectPartialMaster - ( - const Field& bridgeField, - Field& ff, - const labelList& mask - ) const; - //- Bridge uncovered slave patch field template void bridgeSlave @@ -722,24 +682,6 @@ public: const labelList& mask ) const; - //- Correct partially covered slave patch field - template - void correctPartialSlave - ( - const Field& bridgeField, - Field& ff - ) const; - - //- Correct partially covered slave patch field, only for marked slave - // faces - template - void maskedCorrectPartialSlave - ( - const Field& bridgeField, - Field& ff, - const labelList& mask - ) const; - //- Interpolate point field template tmp > masterToSlavePointInterpolate diff --git a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H index c3025c0ec..8e585b6dc 100644 --- a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H +++ b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H @@ -378,14 +378,6 @@ public: Field& ff ) const; - //- Correct interpolated face field for partially covered faces - template - void correctPartialFaces - ( - const Field& bridgeField, - Field& ff - ) const; - // Geometric data diff --git a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C index c205f0df2..6edd844c9 100644 --- a/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C +++ b/src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatchTemplates.C @@ -267,70 +267,4 @@ void Foam::ggiPolyPatch::bridge } -template -void Foam::ggiPolyPatch::correctPartialFaces -( - const Field& bridgeField, - Field& ff -) const -{ - // Check - if (ff.size() != size()) - { - FatalErrorIn - ( - "tmp > ggiPolyPatch::correctPartialFaces\n" - "(\n" - " Field& ff\n" - ") const" - ) << "Incorrect patch field size for partial face correction. " - << "Field size: " << ff.size() << " patch size: " << size() - << abort(FatalError); - } - - if (bridgeOverlap()) - { - if (empty()) - { - // Patch empty, no bridging - return; - } - - if (localParallel()) - { - if (master()) - { - patchToPatch().correctPartialMaster(bridgeField, ff); - } - else - { - patchToPatch().correctPartialSlave(bridgeField, ff); - } - } - else - { - // Note: since bridging is only a local operation - if (master()) - { - patchToPatch().maskedCorrectPartialMaster - ( - bridgeField, - ff, - zoneAddressing() - ); - } - else - { - patchToPatch().maskedCorrectPartialSlave - ( - bridgeField, - ff, - zoneAddressing() - ); - } - } - } -} - - // ************************************************************************* //