Commit 56fa7c09 authored by Henry Weller's avatar Henry Weller
Browse files

Update code to use the simpler C++11 template syntax removing spaces between closing ">"s

parent 4eba393f
......@@ -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
......@@ -1927,7 +1927,7 @@ int main(int argc, char *argv[])
extrudeMeshEdges
)
);
List<Map<label> > compactMap;
List<Map<label>> compactMap;
const mapDistribute extrudeEdgeFacesMap
(
globalExtrudeFaces,
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
// Point generator
autoPtr<extrudeModel> model(extrudeModel::New(extrude2DMeshDict));
autoPtr<MeshedSurface<face> > fMesh;
autoPtr<MeshedSurface<face>> fMesh;
autoPtr<polyMesh> mesh;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -55,13 +55,13 @@ using namespace Foam;
// Main program:
template<class Triangulation, class Type>
Foam::tmp<Foam::Field<Type> > filterFarPoints
Foam::tmp<Foam::Field<Type>> filterFarPoints
(
const Triangulation& mesh,
const Field<Type>& field
)
{
tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
Field<Type>& newField = tNewField();
label added = 0;
......@@ -139,7 +139,7 @@ autoPtr<mapDistribute> buildMap
pointPoints[vit->index()].transfer(indices);
}
List<Map<label> > compactMap;
List<Map<label>> compactMap;
return autoPtr<mapDistribute>
(
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -154,8 +154,8 @@ private:
faceList& faces,
labelList& owner,
PtrList<dictionary>& patchDicts,
const List<DynamicList<face> >& patchFaces,
const List<DynamicList<label> >& patchOwners
const List<DynamicList<face>>& patchFaces,
const List<DynamicList<label>>& patchOwners
) const;
//- Disallow default bitwise copy construct
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -84,8 +84,8 @@ void Foam::DelaunayMesh<Triangulation>::addPatches
faceList& faces,
labelList& owner,
PtrList<dictionary>& patchDicts,
const List<DynamicList<face> >& patchFaces,
const List<DynamicList<label> >& patchOwners
const List<DynamicList<face>>& patchFaces,
const List<DynamicList<label>>& patchOwners
) const
{
label nPatches = patchFaces.size();
......@@ -353,8 +353,8 @@ Foam::DelaunayMesh<Triangulation>::createMesh
PtrList<dictionary> patchDicts(1);
patchDicts.set(0, new dictionary());
List<DynamicList<face> > patchFaces(1, DynamicList<face>());
List<DynamicList<label> > patchOwners(1, DynamicList<label>());
List<DynamicList<face>> patchFaces(1, DynamicList<face>());
List<DynamicList<label>> patchOwners(1, DynamicList<label>());
vertexMap.resize(vertexCount());
cellMap.setSize(Triangulation::number_of_finite_cells(), -1);
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -77,7 +77,7 @@ public:
private:
autoPtr<List<boundBox> > allBackgroundMeshBounds_;
autoPtr<List<boundBox>> allBackgroundMeshBounds_;
// Private Member Functions
......
......@@ -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
......@@ -1219,7 +1219,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
Foam::List<Foam::List<Foam::pointIndexHit> >
Foam::List<Foam::List<Foam::pointIndexHit>>
Foam::backgroundMeshDecomposition::intersectsProcessors
(
const List<point>& starts,
......@@ -1295,7 +1295,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
segmentIntersectsCandidate
);
List<List<pointIndexHit> > segmentHitProcs(starts.size());
List<List<pointIndexHit>> segmentHitProcs(starts.size());
// Working storage for assessing processors
DynamicList<pointIndexHit> tmpProcHits;
......
......@@ -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
......@@ -118,7 +118,7 @@ class backgroundMeshDecomposition
autoPtr<bPatch> boundaryFacesPtr_;
//- Search tree for the boundaryFaces_ patch
autoPtr<indexedOctree<treeDataBPatch> > bFTreePtr_;
autoPtr<indexedOctree<treeDataBPatch>> bFTreePtr_;
//- The bounds of all background meshes on all processors
treeBoundBoxList allBackgroundMeshBounds_;
......@@ -275,7 +275,7 @@ public:
// launched from, it is assumed that the point is on that processor.
// The index data member of the pointIndexHit is replaced with the
// processor index.
List<List<pointIndexHit> > intersectsProcessors
List<List<pointIndexHit>> intersectsProcessors
(
const List<point>& starts,
const List<point>& ends,
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -28,13 +28,13 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Triangulation, class Type>
Foam::tmp<Foam::Field<Type> > Foam::smoothAlignmentSolver::filterFarPoints
Foam::tmp<Foam::Field<Type>> Foam::smoothAlignmentSolver::filterFarPoints
(
const Triangulation& mesh,
const Field<Type>& field
)
{
tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
Field<Type>& newField = tNewField();
label added = 0;
......@@ -92,7 +92,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
indices.transfer(dynIndices);
List<Map<label> > compactMap;
List<Map<label>> compactMap;
return autoPtr<mapDistribute>
(
new mapDistribute
......@@ -156,7 +156,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
pointPoints[vit->index()].transfer(indices);
}
List<Map<label> > compactMap;
List<Map<label>> compactMap;
return autoPtr<mapDistribute>
(
new mapDistribute
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -58,7 +58,7 @@ class smoothAlignmentSolver
// Private Member Functions
template<class Triangulation, class Type>
tmp<Field<Type> > filterFarPoints
tmp<Field<Type>> filterFarPoints
(
const Triangulation& mesh,
const Field<Type>& field
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -107,7 +107,7 @@ public:
typedef Delaunay::Facet Facet;
typedef Delaunay::Point Point;
typedef List<DynamicList<Pair<labelPair> > > labelPairPairDynListList;
typedef List<DynamicList<Pair<labelPair>>> labelPairPairDynListList;
typedef Tuple2<pointIndexHit, label> pointIndexHitAndFeature;
typedef List<pointIndexHitAndFeature> pointIndexHitAndFeatureList;
......@@ -170,13 +170,13 @@ private:
featurePointConformer ftPtConformer_;
//- Search tree for edge point locations
mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
edgeLocationTreePtr_;
mutable DynamicList<Foam::point> existingEdgeLocations_;
//- Search tree for surface point locations
mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
surfacePtLocationTreePtr_;
mutable DynamicList<Foam::point> existingSurfacePtLocations_;
......@@ -710,7 +710,7 @@ private:
(
labelList& owner,
labelList& neighbour,
const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
) const;
//- Check whether the cell sizes are fine enough. Creates a polyMesh.
......@@ -783,9 +783,9 @@ private:
// on both processors
void sortProcPatches
(
List<DynamicList<face> >& patchFaces,
List<DynamicList<label> >& patchOwners,
List<DynamicList<label> >& patchPointPairSlaves,
List<DynamicList<face>>& patchFaces,
List<DynamicList<label>>& patchOwners,
List<DynamicList<label>>& patchPointPairSlaves,
labelPairPairDynListList& patchSortingIndices
) const;
......@@ -797,9 +797,9 @@ private:
labelList& owner,
PtrList<dictionary>& patchDicts,
PackedBoolList& boundaryFacesToRemove,
const List<DynamicList<face> >& patchFaces,
const List<DynamicList<label> >& patchOwners,
const List<DynamicList<bool> >& indirectPatchFace
const List<DynamicList<face>>& patchFaces,
const List<DynamicList<label>>& patchOwners,
const List<DynamicList<bool>>& indirectPatchFace
) const;
//- Remove points that are no longer used by any faces
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -160,9 +160,9 @@ void Foam::conformalVoronoiMesh::calcTetMesh
label nPatches = patchNames.size();
List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
faces.setSize(number_of_finite_facets());
......@@ -278,7 +278,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
sortFaces(faces, owner, neighbour);
// PackedBoolList boundaryFacesToRemove;
// List<DynamicList<bool> > indirectPatchFace;
// List<DynamicList<bool>> indirectPatchFace;
//
// addPatches
// (
......@@ -673,7 +673,7 @@ void Foam::conformalVoronoiMesh::deferredCollapseFaceSet
(
labelList& owner,
labelList& neighbour,
const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
) const
{
DynamicList<label> faceLabels;
......@@ -1750,12 +1750,12 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
}
}
List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
// Per patch face the index of the slave node of the point pair
List<DynamicList<label> > patchPPSlaves(nPatches, DynamicList<label>(0));
List<DynamicList<label>> patchPPSlaves(nPatches, DynamicList<label>(0));
List<DynamicList<bool> > indirectPatchFace(nPatches, DynamicList<bool>(0));
List<DynamicList<bool>> indirectPatchFace(nPatches, DynamicList<bool>(0));
faces.setSize(number_of_finite_edges());
......@@ -2134,7 +2134,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
// Use this processor's vertex index as the master
// for sorting
DynamicList<Pair<labelPair> >& sortingIndex =
DynamicList<Pair<labelPair>>& sortingIndex =
procPatchSortingIndex[patchIndex];
if (vB->internalOrBoundaryPoint() && vB->referred())
......@@ -2165,7 +2165,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
// Use the other processor's vertex index as the
// master for sorting
DynamicList<Pair<labelPair> >& sortingIndex =
DynamicList<Pair<labelPair>>& sortingIndex =
procPatchSortingIndex[patchIndex];
if (vA->internalOrBoundaryPoint() && vA->referred())
......@@ -2450,9 +2450,9 @@ void Foam::conformalVoronoiMesh::sortFaces
void Foam::conformalVoronoiMesh::sortProcPatches
(
List<DynamicList<face> >& patchFaces,
List<DynamicList<label> >& patchOwners,
List<DynamicList<label> >& patchPointPairSlaves,
List<DynamicList<face>>& patchFaces,
List<DynamicList<label>>& patchOwners,
List<DynamicList<label>>& patchPointPairSlaves,
labelPairPairDynListList& patchSortingIndices
) const
{
......@@ -2466,7 +2466,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
faceList& faces = patchFaces[patchI];
labelList& owner = patchOwners[patchI];
DynamicList<label>& slaves = patchPointPairSlaves[patchI];
DynamicList<Pair<labelPair> >& sortingIndices
DynamicList<Pair<labelPair>>& sortingIndices
= patchSortingIndices[patchI];
if (!sortingIndices.empty())
......@@ -2511,9 +2511,9 @@ void Foam::conformalVoronoiMesh::addPatches
labelList& owner,
PtrList<dictionary>& patchDicts,
PackedBoolList& boundaryFacesToRemove,
const List<DynamicList<face> >& patchFaces,
const List<DynamicList<label> >& patchOwners,
const List<DynamicList<bool> >& indirectPatchFace
const List<DynamicList<face>>& patchFaces,
const List<DynamicList<label>>& patchOwners,
const List<DynamicList<bool>>& indirectPatchFace
) const
{
label nBoundaryFaces = 0;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -2066,7 +2066,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
keepSurfacePoint = false;
}
List<List<pointIndexHit> > edHitsByFeature;
List<List<pointIndexHit>> edHitsByFeature;
labelList featuresHit;
......@@ -2295,7 +2295,7 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
}
}
inplaceSubset<PackedBoolList, List<Vb> >
inplaceSubset<PackedBoolList, List<Vb>>
(
selectedElems,
surfaceConformationVertices_
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -118,12 +118,12 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
(
const DynamicList<Foam::point>& masterPoints,
const DynamicList<Foam::indexedVertexEnum::vertexType>& masterPointsTypes,
const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
DynamicList<Vb>& pts,
const label ptI
) const
{
typedef DynamicList<autoPtr<plane> > planeDynList;
typedef DynamicList<autoPtr<plane>> planeDynList;
typedef Foam::indexedVertexEnum::vertexType vertexType;
forAll(masterPoints, pI)
......@@ -199,7 +199,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
DynamicList<Vb>& pts
) const
{
typedef DynamicList<autoPtr<plane> > planeDynList;
typedef DynamicList<autoPtr<plane>> planeDynList;
typedef indexedVertexEnum::vertexType vertexType;
typedef extendedFeatureEdgeMesh::edgeStatus edgeStatus;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -117,7 +117,7 @@ class featurePointConformer
(
const DynamicList<point>& masterPoints,
const DynamicList<indexedVertexEnum::vertexType>& masterPointsTypes,
const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
DynamicList<Vb>& pts,
const label ptI
) const;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -31,7 +31,7 @@ template<class Gt, class Cb>
Foam::Ostream& Foam::operator<<
(
Ostream& os,
const InfoProxy<CGAL::indexedCell<Gt, Cb> >& p
const InfoProxy<CGAL::indexedCell<Gt, Cb>>& p
)
{
const CGAL::indexedCell<Gt, Cb>& iv = p.t_;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -63,7 +63,7 @@ class Ostream;
template<class Gt, class Cb> Ostream& operator<<
(
Ostream&,
const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb> >&
const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb>>&
);
}
......@@ -243,7 +243,7 @@ public:
//- Return info proxy.
// Used to print indexedCell information to a stream
Foam::InfoProxy<indexedCell<Gt, Cb> > info() const
Foam::InfoProxy<indexedCell<Gt, Cb>> info() const
{
return *this;
}
......@@ -251,7 +251,7 @@ public:
friend Foam::Ostream& Foam::operator<< <Gt, Cb>
(
Foam::Ostream&,
const Foam::InfoProxy<indexedCell<Gt, Cb> >&
const Foam::InfoProxy<indexedCell<Gt, Cb>>&
);
};
......