mirror of
https://github.com/OpenFOAM/OpenFOAM-6.git
synced 2025-12-08 06:57:46 +00:00
Update code to use the simpler C++11 template syntax removing spaces between closing ">"s
This commit is contained in:
@ -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()
|
||||
crfSlaveIter().append(fp.slaveFace());
|
||||
}
|
||||
|
||||
Map<SLList<face> >::iterator cafMasterIter =
|
||||
Map<SLList<face>>::iterator cafMasterIter =
|
||||
cellAddedFaces.find(fp.masterCell());
|
||||
if (cafMasterIter == cellAddedFaces.end())
|
||||
{
|
||||
@ -1401,7 +1401,7 @@ void Foam::starMesh::createCoupleMatches()
|
||||
cafMasterIter().append(intersectedFace);
|
||||
}
|
||||
|
||||
Map<SLList<face> >::iterator cafSlaveIter =
|
||||
Map<SLList<face>>::iterator cafSlaveIter =
|
||||
cellAddedFaces.find(fp.slaveCell());
|
||||
if (cafSlaveIter == cellAddedFaces.end())
|
||||
{
|
||||
|
||||
@ -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
|
||||
@ -498,7 +498,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
|
||||
// Sort boundaryFaces by patch using boundaryPatch.
|
||||
List<DynamicList<face> > allPatchFaces(nPatches);
|
||||
List<DynamicList<face>> allPatchFaces(nPatches);
|
||||
|
||||
forAll(boundaryPatch, faceI)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user