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

GIT: Initial commit after latest foundation merge

Browse Source
This commit is contained in:
andy
2016-04-25 11:40:48 +01:00
parent 69ae5a9a78 e5a029c187
commit fd9d801e2d
4003 changed files with 74634 additions and 37783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -134,7 +134,7 @@ void Foam::edgeIntersections::intersectEdges
edgeDirs[i] = n;
}
List<List<pointIndexHit> > edgeIntersections;
List<List<pointIndexHit>> edgeIntersections;
querySurf2.findLineAll
(
start,
@ -445,7 +445,7 @@ bool Foam::edgeIntersections::offsetPerturb
// Construct null
Foam::edgeIntersections::edgeIntersections()
:
List<List<pointIndexHit> >(),
List<List<pointIndexHit>>(),
classification_()
{}
@ -457,7 +457,7 @@ Foam::edgeIntersections::edgeIntersections
const scalarField& surf1PointTol
)
:
List<List<pointIndexHit> >(surf1.nEdges()),
List<List<pointIndexHit>>(surf1.nEdges()),
classification_(surf1.nEdges())
{
checkEdges(surf1);
@ -480,11 +480,11 @@ Foam::edgeIntersections::edgeIntersections
// Construct from components
Foam::edgeIntersections::edgeIntersections
(
const List<List<pointIndexHit> >& intersections,
const List<List<pointIndexHit>>& intersections,
const labelListList& classification
)
:
List<List<pointIndexHit> >(intersections),
List<List<pointIndexHit>>(intersections),
classification_(classification)
{}

6
src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -60,7 +60,7 @@ class edge;
class edgeIntersections
:
public List<List<pointIndexHit> >
public List<List<pointIndexHit>>
{
// Private data
@ -165,7 +165,7 @@ public:
//- Construct from components
edgeIntersections
(
const List<List<pointIndexHit> >&,
const List<List<pointIndexHit>>&,
const labelListList&
);

16
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -282,7 +282,7 @@ void Foam::surfaceIntersection::classifyHit
DynamicList<edge>& allCutEdges,
DynamicList<point>& allCutPoints,
List<DynamicList<label> >& surfEdgeCuts
List<DynamicList<label>>& surfEdgeCuts
)
{
const edge& e = surf1.edges()[edgeI];
@ -563,7 +563,7 @@ void Foam::surfaceIntersection::doCutEdges
DynamicList<edge>& allCutEdges,
DynamicList<point>& allCutPoints,
List<DynamicList<label> >& surfEdgeCuts
List<DynamicList<label>>& surfEdgeCuts
)
{
scalar oldTol = intersection::setPlanarTol(1e-3);
@ -738,7 +738,7 @@ Foam::surfaceIntersection::surfaceIntersection
// From edge to cut index on surface1
List<DynamicList<label> > edgeCuts1(query1.surface().nEdges());
List<DynamicList<label>> edgeCuts1(query1.surface().nEdges());
doCutEdges
(
@ -765,7 +765,7 @@ Foam::surfaceIntersection::surfaceIntersection
}
// From edge to cut index
List<DynamicList<label> > edgeCuts2(query2.surface().nEdges());
List<DynamicList<label>> edgeCuts2(query2.surface().nEdges());
doCutEdges
(
@ -842,7 +842,7 @@ Foam::surfaceIntersection::surfaceIntersection
{
// From edge to cut index on surface1
List<DynamicList<label> > edgeCuts1(surf1.nEdges());
List<DynamicList<label>> edgeCuts1(surf1.nEdges());
forAll(intersections1, edgeI)
{
@ -883,7 +883,7 @@ Foam::surfaceIntersection::surfaceIntersection
{
// From edge to cut index on surface2
List<DynamicList<label> > edgeCuts2(surf2.nEdges());
List<DynamicList<label>> edgeCuts2(surf2.nEdges());
forAll(intersections2, edgeI)
{
@ -1000,7 +1000,7 @@ Foam::surfaceIntersection::surfaceIntersection
DynamicList<point> allCutPoints;
// From edge to cut index on surface1
List<DynamicList<label> > edgeCuts1(query1.surface().nEdges());
List<DynamicList<label>> edgeCuts1(query1.surface().nEdges());
doCutEdges
(

12
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -119,9 +119,9 @@ class surfaceIntersection
Ostream&
);
//- Transfer contents of List<DynamicList<..> > to List<List<..>>
//- Transfer contents of List<DynamicList<..>> to List<List<..>>
template<class T>
static void transfer(List<DynamicList<T> >&, List<List<T> >&);
static void transfer(List<DynamicList<T>>&, List<List<T>>&);
//- Get minimum length of all edges connected to point
static scalar minEdgeLen(const triSurface& surf, const label pointI);
@ -216,7 +216,7 @@ class surfaceIntersection
DynamicList<edge>& allCutEdges,
DynamicList<point>& allCutPoints,
List<DynamicList<label> >& surfEdgeCuts
List<DynamicList<label>>& surfEdgeCuts
);
//- Cut edges of surf1 with surface 2.
@ -229,7 +229,7 @@ class surfaceIntersection
DynamicList<edge>& allCutEdges,
DynamicList<point>& allCutPoints,
List<DynamicList<label> >& surfEdgeCuts
List<DynamicList<label>>& surfEdgeCuts
);
@ -294,7 +294,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "surfaceIntersectionTemplates.C"
#include "surfaceIntersectionTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -184,7 +184,7 @@ Foam::edgeList Foam::surfaceIntersection::filterEdges
labelList& map
)
{
HashSet<edge, Hash<edge> > uniqueEdges(10*edges.size());
HashSet<edge, Hash<edge>> uniqueEdges(10*edges.size());
edgeList newEdges(edges.size());

6
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,8 +31,8 @@ License
template<class T>
void Foam::surfaceIntersection::transfer
(
List<DynamicList<T> >& srcLst,
List<List<T> >& dstLst
List<DynamicList<T>>& srcLst,
List<List<T>>& dstLst
)
{
dstLst.setSize(srcLst.size());