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-2013 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -125,7 +125,7 @@ int main(int argc, char *argv[])
|
||||
label nTracks = nParticle/sampleFrequency;
|
||||
|
||||
// storage for all particle tracks
|
||||
List<DynamicList<vector> > allTracks(nTracks);
|
||||
List<DynamicList<vector>> allTracks(nTracks);
|
||||
|
||||
Info<< "\nGenerating " << nTracks << " particle tracks for cloud "
|
||||
<< cloudName << nl << endl;
|
||||
@ -211,7 +211,7 @@ int main(int argc, char *argv[])
|
||||
tracks[trackI].transfer(allTracks[trackI]);
|
||||
}
|
||||
|
||||
autoPtr<writer<scalar> > scalarFormatterPtr = writer<scalar>::New
|
||||
autoPtr<writer<scalar>> scalarFormatterPtr = writer<scalar>::New
|
||||
(
|
||||
setFormat
|
||||
);
|
||||
@ -242,7 +242,7 @@ int main(int argc, char *argv[])
|
||||
true, // writeTracks
|
||||
tracks,
|
||||
wordList(0),
|
||||
List<List<scalarField> >(0),
|
||||
List<List<scalarField>>(0),
|
||||
vtkTracks
|
||||
);
|
||||
}
|
||||
|
||||
@ -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
|
||||
@ -127,7 +127,7 @@ int main(int argc, char *argv[])
|
||||
fileName vtkPath(runTime.path()/"VTK");
|
||||
mkDir(vtkPath);
|
||||
|
||||
typedef HashTable<label, labelPair, labelPair::Hash<> > trackTableType;
|
||||
typedef HashTable<label, labelPair, labelPair::Hash<>> trackTableType;
|
||||
|
||||
forAll(timeDirs, timeI)
|
||||
{
|
||||
@ -202,8 +202,8 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
// particle "age" property used to sort the tracks
|
||||
List<SortableList<scalar> > agePerTrack(nTracks);
|
||||
List<List<label> > particleMap(nTracks);
|
||||
List<SortableList<scalar>> agePerTrack(nTracks);
|
||||
List<List<label>> particleMap(nTracks);
|
||||
|
||||
forAll(trackLengths, 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
|
||||
@ -42,7 +42,7 @@ bool fieldOk(const IOobjectList& cloudObjs, const word& name)
|
||||
|
||||
|
||||
template<class Type>
|
||||
tmp<Field<Type> > readParticleField
|
||||
tmp<Field<Type>> readParticleField
|
||||
(
|
||||
const word& name,
|
||||
const IOobjectList cloudObjs
|
||||
@ -54,7 +54,7 @@ tmp<Field<Type> > readParticleField
|
||||
if (obj != NULL)
|
||||
{
|
||||
IOField<Type> newField(*obj);
|
||||
return tmp<Field<Type> >(new Field<Type>(newField.xfer()));
|
||||
return tmp<Field<Type>>(new Field<Type>(newField.xfer()));
|
||||
}
|
||||
|
||||
FatalErrorInFunction
|
||||
@ -68,7 +68,7 @@ tmp<Field<Type> > readParticleField
|
||||
template<class Type>
|
||||
void readFields
|
||||
(
|
||||
PtrList<List<Type> >& values,
|
||||
PtrList<List<Type>>& values,
|
||||
const List<word>& fieldNames,
|
||||
const IOobjectList& cloudObjs
|
||||
)
|
||||
@ -109,8 +109,8 @@ template<class Type>
|
||||
void writeVTKFields
|
||||
(
|
||||
OFstream& os,
|
||||
const PtrList<List<Type> >& values,
|
||||
const List<List<label> >& addr,
|
||||
const PtrList<List<Type>>& values,
|
||||
const List<List<label>>& addr,
|
||||
const List<word>& fieldNames
|
||||
)
|
||||
{
|
||||
@ -150,7 +150,7 @@ template<class Type>
|
||||
void processFields
|
||||
(
|
||||
OFstream& os,
|
||||
const List<List<label> >& addr,
|
||||
const List<List<label>>& addr,
|
||||
const List<word>& userFieldNames,
|
||||
const IOobjectList& cloudObjs
|
||||
)
|
||||
@ -170,7 +170,7 @@ void processFields
|
||||
}
|
||||
fieldNames.shrink();
|
||||
|
||||
PtrList<List<Type> > values(fieldNames.size());
|
||||
PtrList<List<Type>> values(fieldNames.size());
|
||||
readFields<Type>(values, fieldNames, cloudObjs);
|
||||
|
||||
writeVTKFields<Type>
|
||||
|
||||
@ -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
|
||||
@ -42,7 +42,7 @@ namespace Foam
|
||||
bool fieldOk(const IOobjectList& cloudObjs, const word& name);
|
||||
|
||||
template<class Type>
|
||||
tmp<Field<Type> > readParticleField
|
||||
tmp<Field<Type>> readParticleField
|
||||
(
|
||||
const word& name,
|
||||
const IOobjectList cloudObjs
|
||||
@ -51,7 +51,7 @@ namespace Foam
|
||||
template<class Type>
|
||||
void readFields
|
||||
(
|
||||
PtrList<List<Type> >& values,
|
||||
PtrList<List<Type>>& values,
|
||||
const List<word>& fields,
|
||||
const IOobjectList& cloudObjs
|
||||
);
|
||||
@ -63,15 +63,15 @@ namespace Foam
|
||||
void writeVTKFields
|
||||
(
|
||||
OFstream& os,
|
||||
const PtrList<List<Type> >& values,
|
||||
const List<SortableList<scalar> >& agePerTrack,
|
||||
const PtrList<List<Type>>& values,
|
||||
const List<SortableList<scalar>>& agePerTrack,
|
||||
const List<word>& fieldNames
|
||||
);
|
||||
|
||||
void processFields
|
||||
(
|
||||
OFstream& os,
|
||||
const List<SortableList<scalar> >& agePerTrack,
|
||||
const List<SortableList<scalar>>& agePerTrack,
|
||||
const List<word>& userFieldNames,
|
||||
const IOobjectList& cloudObjs
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user