mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +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 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -66,7 +66,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
|
||||
List<List<label> > lll(5);
|
||||
List<List<label>> lll(5);
|
||||
lll[0].setSize(3, 0);
|
||||
lll[1].setSize(2, 1);
|
||||
lll[2].setSize(6, 2);
|
||||
@ -88,7 +88,7 @@ int main(int argc, char *argv[])
|
||||
cll2(2, 3) = 999;
|
||||
Info<< "cll2(2, 3) = " << cll2(2, 3) << nl << endl;
|
||||
|
||||
Info<< "cll2 as List<List<label > > " << cll2()
|
||||
Info<< "cll2 as List<List<label >> " << cll2()
|
||||
<< endl;
|
||||
|
||||
cll2.setSize(3);
|
||||
|
||||
@ -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
|
||||
@ -71,7 +71,7 @@ void printInfo
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
List<DynamicList<label, 1, 0> > ldl(2);
|
||||
List<DynamicList<label, 1, 0>> ldl(2);
|
||||
|
||||
ldl[0](0) = 0;
|
||||
ldl[0](2) = 2;
|
||||
@ -96,7 +96,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
Info<< endl;
|
||||
|
||||
List<List<label> > ll(2);
|
||||
List<List<label>> ll(2);
|
||||
ll[0].transfer(ldl[0]);
|
||||
ll[1].transfer(ldl[1].shrink());
|
||||
|
||||
|
||||
@ -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
|
||||
@ -45,7 +45,7 @@ int main(int argc, char *argv[])
|
||||
Info<< "table1: " << table1 << nl
|
||||
<< "toc: " << table1.toc() << endl;
|
||||
|
||||
HashTable<label, label, Hash<label> > table2(10);
|
||||
HashTable<label, label, Hash<label>> table2(10);
|
||||
|
||||
table2.insert(3, 10);
|
||||
table2.insert(5, 12);
|
||||
|
||||
@ -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
|
||||
@ -48,9 +48,9 @@ int main(int argc, char *argv[])
|
||||
|
||||
// ie, a
|
||||
// Map<label> map(2 * nSize);
|
||||
// HashTable<label, label, Hash<label> > map(2 * nSize);
|
||||
// StaticHashTable<label, label, Hash<label> > map(2 * nSize);
|
||||
HashTable<label, label, Hash<label> > map(2 * nSize);
|
||||
// HashTable<label, label, Hash<label>> map(2 * nSize);
|
||||
// StaticHashTable<label, label, Hash<label>> map(2 * nSize);
|
||||
HashTable<label, label, Hash<label>> map(2 * nSize);
|
||||
|
||||
Info<< "Constructed map of size: " << nSize
|
||||
<< " (size " << map.size() << " capacity " << map.capacity() << ") "
|
||||
|
||||
@ -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
|
||||
@ -62,8 +62,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
// fullStaticHash is really slow
|
||||
// give it lots of slots to help
|
||||
StaticHashTable<nil, label, Hash<label> > emptyStaticHash;
|
||||
StaticHashTable<nil, label, Hash<label> > fullStaticHash(100000);
|
||||
StaticHashTable<nil, label, Hash<label>> emptyStaticHash;
|
||||
StaticHashTable<nil, label, Hash<label>> fullStaticHash(100000);
|
||||
for (label i = 0; i < n; i++)
|
||||
{
|
||||
fullStaticHash.insert(i, nil());
|
||||
|
||||
@ -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
|
||||
@ -85,7 +85,7 @@ using namespace Foam;
|
||||
//
|
||||
//
|
||||
// // Collect local pointFaces
|
||||
// List<List<point> > pointFaceNormals(map.constructSize());
|
||||
// List<List<point>> pointFaceNormals(map.constructSize());
|
||||
// {
|
||||
// const vectorField& faceAreas = mesh.faceAreas();
|
||||
//
|
||||
|
||||
@ -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
|
||||
@ -110,7 +110,7 @@ int main(int argc, char *argv[])
|
||||
)
|
||||
);
|
||||
|
||||
autoPtr<DataEntry<scalar> > dataEntry
|
||||
autoPtr<DataEntry<scalar>> dataEntry
|
||||
(
|
||||
DataEntry<scalar>::New
|
||||
(
|
||||
|
||||
@ -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 );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user