zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: replace base implementation of Foam::Swap with std::swap

Browse Source 
- eliminates a potentially invalid code branch.
  Since it essentially had the same internals as std::swap anyhow,
  make that more evident.

ENH: use std::swap for basic types

- makes it clearer that they do not rely on any special semantics
This commit is contained in:
Mark Olesen
2021-02-16 10:18:16 +01:00
parent 8c460d8ec9
commit f8a0677a66
30 changed files with 108 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sampling/sampledSet/patchSeed/patchSeedSet.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2012-2016 OpenFOAM Foundation
Copyright (C) 2018-2020 OpenCFD Ltd.
Copyright (C) 2018-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -225,7 +225,7 @@ void Foam::patchSeedSet::calcSamples
forAll(subset, i)
{
label j = rndGen.position<label>(0, subset.size()-1);
Swap(subset[i], subset[j]);
std::swap(subset[i], subset[j]);
}
}
// Truncate

22
src/sampling/surface/isoSurface/isoSurfaceCellTemplates.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
Copyright (C) 2020-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -134,7 +134,7 @@ void Foam::isoSurfaceCell::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -150,7 +150,7 @@ void Foam::isoSurfaceCell::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -176,8 +176,8 @@ void Foam::isoSurfaceCell::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-5], pts[sz-4]);
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-5], pts[sz-4]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -193,7 +193,7 @@ void Foam::isoSurfaceCell::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -216,8 +216,8 @@ void Foam::isoSurfaceCell::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-5], pts[sz-4]);
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-5], pts[sz-4]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -240,8 +240,8 @@ void Foam::isoSurfaceCell::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-5], pts[sz-4]);
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-5], pts[sz-4]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -256,7 +256,7 @@ void Foam::isoSurfaceCell::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;

22
src/sampling/surface/isoSurface/isoSurfacePointTemplates.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2018-2020 OpenCFD Ltd.
Copyright (C) 2018-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -264,7 +264,7 @@ void Foam::isoSurfacePoint::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -288,7 +288,7 @@ void Foam::isoSurfacePoint::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -319,8 +319,8 @@ void Foam::isoSurfacePoint::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-5], pts[sz-4]);
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-5], pts[sz-4]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -345,7 +345,7 @@ void Foam::isoSurfacePoint::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -376,8 +376,8 @@ void Foam::isoSurfacePoint::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-5], pts[sz-4]);
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-5], pts[sz-4]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -408,8 +408,8 @@ void Foam::isoSurfacePoint::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-5], pts[sz-4]);
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-5], pts[sz-4]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;
@ -434,7 +434,7 @@ void Foam::isoSurfacePoint::generateTriPoints
{
// Flip normals
const label sz = pts.size();
Swap(pts[sz-2], pts[sz-1]);
std::swap(pts[sz-2], pts[sz-1]);
}
}
break;

26
src/sampling/surface/isoSurface/isoSurfaceTopo.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2019 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -328,7 +328,7 @@ void Foam::isoSurfaceTopo::generateTriPoints
{
// Flip normals
const label sz = verts.size();
Swap(verts[sz-2], verts[sz-1]);
std::swap(verts[sz-2], verts[sz-1]);
}
}
break;
@ -371,7 +371,7 @@ void Foam::isoSurfaceTopo::generateTriPoints
{
// Flip normals
const label sz = verts.size();
Swap(verts[sz-2], verts[sz-1]);
std::swap(verts[sz-2], verts[sz-1]);
}
}
break;
@ -429,8 +429,8 @@ void Foam::isoSurfaceTopo::generateTriPoints
{
// Flip normals
const label sz = verts.size();
Swap(verts[sz-5], verts[sz-4]);
Swap(verts[sz-2], verts[sz-1]);
std::swap(verts[sz-5], verts[sz-4]);
std::swap(verts[sz-2], verts[sz-1]);
}
}
break;
@ -473,7 +473,7 @@ void Foam::isoSurfaceTopo::generateTriPoints
{
// Flip normals
const label sz = verts.size();
Swap(verts[sz-2], verts[sz-1]);
std::swap(verts[sz-2], verts[sz-1]);
}
}
break;
@ -531,8 +531,8 @@ void Foam::isoSurfaceTopo::generateTriPoints
{
// Flip normals
const label sz = verts.size();
Swap(verts[sz-5], verts[sz-4]);
Swap(verts[sz-2], verts[sz-1]);
std::swap(verts[sz-5], verts[sz-4]);
std::swap(verts[sz-2], verts[sz-1]);
}
}
break;
@ -590,8 +590,8 @@ void Foam::isoSurfaceTopo::generateTriPoints
{
// Flip normals
const label sz = verts.size();
Swap(verts[sz-5], verts[sz-4]);
Swap(verts[sz-2], verts[sz-1]);
std::swap(verts[sz-5], verts[sz-4]);
std::swap(verts[sz-2], verts[sz-1]);
}
}
break;
@ -633,7 +633,7 @@ void Foam::isoSurfaceTopo::generateTriPoints
{
// Flip normals
const label sz = verts.size();
Swap(verts[sz-2], verts[sz-1]);
std::swap(verts[sz-2], verts[sz-1]);
}
}
break;
@ -688,7 +688,7 @@ void Foam::isoSurfaceTopo::generateTriPoints
if (faceOwner[facei] == celli)
{
Swap(p1, p2);
std::swap(p1, p2);
}
generateTriPoints
@ -754,7 +754,7 @@ void Foam::isoSurfaceTopo::generateTriPoints
label p2 = f[nextFp];
if (faceOwner[facei] == celli)
{
Swap(p1, p2);
std::swap(p1, p2);
if (i != 2) edgeIsDiag[1] = true;
if (i != f.size()-1) edgeIsDiag[0] = true;
}