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
......@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
// writeStencilStats(addressing.stencil());
//
// // Collect stencil cell centres
// List<List<point> > stencilPoints(mesh.nFaces());
// List<List<point>> stencilPoints(mesh.nFaces());
// addressing.collectData
// (
// mesh.C(),
......@@ -199,7 +199,7 @@ int main(int argc, char *argv[])
// //// Do some interpolation.
// //{
// // const labelListList& stencil = addressing.stencil();
// // List<List<scalar> > stencilWeights(stencil.size());
// // List<List<scalar>> stencilWeights(stencil.size());
// // forAll(stencil, faceI)
// // {
// // const labelList& fStencil = stencil[faceI];
......@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
//
//
// // Collect stencil cell centres
// List<List<point> > stencilPoints(mesh.nFaces());
// List<List<point>> stencilPoints(mesh.nFaces());
// addressing.collectData
// (
// mesh.C(),
......@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
// //
// //
// //// Collect stencil cell centres
// //List<List<point> > stencilPoints(mesh.nFaces());
// //List<List<point>> stencilPoints(mesh.nFaces());
// //addressing.collectData
// //(
// // mesh.C(),
......@@ -295,7 +295,7 @@ int main(int argc, char *argv[])
// //
// //
// //// Collect stencil cell centres
// //List<List<point> > stencilPoints(mesh.nFaces());
// //List<List<point>> stencilPoints(mesh.nFaces());
// //addressing.collectData
// //(
// // mesh.C(),
......@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
//
// {
// // Collect stencil cell centres
// List<List<point> > ownPoints(mesh.nFaces());
// List<List<point>> ownPoints(mesh.nFaces());
// addressing.collectData
// (
// addressing.ownMap(),
......@@ -352,7 +352,7 @@ int main(int argc, char *argv[])
// }
// {
// // Collect stencil cell centres
// List<List<point> > neiPoints(mesh.nFaces());
// List<List<point>> neiPoints(mesh.nFaces());
// addressing.collectData
// (
// addressing.neiMap(),
......@@ -391,7 +391,7 @@ int main(int argc, char *argv[])
//
// {
// // Collect stencil cell centres
// List<List<point> > ownPoints(mesh.nFaces());
// List<List<point>> ownPoints(mesh.nFaces());
// addressing.collectData
// (
// addressing.ownMap(),
......@@ -412,7 +412,7 @@ int main(int argc, char *argv[])
// }
// {
// // Collect stencil cell centres
// List<List<point> > neiPoints(mesh.nFaces());
// List<List<point>> neiPoints(mesh.nFaces());
// addressing.collectData
// (
// addressing.neiMap(),
......@@ -451,7 +451,7 @@ int main(int argc, char *argv[])
writeStencilStats(addressing.stencil());
// Collect stencil cell centres
List<List<point> > stencilPoints(mesh.nCells());
List<List<point>> stencilPoints(mesh.nCells());
addressing.collectData
(
mesh.C(),
......@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
writeStencilStats(addressing.stencil());
// Collect stencil cell centres
List<List<point> > stencilPoints(mesh.nCells());
List<List<point>> stencilPoints(mesh.nCells());
addressing.collectData
(
mesh.C(),
......@@ -507,7 +507,7 @@ int main(int argc, char *argv[])
writeStencilStats(addressing.stencil());
// Collect stencil cell centres
List<List<point> > stencilPoints(mesh.nCells());
List<List<point>> stencilPoints(mesh.nCells());
addressing.collectData
(
mesh.C(),
......@@ -528,7 +528,7 @@ int main(int argc, char *argv[])
//XXXXXX
// // Evaluate
// List<List<scalar> > stencilData(faceStencils.size());
// List<List<scalar>> stencilData(faceStencils.size());
// collectStencilData
// (
// distMap,
......
......@@ -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
......@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
CFCCellToCellStencil stencil(mesh);
// Construct exchange map and renumber stencil
List<Map<label> > compactMap(Pstream::nProcs());
List<Map<label>> compactMap(Pstream::nProcs());
mapDistribute map
(
stencil.globalNumbering(),
......@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
// Collect the data in stencil form
List<List<vector> > stencilPoints;
List<List<vector>> stencilPoints;
{
const volVectorField& fld = mesh.C();
......
......@@ -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
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
Random rndGen(43544*Pstream::myProcNo());
// Generate random data.
List<Tuple2<label, List<scalar> > > complexData(100);
List<Tuple2<label, List<scalar>>> complexData(100);
forAll(complexData, i)
{
complexData[i].first() = rndGen.integer(0, Pstream::nProcs()-1);
......
......@@ -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
......@@ -40,7 +40,7 @@ using namespace Foam;
int main(int argc, char *argv[])
{
List<Tuple2<string, string> > rawList(IFstream("testRegexps")());
List<Tuple2<string, string>> rawList(IFstream("testRegexps")());
Info<< "Test expressions:" << rawList << endl;
IOobject::writeDivider(Info) << endl;
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
<
species::thermo
<
hConstThermo<perfectGas<specie> >,
hConstThermo<perfectGas<specie>>,
sensibleEnthalpy
>
> ThermoType;
......
......@@ -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
......@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
IOobject::writeDivider(Info);
List<Tuple2<wordRe, string> > rawList(IFstream("testRegexps")());
List<Tuple2<wordRe, string>> rawList(IFstream("testRegexps")());
Info<< "input list:" << rawList << endl;
IOobject::writeDivider(Info) << endl;
......
......@@ -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
......@@ -55,8 +55,8 @@ int main(int argc, char *argv[])
Info<< "lstA: " << lstA << endl;
Info<< "lstC: " << lstC << endl;
Xfer<List<label> > xA = xferMove(lstA);
Xfer<List<label> > xB;
Xfer<List<label>> xA = xferMove(lstA);
Xfer<List<label>> xB;
List<label> lstB( xA );
......
......@@ -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
......@@ -129,7 +129,7 @@ void subsetVolFields
const label patchI,
const Type& exposedValue,
const word GeomVolType,
PtrList<GeometricField<Type, fvPatchField, volMesh> >& subFields
PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
)
{
const fvMesh& baseMesh = subsetter.baseMesh();
......@@ -201,7 +201,7 @@ void subsetSurfaceFields
const label patchI,
const Type& exposedValue,
const word GeomSurfType,
PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& subFields
PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
)
{
const fvMesh& baseMesh = subsetter.baseMesh();
......@@ -580,10 +580,10 @@ int main(int argc, char *argv[])
);
// Per faceSet the patch to put the baffles into
const List<Pair<word> > setsAndPatches(dict.lookup("blockedFaces"));
const List<Pair<word>> setsAndPatches(dict.lookup("blockedFaces"));
// Per faceSet the patch to put the coupled baffles into
DynamicList<FixedList<word, 3> > coupledAndPatches(10);
DynamicList<FixedList<word, 3>> coupledAndPatches(10);
const dictionary& functionDicts = dict.subDict("coupledFaces");
forAllConstIter(dictionary, functionDicts, iter)
{
......
......@@ -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
......@@ -355,9 +355,9 @@ int main(int argc, char *argv[])
);
// Read all from the dictionary.
List<Pair<point> > pointsToMove(dict.lookup("pointsToMove"));
List<Pair<point> > edgesToSplit(dict.lookup("edgesToSplit"));
List<Pair<point> > facesToTriangulate
List<Pair<point>> pointsToMove(dict.lookup("pointsToMove"));
List<Pair<point>> edgesToSplit(dict.lookup("edgesToSplit"));
List<Pair<point>> facesToTriangulate
(
dict.lookup("facesToTriangulate")
);
......@@ -369,15 +369,15 @@ int main(int argc, char *argv[])
|| facesToTriangulate.size()
);
List<Pair<point> > edgesToCollapse(dict.lookup("edgesToCollapse"));
List<Pair<point>> edgesToCollapse(dict.lookup("edgesToCollapse"));
bool collapseEdge = edgesToCollapse.size();
List<Pair<point> > cellsToPyramidise(dict.lookup("cellsToSplit"));
List<Pair<point>> cellsToPyramidise(dict.lookup("cellsToSplit"));
bool cellsToSplit = cellsToPyramidise.size();
// List<Tuple2<pointField,point> >
// List<Tuple2<pointField,point>>
// cellsToCreate(dict.lookup("cellsToCreate"));
Info<< "Read from " << dict.name() << nl
......@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
Info<< nl << "Looking up edges to split ..." << nl << endl;
Map<List<point> > edgeToCuts(edgesToSplit.size());
Map<List<point>> edgeToCuts(edgesToSplit.size());
forAll(edgesToSplit, i)
{
const Pair<point>& pts = edgesToSplit[i];
......
......@@ -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
......@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
SortableList<scalar> sortedVols(vols);
// All cell labels, sorted per bin.
DynamicList<DynamicList<label> > bins;
DynamicList<DynamicList<label>> bins;
// Lower/upper limits
DynamicList<scalar> lowerLimits;
......
......@@ -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
......@@ -131,7 +131,7 @@ void storeCellInZone
const label cellI,
const label cellType,
Map<label>& typeToZone,
List<DynamicList<label> >& zoneCells
List<DynamicList<label>>& zoneCells
)
{
if (cellType >= 0)
......@@ -1022,7 +1022,7 @@ int main(int argc, char *argv[])
// From foamCellType physical region to Foam cellZone
Map<label> typeToZone;
// Storage for cell zones.
List<DynamicList<label> > zoneCells(0);
List<DynamicList<label>> zoneCells(0);
forAll(foamCellType, cellI)
{
......
......@@ -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
......@@ -66,8 +66,8 @@ SLList<label> slCellMap;
SLList<label> slCellType;
label maxCelli = 0;
PtrList<SLList<label> > slPatchCells;
PtrList<SLList<label> > slPatchCellFaces;
PtrList<SLList<label>> slPatchCells;
PtrList<SLList<label>> slPatchCellFaces;
// Cell types
Map<word> cellTypes;
......
......@@ -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
......@@ -1578,7 +1578,7 @@ int main(int argc, char *argv[])
// List of patch names and the cellZone(s) they border
// this is just an info file to make MRF easier to setup
List<DynamicList<word> > boundaryZones
List<DynamicList<word>> boundaryZones
(
pShapeMesh.boundaryMesh().size()
);
......
......@@ -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
......@@ -211,7 +211,7 @@ void storeCellInZone
Map<label>& physToZone,
labelList& zoneToPhys,
List<DynamicList<label> >& zoneCells
List<DynamicList<label>>& zoneCells
)
{
Map<label>::const_iterator zoneFnd = physToZone.find(regPhys);
......@@ -415,10 +415,10 @@ void readCells
cellShapeList& cells,
labelList& patchToPhys,
List<DynamicList<face> >& patchFaces,
List<DynamicList<face>>& patchFaces,
labelList& zoneToPhys,
List<DynamicList<label> >& zoneCells
List<DynamicList<label>>& zoneCells
)
{
Info<< "Starting to read cells at line " << inFile.lineNumber() << endl;
......@@ -791,12 +791,12 @@ int main(int argc, char *argv[])
// Map from patch to gmsh physical region
labelList patchToPhys;
// Storage for patch faces.
List<DynamicList<face> > patchFaces(0);
List<DynamicList<face>> patchFaces(0);
// Map from cellZone to gmsh physical region
labelList zoneToPhys;
// Storage for cell zones.
List<DynamicList<label> > zoneCells(0);
List<DynamicList<label>> zoneCells(0);
// Name per physical region
Map<word> physicalNames;
......@@ -934,7 +934,7 @@ int main(int argc, char *argv[])
const polyPatch& pp = mesh.boundaryMesh().last();
// Storage for faceZones.
List<DynamicList<label> > zoneFaces(patchFaces.size());
List<DynamicList<label>> zoneFaces(patchFaces.size());
// Go through all the patchFaces and find corresponding face in pp.
......
......@@ -849,7 +849,7 @@ int main(int argc, char *argv[])
HashTable<label, label> faceToCell[2];
{
HashTable<label, face, Hash<face> > faceToFaceID(boundaryFaces.size());
HashTable<label, face, Hash<face>> faceToFaceID(boundaryFaces.size());
forAll(boundaryFaces, faceI)
{
SortableList<label> sortedVerts(boundaryFaces[faceI]);
......@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
forAll(faces, i)
{
SortableList<label> sortedVerts(faces[i]);
HashTable<label, face, Hash<face> >::const_iterator fnd =
HashTable<label, face, Hash<face>>::const_iterator fnd =
faceToFaceID.find(face(sortedVerts));
if (fnd != faceToFaceID.end())
......@@ -956,7 +956,7 @@ int main(int argc, char *argv[])
}
}
List<DynamicList<face> > dynPatchFaces(dofVertIndices.size());
List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());
forAll(cellVerts, cellI)
{
......
......@@ -232,7 +232,7 @@ const char* kivaPatchNames[nBCs] =
};
List<SLList<face> > pFaces[nBCs];
List<SLList<face>> pFaces[nBCs];
face quadFace(4);
face triFace(3);
......
......@@ -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
......@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
label maxPatch = 0;
// Boundary faces as three vertices
HashTable<label, triFace, Hash<triFace> > vertsToBoundary(nFaces);
HashTable<label, triFace, Hash<triFace>> vertsToBoundary(nFaces);
forAll(boundaryFaces, faceI)
{
......@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
// Is there any boundary face with same vertices?
// (uses commutative hash)
HashTable<label, triFace, Hash<triFace> >::iterator iter =
HashTable<label, triFace, Hash<triFace>>::iterator iter =
vertsToBoundary.find(triFace(f[0], f[1], f[2]));
if (iter != vertsToBoundary.end())
......@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
{
// Sort boundaryFaces by patch.
List<DynamicList<face> > allPatchFaces(nPatches);
List<DynamicList<face>> allPatchFaces(nPatches);
forAll(boundaryPatch, faceI)
{
......
......@@ -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
......@@ -51,9 +51,9 @@ void Foam::starMesh::createCoupleMatches()
);
// Store newly created faces for each cell
Map<SLList<face> > cellAddedFaces(cellMapSize);
Map<SLList<face>> cellAddedFaces(cellMapSize);
Map<SLList<label> > cellRemovedFaces(cellMapSize);
Map<SLList<label>> cellRemovedFaces(cellMapSize);
// In order to remove often allocation, remember the number of live points.
// If you run out of space in point creation, increase it by the number of
......@@ -115,7 +115,7 @@ void Foam::starMesh::createCoupleMatches()
{
// Master face is replaced by a set of slave faces
Map<SLList<label> >::iterator crfIter =
Map<SLList<label>>::iterator crfIter =
cellRemovedFaces.find(fp.masterCell());
if (crfIter == cellRemovedFaces.end())
......@@ -131,7 +131,7 @@ void Foam::starMesh::createCoupleMatches()
crfIter().append(fp.masterFace());
}
Map<SLList<face> >::iterator cafIter =
Map<SLList<face>>::iterator cafIter =
cellAddedFaces.find(fp.masterCell());
if (cafIter == cellAddedFaces.end())
{
......@@ -155,11 +155,11 @@ void Foam::starMesh::createCoupleMatches()
// Master data
edgeList masterEdges = masterFace.edges();
List<SLList<label> > masterEdgePoints(masterEdges.size());
List<SLList<label>> masterEdgePoints(masterEdges.size());
// Slave data
edgeList slaveEdges = slaveFace.edges();
List<SLList<label> > slaveEdgePoints(slaveEdges.size());
List<SLList<label>> slaveEdgePoints(slaveEdges.size());
// Find common plane
vector n = masterFace.normal(points_);
......@@ -1354,7 +1354,7 @@ void Foam::starMesh::createCoupleMatches()
// Add the new face to both master and slave
// Master face is replaced by a set of slave faces
Map<SLList<label> >::iterator crfMasterIter =
Map<SLList<label>>::iterator crfMasterIter =
cellRemovedFaces.find(fp.masterCell());
if (crfMasterIter == cellRemovedFaces.end())
......@@ -1370,7 +1370,7 @@ void Foam::starMesh::createCoupleMatches()
crfMasterIter().append(fp.masterFace());
}
Map<SLList<label> >::iterator crfSlaveIter =
Map<SLList<label>>::iterator crfSlaveIter =
cellRemovedFaces.find(fp.slaveCell());
if (crfSlaveIter == cellRemovedFaces.end())
......@@ -1386,7 +1386,7 @@ void Foam::starMesh::createCoupleMatches()