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

STYLE: relocate duplicate versions of unionEqOp to ListOps

Browse Source
This commit is contained in:
Mark Olesen
2020-03-18 11:28:10 +01:00
parent 071d979ebb
commit d0522f7300
9 changed files with 47 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/OpenFOAM/containers/Lists/ListOps/ListOps.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2018-2019 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -27,6 +27,7 @@ License
\*---------------------------------------------------------------------------*/
#include "ListOps.H"
#include "HashSet.H"
#include <numeric>
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
@ -205,4 +206,26 @@ void Foam::ListOps::identity(labelUList& map, label start)
}
void Foam::ListOps::unionEqOp::operator()
(
labelList& x,
const labelList& y
) const
{
if (y.size())
{
if (x.size())
{
labelHashSet set(x);
set.insert(y);
x = set.toc();
}
else
{
x = y;
}
}
}
// ************************************************************************* //

6
src/OpenFOAM/containers/Lists/ListOps/ListOps.H
View File

@ -579,6 +579,12 @@ struct uniqueEqOp
void operator()(List<T>& x, const List<T>& y) const;
};
//- List helper to add y unique elements to x
struct unionEqOp
{
void operator()(labelList& x, const labelList& y) const;
};
// Public classes

9
src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -58,7 +59,13 @@ void Foam::CECCellToCellStencil::calcEdgeBoundaryData
);
}
syncTools::syncEdgeMap(mesh(), neiGlobal, unionEqOp(), dummyTransform());
syncTools::syncEdgeMap
(
mesh(),
neiGlobal,
ListOps::unionEqOp(),
dummyTransform()
);
}

2
src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
View File

@ -62,7 +62,7 @@ void Foam::CPCCellToCellStencil::calcPointBoundaryData
(
mesh(),
neiGlobal,
unionEqOp(),
ListOps::unionEqOp(),
Foam::dummyTransform() // dummy transformation
);
}

22
src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
View File

@ -230,28 +230,6 @@ Foam::cellToCellStencil::allCoupledFacesPatch() const
}
void Foam::cellToCellStencil::unionEqOp::operator()
(
labelList& x,
const labelList& y
) const
{
if (y.size())
{
if (x.empty())
{
x = y;
}
else
{
labelHashSet set(x);
set.insert(y);
x = set.toc();
}
}
}
void Foam::cellToCellStencil::insertFaceCells
(
const label exclude0,

7
src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
View File

@ -92,13 +92,6 @@ protected:
//- Return patch of all coupled faces.
autoPtr<indirectPrimitivePatch> allCoupledFacesPatch() const;
//- Combine operator for labelLists
class unionEqOp
{
public:
void operator()(labelList& x, const labelList& y) const;
};
//- Collect cell neighbours of faces in global numbering
void insertFaceCells
(

10
src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2018 OpenCFD Ltd.
Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -58,7 +58,13 @@ void Foam::FECCellToFaceStencil::calcEdgeBoundaryData
);
}
syncTools::syncEdgeMap(mesh(), neiGlobal, unionEqOp(), dummyTransform());
syncTools::syncEdgeMap
(
mesh(),
neiGlobal,
ListOps::unionEqOp(),
dummyTransform()
);
}

22
src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
View File

@ -231,28 +231,6 @@ Foam::cellToFaceStencil::allCoupledFacesPatch() const
}
void Foam::cellToFaceStencil::unionEqOp::operator()
(
labelList& x,
const labelList& y
) const
{
if (y.size())
{
if (x.empty())
{
x = y;
}
else
{
labelHashSet set(x);
set.insert(y);
x = set.toc();
}
}
}
void Foam::cellToFaceStencil::insertFaceCells
(
const label exclude0,

7
src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
View File

@ -92,13 +92,6 @@ protected:
//- Return patch of all coupled faces.
autoPtr<indirectPrimitivePatch> allCoupledFacesPatch() const;
//- Combine operator for labelLists
class unionEqOp
{
public:
void operator()( labelList& x, const labelList& y ) const;
};
//- Collect cell neighbours of faces in global numbering
void insertFaceCells
(