From cf728cef6eaf38388c07d5a0097d17ead10da1f3 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 23 Jan 2018 17:22:57 +0100 Subject: [PATCH] STYLE: use Pair flip() method instead of global Swap() function --- .../meshRefinement/meshRefinementBaffles.C | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C index 0503b996b2..0d7a72c24f 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C @@ -3495,7 +3495,7 @@ void Foam::meshRefinement::allocateInterRegionFaceZone { // Make sure lowest number cellZone is master. Non-cellZone // areas are slave - bool swap = + const bool swap = ( ownZone == -1 || (neiZone != -1 && ownZone > neiZone) @@ -3505,7 +3505,7 @@ void Foam::meshRefinement::allocateInterRegionFaceZone labelPair key(ownZone, neiZone); if (swap) { - Swap(key.first(), key.second()); + key.flip(); } if (!zoneIDsToFaceZone.found(key)) @@ -3528,7 +3528,7 @@ void Foam::meshRefinement::allocateInterRegionFaceZone Pair wordKey(ownZoneName, neiZoneName); if (swap) { - Swap(wordKey.first(), wordKey.second()); + wordKey.flip(); } word fzName = wordKey.first() + "_to_" + wordKey.second(); @@ -4549,7 +4549,7 @@ Foam::autoPtr Foam::meshRefinement::zonify label neiZone = cellToZone[mesh_.faceNeighbour()[faceI]]; if (ownZone != neiZone) { - bool swap = + const bool swap = ( ownZone == -1 || (neiZone != -1 && ownZone > neiZone) @@ -4557,7 +4557,7 @@ Foam::autoPtr Foam::meshRefinement::zonify labelPair key(ownZone, neiZone); if (swap) { - Swap(key.first(), key.second()); + key.flip(); } faceToZone[faceI] = fZoneLookup[key]; } @@ -4572,7 +4572,7 @@ Foam::autoPtr Foam::meshRefinement::zonify label neiZone = neiCellZone[bFaceI]; if (ownZone != neiZone) { - bool swap = + const bool swap = ( ownZone == -1 || (neiZone != -1 && ownZone > neiZone) @@ -4580,7 +4580,7 @@ Foam::autoPtr Foam::meshRefinement::zonify labelPair key(ownZone, neiZone); if (swap) { - Swap(key.first(), key.second()); + key.flip(); } faceToZone[faceI] = fZoneLookup[key]; }