zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update code to use the simpler C++11 template syntax

Browse Source
This commit is contained in:
Henry Weller
2016-01-10 19:20:16 +00:00
parent acb9ec8b46
commit 4eba393fe1
49 changed files with 197 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/test/Distribution/Test-Distribution.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -128,7 +128,7 @@ int main(int argc, char *argv[])
<< "Median " << dS.median() << "Median " << dS.median()
<< endl; << endl;
reduce(dS, sumOp< Distribution<scalar> >()); reduce(dS, sumOp<Distribution<scalar>>());
if (Pstream::master()) if (Pstream::master())
{ {

4
applications/test/Hashing/Test-Hashing.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -103,7 +103,7 @@ int main(int argc, char *argv[])
} }
else if (listType == "labelListList") else if (listType == "labelListList")
{ {
List< List<label> > lst(is); List<List<label>> lst(is);
forAll(lst, i) forAll(lst, i)
{ {

4
applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1124,7 +1124,7 @@ int main(int argc, char *argv[])
meshedSurface rawSurface meshedSurface rawSurface
( (
xferCopy(polyPoints), xferCopy(polyPoints),
xferCopyTo< faceList >(boundaryFaces) xferCopyTo<faceList>(boundaryFaces)
); );
// Write locally numbered surface // Write locally numbered surface

4
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -517,7 +517,7 @@ int main(int argc, char *argv[])
cloudDirs.size() cloudDirs.size()
); );
// Particles per cell // Particles per cell
PtrList< List<SLList<indexedParticle*>*> > cellParticles PtrList<List<SLList<indexedParticle*>*> > cellParticles
( (
cloudDirs.size() cloudDirs.size()
); );

2
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
View File

@ -4,7 +4,7 @@
HashTable<word> volumeFields; HashTable<word> volumeFields;
// 2. the fields for each cloud: // 2. the fields for each cloud:
HashTable< HashTable<word> > cloudFields; HashTable<HashTable<word>> cloudFields;
if (timeDirs.size()) if (timeDirs.size())
{ {

8
applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -95,8 +95,8 @@ int main(int argc, char *argv[])
Info<< endl; Info<< endl;
::List< ::Vector> vert; // global list of vertices ::List<::Vector> vert; // global list of vertices
::List< ::tridata> tri; // global list of triangles ::List<::tridata> tri; // global list of triangles
// Convert triSurface to progmesh format. Note: can use global point // Convert triSurface to progmesh format. Note: can use global point
@ -127,7 +127,7 @@ int main(int argc, char *argv[])
::ProgressiveMesh(vert,tri,collapse_map,permutation); ::ProgressiveMesh(vert,tri,collapse_map,permutation);
// rearrange the vertex list // rearrange the vertex list
::List< ::Vector> temp_list; ::List<::Vector> temp_list;
for (int i=0;i<vert.num;i++) for (int i=0;i<vert.num;i++)
{ {
temp_list.Add(vert[i]); temp_list.Add(vert[i]);

10
etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -92,9 +92,9 @@ public:
); );
//- Construct and return a clone //- Construct and return a clone
virtual tmp< fvPatch${FieldType} > clone() const virtual tmp<fvPatch${FieldType} > clone() const
{ {
return tmp< fvPatch${FieldType} > return tmp<fvPatch${FieldType} >
( (
new ${typeName}FixedValueFvPatch${FieldType}(*this) new ${typeName}FixedValueFvPatch${FieldType}(*this)
); );
@ -108,12 +108,12 @@ public:
); );
//- Construct and return a clone setting internal field reference //- Construct and return a clone setting internal field reference
virtual tmp< fvPatch${FieldType} > clone virtual tmp<fvPatch${FieldType} > clone
( (
const DimensionedField<${TemplateType}, volMesh>& iF const DimensionedField<${TemplateType}, volMesh>& iF
) const ) const
{ {
return tmp< fvPatch${FieldType} > return tmp<fvPatch${FieldType} >
( (
new ${typeName}FixedValueFvPatch${FieldType}(*this, iF) new ${typeName}FixedValueFvPatch${FieldType}(*this, iF)
); );

10
etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -93,9 +93,9 @@ public:
); );
//- Construct and return a clone //- Construct and return a clone
virtual autoPtr< pointPatchField<${TemplateType}> > clone() const virtual autoPtr<pointPatchField<${TemplateType}> > clone() const
{ {
return autoPtr< pointPatchField<${TemplateType}> > return autoPtr<pointPatchField<${TemplateType}> >
( (
new ${typeName}FixedValuePointPatch${FieldType}(*this) new ${typeName}FixedValuePointPatch${FieldType}(*this)
); );
@ -109,12 +109,12 @@ public:
); );
//- Construct and return a clone setting internal field reference //- Construct and return a clone setting internal field reference
virtual autoPtr< pointPatchField<${TemplateType}> > clone virtual autoPtr<pointPatchField<${TemplateType}> > clone
( (
const DimensionedField<${TemplateType}, pointMesh>& iF const DimensionedField<${TemplateType}, pointMesh>& iF
) const ) const
{ {
return autoPtr< pointPatchField<${TemplateType}> > return autoPtr<pointPatchField<${TemplateType}> >
( (
new ${typeName}FixedValuePointPatch${FieldType}(*this, iF) new ${typeName}FixedValuePointPatch${FieldType}(*this, iF)
); );

10
etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -92,9 +92,9 @@ public:
); );
//- Construct and return a clone //- Construct and return a clone
virtual tmp< fvPatch${FieldType} > clone() const virtual tmp<fvPatch${FieldType} > clone() const
{ {
return tmp< fvPatch${FieldType} > return tmp<fvPatch${FieldType} >
( (
new ${typeName}MixedValueFvPatch${FieldType}(*this) new ${typeName}MixedValueFvPatch${FieldType}(*this)
); );
@ -108,12 +108,12 @@ public:
); );
//- Construct and return a clone setting internal field reference //- Construct and return a clone setting internal field reference
virtual tmp< fvPatch${FieldType} > clone virtual tmp<fvPatch${FieldType} > clone
( (
const DimensionedField<${TemplateType}, volMesh>& iF const DimensionedField<${TemplateType}, volMesh>& iF
) const ) const
{ {
return tmp< fvPatch${FieldType} > return tmp<fvPatch${FieldType} >
( (
new ${typeName}MixedValueFvPatch${FieldType}(*this, iF) new ${typeName}MixedValueFvPatch${FieldType}(*this, iF)
); );

70
src/OpenFOAM/containers/Lists/Distribution/Distribution.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,7 +32,7 @@ License
template<class Type> template<class Type>
Foam::Distribution<Type>::Distribution() Foam::Distribution<Type>::Distribution()
: :
List< List<scalar> >(pTraits<Type>::nComponents), List<List<scalar>>(pTraits<Type>::nComponents),
binWidth_(pTraits<Type>::one), binWidth_(pTraits<Type>::one),
listStarts_(pTraits<Type>::nComponents, 0) listStarts_(pTraits<Type>::nComponents, 0)
{} {}
@ -41,7 +41,7 @@ Foam::Distribution<Type>::Distribution()
template<class Type> template<class Type>
Foam::Distribution<Type>::Distribution(const Type& binWidth) Foam::Distribution<Type>::Distribution(const Type& binWidth)
: :
List< List<scalar> >(pTraits<Type>::nComponents), List<List<scalar>>(pTraits<Type>::nComponents),
binWidth_(binWidth), binWidth_(binWidth),
listStarts_(pTraits<Type>::nComponents, 0) listStarts_(pTraits<Type>::nComponents, 0)
{} {}
@ -50,7 +50,7 @@ Foam::Distribution<Type>::Distribution(const Type& binWidth)
template<class Type> template<class Type>
Foam::Distribution<Type>::Distribution(const Distribution<Type>& d) Foam::Distribution<Type>::Distribution(const Distribution<Type>& d)
: :
List< List<scalar> >(static_cast< const List< List<scalar> >& >(d)), List<List<scalar>>(static_cast<const List<List<scalar>>& >(d)),
binWidth_(d.binWidth()), binWidth_(d.binWidth()),
listStarts_(d.listStarts()) listStarts_(d.listStarts())
{} {}
@ -227,11 +227,11 @@ Type Foam::Distribution<Type>::median() const
{ {
Type medianValue(pTraits<Type>::zero); Type medianValue(pTraits<Type>::zero);
List< List < Pair<scalar> > > normDistribution = normalised(); List<List<Pair<scalar>>> normDistribution = normalised();
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{ {
List< Pair<scalar> >& normDist = normDistribution[cmpt]; List<Pair<scalar>>& normDist = normDistribution[cmpt];
if (normDist.size()) if (normDist.size())
{ {
@ -331,10 +331,10 @@ void Foam::Distribution<Type>::add
template<class Type> template<class Type>
Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam:: Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
Distribution<Type>::normalised() const Distribution<Type>::normalised() const
{ {
List< List < Pair<scalar> > > normDistribution(pTraits<Type>::nComponents); List<List<Pair<scalar>>> normDistribution(pTraits<Type>::nComponents);
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{ {
@ -349,7 +349,7 @@ Distribution<Type>::normalised() const
List<label> cmptKeys = keys(cmpt); List<label> cmptKeys = keys(cmpt);
List< Pair<scalar> >& normDist = normDistribution[cmpt]; List<Pair<scalar>>& normDist = normDistribution[cmpt];
Pair<label> limits = validLimits(cmpt); Pair<label> limits = validLimits(cmpt);
@ -379,10 +379,10 @@ Distribution<Type>::normalised() const
template<class Type> template<class Type>
Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam:: Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
Distribution<Type>::raw() const Distribution<Type>::raw() const
{ {
List< List < Pair<scalar> > > rawDistribution(pTraits<Type>::nComponents); List<List<Pair<scalar>>> rawDistribution(pTraits<Type>::nComponents);
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{ {
@ -395,7 +395,7 @@ Distribution<Type>::raw() const
List<label> cmptKeys = keys(cmpt); List<label> cmptKeys = keys(cmpt);
List< Pair<scalar> >& rawDist = rawDistribution[cmpt]; List<Pair<scalar>>& rawDist = rawDistribution[cmpt];
Pair<label> limits = validLimits(cmpt); Pair<label> limits = validLimits(cmpt);
@ -421,20 +421,20 @@ Distribution<Type>::raw() const
template<class Type> template<class Type>
Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam:: Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
Distribution<Type>::cumulativeNormalised() const Distribution<Type>::cumulativeNormalised() const
{ {
List< List< Pair<scalar> > > normalisedDistribution = normalised(); List<List<Pair<scalar>>> normalisedDistribution = normalised();
List< List < Pair<scalar> > > cumulativeNormalisedDistribution = List<List<Pair<scalar>>> cumulativeNormalisedDistribution =
normalisedDistribution; normalisedDistribution;
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{ {
const List< Pair<scalar> >& normalisedCmpt = const List<Pair<scalar>>& normalisedCmpt =
normalisedDistribution[cmpt]; normalisedDistribution[cmpt];
List< Pair<scalar> >& cumNormalisedCmpt = List<Pair<scalar>>& cumNormalisedCmpt =
cumulativeNormalisedDistribution[cmpt]; cumulativeNormalisedDistribution[cmpt];
scalar sum = 0.0; scalar sum = 0.0;
@ -457,18 +457,18 @@ Distribution<Type>::cumulativeNormalised() const
template<class Type> template<class Type>
Foam::List< Foam::List< Foam::Pair<Foam::scalar> > >Foam:: Foam::List<Foam::List<Foam::Pair<Foam::scalar>>>Foam::
Distribution<Type>::cumulativeRaw() const Distribution<Type>::cumulativeRaw() const
{ {
List< List< Pair<scalar> > > rawDistribution = raw(); List<List<Pair<scalar>>> rawDistribution = raw();
List< List < Pair<scalar> > > cumulativeRawDistribution = rawDistribution; List<List<Pair<scalar>>> cumulativeRawDistribution = rawDistribution;
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{ {
const List< Pair<scalar> >& rawCmpt = rawDistribution[cmpt]; const List<Pair<scalar>>& rawCmpt = rawDistribution[cmpt];
List< Pair<scalar> >& cumRawCmpt = cumulativeRawDistribution[cmpt]; List<Pair<scalar>>& cumRawCmpt = cumulativeRawDistribution[cmpt];
scalar sum = 0.0; scalar sum = 0.0;
@ -503,15 +503,15 @@ void Foam::Distribution<Type>::clear()
template<class Type> template<class Type>
void Foam::Distribution<Type>::write(const fileName& filePrefix) const void Foam::Distribution<Type>::write(const fileName& filePrefix) const
{ {
List< List< Pair<scalar> > > rawDistribution = raw(); List<List<Pair<scalar>>> rawDistribution = raw();
List< List < Pair<scalar> > > normDistribution = normalised(); List<List<Pair<scalar>>> normDistribution = normalised();
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{ {
const List< Pair<scalar> >& rawPairs = rawDistribution[cmpt]; const List<Pair<scalar>>& rawPairs = rawDistribution[cmpt];
const List< Pair<scalar> >& normPairs = normDistribution[cmpt]; const List<Pair<scalar>>& normPairs = normDistribution[cmpt];
OFstream os(filePrefix + '_' + pTraits<Type>::componentNames[cmpt]); OFstream os(filePrefix + '_' + pTraits<Type>::componentNames[cmpt]);
@ -526,15 +526,15 @@ void Foam::Distribution<Type>::write(const fileName& filePrefix) const
} }
} }
List< List< Pair<scalar> > > rawCumDist = cumulativeRaw(); List<List<Pair<scalar>>> rawCumDist = cumulativeRaw();
List< List < Pair<scalar> > > normCumDist = cumulativeNormalised(); List<List<Pair<scalar>>> normCumDist = cumulativeNormalised();
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
{ {
const List< Pair<scalar> >& rawPairs = rawCumDist[cmpt]; const List<Pair<scalar>>& rawPairs = rawCumDist[cmpt];
const List< Pair<scalar> >& normPairs = normCumDist[cmpt]; const List<Pair<scalar>>& normPairs = normCumDist[cmpt];
OFstream os OFstream os
( (
@ -570,7 +570,7 @@ void Foam::Distribution<Type>::operator=
<< abort(FatalError); << abort(FatalError);
} }
List< List<scalar> >::operator=(rhs); List<List<scalar>>::operator=(rhs);
binWidth_ = rhs.binWidth(); binWidth_ = rhs.binWidth();
@ -587,7 +587,7 @@ Foam::Istream& Foam::operator>>
Distribution<Type>& d Distribution<Type>& d
) )
{ {
is >> static_cast<List< List<scalar> >&>(d) is >> static_cast<List<List<scalar>>&>(d)
>> d.binWidth_ >> d.binWidth_
>> d.listStarts_; >> d.listStarts_;
@ -605,7 +605,7 @@ Foam::Ostream& Foam::operator<<
const Distribution<Type>& d const Distribution<Type>& d
) )
{ {
os << static_cast<const List< List<scalar> >& >(d) os << static_cast<const List<List<scalar>>& >(d)
<< d.binWidth_ << token::SPACE << d.binWidth_ << token::SPACE
<< d.listStarts_; << d.listStarts_;
@ -628,7 +628,7 @@ Foam::Distribution<Type> Foam::operator+
// The coarsest binWidth is the sensible choice // The coarsest binWidth is the sensible choice
Distribution<Type> d(max(d1.binWidth(), d2.binWidth())); Distribution<Type> d(max(d1.binWidth(), d2.binWidth()));
List< List< List < Pair<scalar> > > > rawDists(2); List<List<List<Pair<scalar>>>> rawDists(2);
rawDists[0] = d1.raw(); rawDists[0] = d1.raw();
rawDists[1] = d2.raw(); rawDists[1] = d2.raw();
@ -639,7 +639,7 @@ Foam::Distribution<Type> Foam::operator+
{ {
List<scalar>& cmptDistribution = d[cmpt]; List<scalar>& cmptDistribution = d[cmpt];
const List < Pair<scalar> >& cmptRaw = rawDists[rDI][cmpt]; const List<Pair<scalar>>& cmptRaw = rawDists[rDI][cmpt];
forAll(cmptRaw, rI) forAll(cmptRaw, rI)
{ {

12
src/OpenFOAM/containers/Lists/Distribution/Distribution.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,7 +62,7 @@ Ostream& operator<<(Ostream&, const Distribution<Type>&);
template<class Type> template<class Type>
class Distribution class Distribution
: :
public List< List<scalar> > public List<List<scalar>>
{ {
// Private data // Private data
@ -125,18 +125,18 @@ public:
//- Return the normalised distribution (probability density) //- Return the normalised distribution (probability density)
// and bins // and bins
List< List<Pair<scalar> > > normalised() const; List<List<Pair<scalar>> > normalised() const;
//- Return the distribution of the total bin weights //- Return the distribution of the total bin weights
List< List < Pair<scalar> > > raw() const; List<List < Pair<scalar> > > raw() const;
//- Return the cumulative normalised distribution and //- Return the cumulative normalised distribution and
// integration locations (at end of bins) // integration locations (at end of bins)
List< List<Pair<scalar> > > cumulativeNormalised() const; List<List<Pair<scalar>> > cumulativeNormalised() const;
//- Return the cumulative total bin weights and integration //- Return the cumulative total bin weights and integration
// locations (at end of bins) // locations (at end of bins)
List< List<Pair<scalar> > > cumulativeRaw() const; List<List<Pair<scalar>> > cumulativeRaw() const;
//- Resets the Distribution by clearing the stored lists. //- Resets the Distribution by clearing the stored lists.
// Leaves the same number of them and the same binWidth. // Leaves the same number of them and the same binWidth.

4
src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -300,7 +300,7 @@ template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
inline Foam::Xfer<Foam::List<T> > inline Foam::Xfer<Foam::List<T> >
Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::xfer() Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::xfer()
{ {
return xferMoveTo< List<T> >(*this); return xferMoveTo<List<T>>(*this);
} }

6
src/OpenFOAM/containers/Lists/FixedList/FixedList.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,7 +83,7 @@ public:
//- Hashing function class. //- Hashing function class.
// Use Hasher directly for contiguous data. Otherwise hash incrementally. // Use Hasher directly for contiguous data. Otherwise hash incrementally.
template< class HashT=Hash<T> > template<class HashT=Hash<T> >
class Hash class Hash
{ {
public: public:
@ -127,7 +127,7 @@ public:
FixedList(Istream&); FixedList(Istream&);
//- Clone //- Clone
inline autoPtr< FixedList<T, Size> > clone() const; inline autoPtr<FixedList<T, Size> > clone() const;
// Member Functions // Member Functions

6
src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -95,10 +95,10 @@ inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst)
template<class T, unsigned Size> template<class T, unsigned Size>
inline Foam::autoPtr< Foam::FixedList<T, Size> > inline Foam::autoPtr<Foam::FixedList<T, Size> >
Foam::FixedList<T, Size>::clone() const Foam::FixedList<T, Size>::clone() const
{ {
return autoPtr< FixedList<T, Size> >(new FixedList<T, Size>(*this)); return autoPtr<FixedList<T, Size> >(new FixedList<T, Size>(*this));
} }

4
src/OpenFOAM/containers/Lists/PackedList/PackedList.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -235,7 +235,7 @@ public:
explicit inline PackedList(const UIndirectList<label>&); explicit inline PackedList(const UIndirectList<label>&);
//- Clone //- Clone
inline autoPtr< PackedList<nBits> > clone() const; inline autoPtr<PackedList<nBits>> clone() const;
// Member Functions // Member Functions

4
src/OpenFOAM/containers/Lists/SubList/SubListI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,7 +83,7 @@ inline const Foam::SubList<T>& Foam::SubList<T>::null()
template<class T> template<class T>
inline Foam::SubList<T>::operator const Foam::List<T>&() const inline Foam::SubList<T>::operator const Foam::List<T>&() const
{ {
return *reinterpret_cast< const List<T>* >(this); return *reinterpret_cast<const List<T>* >(this);
} }

4
src/OpenFOAM/db/error/StaticAssert.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -77,7 +77,7 @@ class StaticAssertionTest {};
#define StaticAssert(Test) \ #define StaticAssert(Test) \
typedef ::Foam::StaticAssertionTest \ typedef ::Foam::StaticAssertionTest \
< \ < \
sizeof( ::Foam::StaticAssertionFailed< ((Test) ? true : false) > ) \ sizeof( ::Foam::StaticAssertionFailed<((Test) ? true : false)>) \
> StaticAssertMacro(StaticAssertionTest, __LINE__) > StaticAssertMacro(StaticAssertionTest, __LINE__)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

18
src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,7 +37,7 @@ Description
(baseType,thisType,argNames) \ (baseType,thisType,argNames) \
\ \
/* Add the thisType constructor function to the table */ \ /* Add the thisType constructor function to the table */ \
baseType::add##argNames##ConstructorToTable< thisType > \ baseType::add##argNames##ConstructorToTable<thisType> \
add##thisType##argNames##ConstructorTo##baseType##Table_ add##thisType##argNames##ConstructorTo##baseType##Table_
@ -46,7 +46,7 @@ Description
(baseType,thisType,argNames,lookup) \ (baseType,thisType,argNames,lookup) \
\ \
/* Add the thisType constructor function to the table, find by lookup */ \ /* Add the thisType constructor function to the table, find by lookup */ \
baseType::add##argNames##ConstructorToTable< thisType > \ baseType::add##argNames##ConstructorToTable<thisType> \
add_##lookup##_##thisType##argNames##ConstructorTo##baseType##Table_ \ add_##lookup##_##thisType##argNames##ConstructorTo##baseType##Table_ \
(#lookup) (#lookup)
@ -56,7 +56,7 @@ Description
(baseType,thisType,argNames) \ (baseType,thisType,argNames) \
\ \
/* Add the thisType constructor function to the table */ \ /* Add the thisType constructor function to the table */ \
baseType::addRemovable##argNames##ConstructorToTable< thisType > \ baseType::addRemovable##argNames##ConstructorToTable<thisType> \
addRemovable##thisType##argNames##ConstructorTo##baseType##Table_ addRemovable##thisType##argNames##ConstructorTo##baseType##Table_
@ -65,7 +65,7 @@ Description
(baseType,thisType,argNames,lookup) \ (baseType,thisType,argNames,lookup) \
\ \
/* Add the thisType constructor function to the table, find by lookup */ \ /* Add the thisType constructor function to the table, find by lookup */ \
baseType::addRemovable##argNames##ConstructorToTable< thisType > \ baseType::addRemovable##argNames##ConstructorToTable<thisType> \
addRemovable_##lookup##_##thisType##argNames##ConstructorTo \ addRemovable_##lookup##_##thisType##argNames##ConstructorTo \
##baseType##Table_(#lookup) ##baseType##Table_(#lookup)
@ -79,7 +79,7 @@ Description
(baseType,thisType,Targ,argNames) \ (baseType,thisType,Targ,argNames) \
\ \
/* Add the thisType constructor function to the table */ \ /* Add the thisType constructor function to the table */ \
baseType::add##argNames##ConstructorToTable< thisType< Targ > > \ baseType::add##argNames##ConstructorToTable<thisType<Targ>> \
add##thisType##Targ##argNames##ConstructorTo##baseType##Table_ add##thisType##Targ##argNames##ConstructorTo##baseType##Table_
@ -89,7 +89,7 @@ Description
(baseType,thisType,Targ,argNames,lookup) \ (baseType,thisType,Targ,argNames,lookup) \
\ \
/* Add the thisType constructor function to the table, find by lookup */ \ /* Add the thisType constructor function to the table, find by lookup */ \
baseType::add##argNames##ConstructorToTable< thisType< Targ > > \ baseType::add##argNames##ConstructorToTable<thisType<Targ>> \
add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType \ add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType \
##Table_(#lookup) ##Table_(#lookup)
@ -103,7 +103,7 @@ Description
(baseType,thisType,Targ,argNames) \ (baseType,thisType,Targ,argNames) \
\ \
/* Add the thisType constructor function to the table */ \ /* Add the thisType constructor function to the table */ \
baseType< Targ >::add##argNames##ConstructorToTable< thisType< Targ > > \ baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>> \
add##thisType##Targ##argNames##ConstructorTo##baseType##Targ##Table_ add##thisType##Targ##argNames##ConstructorTo##baseType##Targ##Table_
@ -113,7 +113,7 @@ Description
(baseType,thisType,Targ,argNames,lookup) \ (baseType,thisType,Targ,argNames,lookup) \
\ \
/* Add the thisType constructor function to the table, find by lookup */ \ /* Add the thisType constructor function to the table, find by lookup */ \
baseType< Targ >::add##argNames##ConstructorToTable< thisType< Targ > > \ baseType<Targ>::add##argNames##ConstructorToTable<thisType<Targ>> \
add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType## \ add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType## \
Targ##Table_(#lookup) Targ##Table_(#lookup)

52
src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -50,10 +50,10 @@ Description
(autoPtr,baseType,argNames,argList,parList) \ (autoPtr,baseType,argNames,argList,parList) \
\ \
/* Construct from argList function pointer type */ \ /* Construct from argList function pointer type */ \
typedef autoPtr< baseType > (*argNames##ConstructorPtr)argList; \ typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\ \
/* Construct from argList function table type */ \ /* Construct from argList function table type */ \
typedef HashTable< argNames##ConstructorPtr, word, string::hash > \ typedef HashTable<argNames##ConstructorPtr, word, string::hash> \
argNames##ConstructorTable; \ argNames##ConstructorTable; \
\ \
/* Construct from argList function pointer table pointer */ \ /* Construct from argList function pointer table pointer */ \
@ -66,14 +66,14 @@ Description
static void destroy##argNames##ConstructorTables(); \ static void destroy##argNames##ConstructorTables(); \
\ \
/* Class to add constructor from argList to table */ \ /* Class to add constructor from argList to table */ \
template< class baseType##Type > \ template<class baseType##Type> \
class add##argNames##ConstructorToTable \ class add##argNames##ConstructorToTable \
{ \ { \
public: \ public: \
\ \
static autoPtr< baseType > New argList \ static autoPtr<baseType> New argList \
{ \ { \
return autoPtr< baseType >(new baseType##Type parList); \ return autoPtr<baseType>(new baseType##Type parList); \
} \ } \
\ \
add##argNames##ConstructorToTable \ add##argNames##ConstructorToTable \
@ -99,7 +99,7 @@ Description
\ \
/* Class to add constructor from argList to table */ \ /* Class to add constructor from argList to table */ \
/* Remove only the entry (not the table) upon destruction */ \ /* Remove only the entry (not the table) upon destruction */ \
template< class baseType##Type > \ template<class baseType##Type> \
class addRemovable##argNames##ConstructorToTable \ class addRemovable##argNames##ConstructorToTable \
{ \ { \
/* retain lookup name for later removal */ \ /* retain lookup name for later removal */ \
@ -107,9 +107,9 @@ Description
\ \
public: \ public: \
\ \
static autoPtr< baseType > New argList \ static autoPtr<baseType> New argList \
{ \ { \
return autoPtr< baseType >(new baseType##Type parList); \ return autoPtr<baseType>(new baseType##Type parList); \
} \ } \
\ \
addRemovable##argNames##ConstructorToTable \ addRemovable##argNames##ConstructorToTable \
@ -141,10 +141,10 @@ Description
(autoPtr,baseType,argNames,argList,parList) \ (autoPtr,baseType,argNames,argList,parList) \
\ \
/* Construct from argList function pointer type */ \ /* Construct from argList function pointer type */ \
typedef autoPtr< baseType > (*argNames##ConstructorPtr)argList; \ typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \
\ \
/* Construct from argList function table type */ \ /* Construct from argList function table type */ \
typedef HashTable< argNames##ConstructorPtr, word, string::hash > \ typedef HashTable<argNames##ConstructorPtr, word, string::hash> \
argNames##ConstructorTable; \ argNames##ConstructorTable; \
\ \
/* Construct from argList function pointer table pointer */ \ /* Construct from argList function pointer table pointer */ \
@ -157,14 +157,14 @@ Description
static void destroy##argNames##ConstructorTables(); \ static void destroy##argNames##ConstructorTables(); \
\ \
/* Class to add constructor from argList to table */ \ /* Class to add constructor from argList to table */ \
template< class baseType##Type > \ template<class baseType##Type> \
class add##argNames##ConstructorToTable \ class add##argNames##ConstructorToTable \
{ \ { \
public: \ public: \
\ \
static autoPtr< baseType > New##baseType argList \ static autoPtr<baseType> New##baseType argList \
{ \ { \
return autoPtr< baseType >(baseType##Type::New parList.ptr()); \ return autoPtr<baseType>(baseType##Type::New parList.ptr()); \
} \ } \
\ \
add##argNames##ConstructorToTable \ add##argNames##ConstructorToTable \
@ -196,7 +196,7 @@ Description
}; \ }; \
\ \
/* Class to add constructor from argList to table */ \ /* Class to add constructor from argList to table */ \
template< class baseType##Type > \ template<class baseType##Type> \
class addRemovable##argNames##ConstructorToTable \ class addRemovable##argNames##ConstructorToTable \
{ \ { \
/* retain lookup name for later removal */ \ /* retain lookup name for later removal */ \
@ -204,9 +204,9 @@ Description
\ \
public: \ public: \
\ \
static autoPtr< baseType > New##baseType argList \ static autoPtr<baseType> New##baseType argList \
{ \ { \
return autoPtr< baseType >(baseType##Type::New parList.ptr()); \ return autoPtr<baseType>(baseType##Type::New parList.ptr()); \
} \ } \
\ \
addRemovable##argNames##ConstructorToTable \ addRemovable##argNames##ConstructorToTable \
@ -325,14 +325,14 @@ Description
(baseType,argNames,Targ) \ (baseType,argNames,Targ) \
\ \
/* Table constructor called from the table add function */ \ /* Table constructor called from the table add function */ \
void baseType< Targ >::construct##argNames##ConstructorTables() \ void baseType<Targ>::construct##argNames##ConstructorTables() \
{ \ { \
static bool constructed = false; \ static bool constructed = false; \
if (!constructed) \ if (!constructed) \
{ \ { \
constructed = true; \ constructed = true; \
baseType< Targ >::argNames##ConstructorTablePtr_ \ baseType<Targ>::argNames##ConstructorTablePtr_ \
= new baseType< Targ >::argNames##ConstructorTable; \ = new baseType<Targ>::argNames##ConstructorTable; \
} \ } \
} }
@ -344,12 +344,12 @@ Description
(baseType,argNames,Targ) \ (baseType,argNames,Targ) \
\ \
/* Table destructor called from the table add function destructor */ \ /* Table destructor called from the table add function destructor */ \
void baseType< Targ >::destroy##argNames##ConstructorTables() \ void baseType<Targ>::destroy##argNames##ConstructorTables() \
{ \ { \
if (baseType< Targ >::argNames##ConstructorTablePtr_) \ if (baseType<Targ>::argNames##ConstructorTablePtr_) \
{ \ { \
delete baseType< Targ >::argNames##ConstructorTablePtr_; \ delete baseType<Targ>::argNames##ConstructorTablePtr_; \
baseType< Targ >::argNames##ConstructorTablePtr_ = NULL; \ baseType<Targ>::argNames##ConstructorTablePtr_ = NULL; \
} \ } \
} }
@ -361,8 +361,8 @@ Description
(baseType,argNames,Targ) \ (baseType,argNames,Targ) \
\ \
/* Define the constructor function table */ \ /* Define the constructor function table */ \
baseType< Targ >::argNames##ConstructorTable* \ baseType<Targ>::argNames##ConstructorTable* \
baseType< Targ >::argNames##ConstructorTablePtr_ = NULL baseType<Targ>::argNames##ConstructorTablePtr_ = NULL
// external use: // external use:

4
src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -311,7 +311,7 @@ template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
inline Foam::Xfer<Foam::List<T> > inline Foam::Xfer<Foam::List<T> >
Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::xfer() Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::xfer()
{ {
return xferMoveTo< List<T> >(*this); return xferMoveTo<List<T>>(*this);
} }

4
src/OpenFOAM/fields/Fields/Field/SubFieldI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -118,7 +118,7 @@ inline void Foam::SubField<Type>::operator=(const SubField<Type>& rhs)
template<class Type> template<class Type>
inline Foam::SubField<Type>::operator const Foam::Field<Type>&() const inline Foam::SubField<Type>::operator const Foam::Field<Type>&() const
{ {
return *reinterpret_cast< const Field<Type>* >(this); return *reinterpret_cast<const Field<Type>* >(this);
} }

6
src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,7 +37,7 @@ SourceFiles
// Only used internally // Only used internally
#define makeTypeTableReadersTypeName(typeTableReader, dataType) \ #define makeTypeTableReadersTypeName(typeTableReader, dataType) \
\ \
defineNamedTemplateTypeNameAndDebug(typeTableReader< dataType >, 0) defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0)
// Sometimes used externally // Sometimes used externally
#define makeTableReadersTypeName(typeTableReader) \ #define makeTableReadersTypeName(typeTableReader) \
@ -51,7 +51,7 @@ SourceFiles
// Define type info for single dataType template instantiation (eg, vector) // Define type info for single dataType template instantiation (eg, vector)
#define makeTableReaderType(typeTableReader, dataType) \ #define makeTableReaderType(typeTableReader, dataType) \
\ \
defineNamedTemplateTypeNameAndDebug(typeTableReader< dataType >, 0); \ defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0); \
addTemplatedToRunTimeSelectionTable \ addTemplatedToRunTimeSelectionTable \
( \ ( \
tableReader, typeTableReader, dataType, dictionary \ tableReader, typeTableReader, dataType, dictionary \

4
src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -50,7 +50,7 @@ inline Foam::labelRange::labelRange(const label start, const label size)
inline Foam::labelRange::const_iterator::const_iterator() inline Foam::labelRange::const_iterator::const_iterator()
: :
range_(*reinterpret_cast< Foam::labelRange* >(0)), range_(*reinterpret_cast<Foam::labelRange* >(0)),
index_(-1) index_(-1)
{} {}

4
src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -42,7 +42,7 @@ inline Foam::labelRanges::labelRanges(const label nElem)
inline Foam::labelRanges::const_iterator::const_iterator() inline Foam::labelRanges::const_iterator::const_iterator()
: :
list_(*reinterpret_cast< Foam::labelRanges* >(0)), list_(*reinterpret_cast<Foam::labelRanges* >(0)),
index_(-1), index_(-1),
subIndex_(-1) subIndex_(-1)
{} {}

4
src/OpenFOAM/primitives/strings/lists/hashedWordList.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -61,7 +61,7 @@ Foam::hashedWordList::hashedWordList(const hashedWordList& names)
} }
Foam::hashedWordList::hashedWordList(const Xfer< List<word> >& names) Foam::hashedWordList::hashedWordList(const Xfer<List<word>>& names)
: :
List<word>(names) List<word>(names)
{ {

4
src/OpenFOAM/primitives/strings/lists/hashedWordList.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,7 +83,7 @@ public:
hashedWordList(const UList<word>& names); hashedWordList(const UList<word>& names);
//- Construct by transferring the parameter contents //- Construct by transferring the parameter contents
hashedWordList(const Xfer< List<word> >& names); hashedWordList(const Xfer<List<word>>& names);
//- Construct from number and list of names //- Construct from number and list of names
hashedWordList(const label nNames, const char** names); hashedWordList(const label nNames, const char** names);

4
src/fileFormats/sampledSetWriters/writer.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template<class Type> template<class Type>
Foam::autoPtr< Foam::writer<Type> > Foam::writer<Type>::New Foam::autoPtr<Foam::writer<Type>> Foam::writer<Type>::New
( (
const word& writeType const word& writeType
) )

6
src/fileFormats/sampledSetWriters/writers.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,7 +41,7 @@ SourceFiles
// Only used internally // Only used internally
#define makeTypeSetWritersTypeName(typeWriter, dataType) \ #define makeTypeSetWritersTypeName(typeWriter, dataType) \
\ \
defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0) defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0)
// Sometimes used externally // Sometimes used externally
#define makeSetWritersTypeName(typeWriter) \ #define makeSetWritersTypeName(typeWriter) \
@ -55,7 +55,7 @@ SourceFiles
// Define type info for single dataType template instantiation (eg, vector) // Define type info for single dataType template instantiation (eg, vector)
#define makeSetWriterType(typeWriter, dataType) \ #define makeSetWriterType(typeWriter, dataType) \
\ \
defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0); \ defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0); \
addTemplatedToRunTimeSelectionTable \ addTemplatedToRunTimeSelectionTable \
( \ ( \
writer, typeWriter, dataType, word \ writer, typeWriter, dataType, word \

4
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -2178,7 +2178,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
template<class Type> template<class Type>
Foam::tmp<Foam::fvMatrix<Type> > Foam::operator* Foam::tmp<Foam::fvMatrix<Type> > Foam::operator*
( (
const tmp< DimensionedField<scalar, volMesh> >& tdsf, const tmp<DimensionedField<scalar, volMesh> >& tdsf,
const fvMatrix<Type>& A const fvMatrix<Type>& A
) )
{ {

10
src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -52,7 +52,7 @@ void Foam::bufferedAccumulator<Type>::accumulateAndResetBuffer(const label b)
template<class Type> template<class Type>
Foam::bufferedAccumulator<Type>::bufferedAccumulator() Foam::bufferedAccumulator<Type>::bufferedAccumulator()
: :
List< Field<Type> >(), List<Field<Type>>(),
averagesTaken_(), averagesTaken_(),
bufferOffsets_() bufferOffsets_()
{} {}
@ -66,7 +66,7 @@ Foam::bufferedAccumulator<Type>::bufferedAccumulator
const label bufferingInterval const label bufferingInterval
) )
: :
List< Field<Type> >(), List<Field<Type>>(),
averagesTaken_(), averagesTaken_(),
bufferOffsets_() bufferOffsets_()
{ {
@ -85,7 +85,7 @@ Foam::bufferedAccumulator<Type>::bufferedAccumulator
const bufferedAccumulator<Type>& bA const bufferedAccumulator<Type>& bA
) )
: :
List< Field<Type> >(static_cast< List< Field<Type> > >(bA)), List<Field<Type>>(static_cast<List<Field<Type>>>(bA)),
averagesTaken_(bA.averagesTaken()), averagesTaken_(bA.averagesTaken()),
bufferOffsets_(bA.bufferOffsets()) bufferOffsets_(bA.bufferOffsets())
{} {}
@ -217,7 +217,7 @@ void Foam::bufferedAccumulator<Type>::operator=
<< abort(FatalError); << abort(FatalError);
} }
List< Field<Type> >::operator=(rhs); List<Field<Type>>::operator=(rhs);
averagesTaken_ = rhs.averagesTaken(); averagesTaken_ = rhs.averagesTaken();

4
src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,7 +60,7 @@ Ostream& operator<<
template<class Type> template<class Type>
class bufferedAccumulator class bufferedAccumulator
: :
public List< Field<Type> > public List<Field<Type>>
{ {
// Private data // Private data

4
src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -34,7 +34,7 @@ Foam::operator<<(Ostream& os, const bufferedAccumulator<Type>& bA)
{ {
os << bA.averagesTaken_ os << bA.averagesTaken_
<< static_cast<const List< Field<Type> >&>(bA) << static_cast<const List<Field<Type>>&>(bA)
<< bA.bufferOffsets(); << bA.bufferOffsets();
// Check state of Ostream // Check state of Ostream

4
src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,7 +62,7 @@ void Foam::correlationFunction<Type>::setTimesAndSizes
); );
tZeroBuffers_ = tZeroBuffers_ =
Field< Field<Type> > Field<Field<Type>>
( (
nBuffers, nBuffers,
Field<Type> Field<Type>

6
src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -67,7 +67,7 @@ class correlationFunction
const polyMesh& mesh_; const polyMesh& mesh_;
Field< Field<Type> > tZeroBuffers_; Field<Field<Type>> tZeroBuffers_;
scalar duration_; scalar duration_;
scalar sampleInterval_; scalar sampleInterval_;
@ -137,7 +137,7 @@ public:
// Access // Access
inline const Field< Field<Type> >& tZeroBuffers() const; inline const Field<Field<Type>>& tZeroBuffers() const;
inline scalar duration() const; inline scalar duration() const;

4
src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class Type> template<class Type>
inline const Foam::Field< Foam::Field<Type> >& inline const Foam::Field<Foam::Field<Type>>&
Foam::correlationFunction<Type>::tZeroBuffers() const Foam::correlationFunction<Type>::tZeroBuffers() const
{ {
return tZeroBuffers_; return tZeroBuffers_;

4
src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -68,7 +68,7 @@ Foam::distribution::distribution(const scalar binWidth)
Foam::distribution::distribution(const distribution& d) Foam::distribution::distribution(const distribution& d)
: :
Map<label>(static_cast< Map<label> >(d)), Map<label>(static_cast<Map<label>>(d)),
binWidth_(d.binWidth()) binWidth_(d.binWidth())
{} {}

8
src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
View File

@ -1,24 +1,24 @@
// Fields for data gathering // Fields for data gathering
List< scalarField > allSpeciesN_RU List<scalarField> allSpeciesN_RU
( (
molecules.potential().nIds(), molecules.potential().nIds(),
scalarField (mesh.nCells(), 0.0) scalarField (mesh.nCells(), 0.0)
); );
List< scalarField > allSpeciesM_RU List<scalarField> allSpeciesM_RU
( (
molecules.potential().nIds(), molecules.potential().nIds(),
scalarField (mesh.nCells(), 0.0) scalarField (mesh.nCells(), 0.0)
); );
List< vectorField > allSpeciesVelocitySum_RU List<vectorField> allSpeciesVelocitySum_RU
( (
molecules.potential().nIds(), molecules.potential().nIds(),
vectorField (mesh.nCells(), vector::zero) vectorField (mesh.nCells(), vector::zero)
); );
List< scalarField > allSpeciesVelocityMagSquaredSum_RU List<scalarField> allSpeciesVelocityMagSquaredSum_RU
( (
molecules.potential().nIds(), molecules.potential().nIds(),
scalarField (mesh.nCells(), 0.0) scalarField (mesh.nCells(), 0.0)

8
src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
View File

@ -1,24 +1,24 @@
if (runTime.outputTime()) if (runTime.outputTime())
{ {
allSpeciesN_RU = List< scalarField > allSpeciesN_RU = List<scalarField>
( (
molecules.potential().nIds(), molecules.potential().nIds(),
scalarField(mesh.nCells(), 0.0) scalarField(mesh.nCells(), 0.0)
); );
allSpeciesM_RU = List< scalarField > allSpeciesM_RU = List<scalarField>
( (
molecules.potential().nIds(), molecules.potential().nIds(),
scalarField(mesh.nCells(), 0.0) scalarField(mesh.nCells(), 0.0)
); );
allSpeciesVelocitySum_RU = List< vectorField > allSpeciesVelocitySum_RU = List<vectorField>
( (
molecules.potential().nIds(), molecules.potential().nIds(),
vectorField(mesh.nCells(), vector::zero) vectorField(mesh.nCells(), vector::zero)
); );
allSpeciesVelocityMagSquaredSum_RU = List< scalarField > allSpeciesVelocityMagSquaredSum_RU = List<scalarField>
( (
molecules.potential().nIds(), molecules.potential().nIds(),
scalarField(mesh.nCells(), 0.0) scalarField(mesh.nCells(), 0.0)

6
src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -113,7 +113,7 @@ Foam::scalar Foam::pairPotential::force(const scalar r) const
} }
Foam::List< Foam::Pair< Foam::scalar > > Foam::List<Foam::Pair<Foam::scalar>>
Foam::pairPotential::forceTable() const Foam::pairPotential::forceTable() const
{ {
List<Pair<scalar> > forceTab(forceLookup_.size()); List<Pair<scalar> > forceTab(forceLookup_.size());
@ -150,7 +150,7 @@ Foam::scalar Foam::pairPotential::energy(const scalar r) const
} }
Foam::List< Foam::Pair< Foam::scalar > > Foam::List<Foam::Pair<Foam::scalar>>
Foam::pairPotential::energyTable() const Foam::pairPotential::energyTable() const
{ {
List<Pair<scalar> > energyTab(energyLookup_.size()); List<Pair<scalar> > energyTab(energyLookup_.size());

6
src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,9 +31,9 @@ bool Foam::pairPotential::writeEnergyAndForceTables(Ostream& os) const
Info<< "Writing energy and force tables to file for potential " Info<< "Writing energy and force tables to file for potential "
<< name_ << endl; << name_ << endl;
List< Pair <scalar> > eTab(energyTable()); List<Pair <scalar> > eTab(energyTable());
List< Pair <scalar> > fTab(forceTable()); List<Pair <scalar> > fTab(forceTable());
forAll(eTab, e) forAll(eTab, e)
{ {

4
src/mesh/blockMesh/block/blockCreate.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -47,7 +47,7 @@ void Foam::block::createPoints() const
// List of edge point and weighting factors // List of edge point and weighting factors
const List< List<point> >& p = blockEdgePoints(); const List<List<point>>& p = blockEdgePoints();
const scalarListList& w = blockEdgeWeights(); const scalarListList& w = blockEdgeWeights();
// //

4
src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -186,7 +186,7 @@ const Foam::cellShape& Foam::blockDescriptor::blockShape() const
} }
const Foam::List< Foam::List< Foam::point > >& const Foam::List<Foam::List<Foam::point>>&
Foam::blockDescriptor::blockEdgePoints() const Foam::blockDescriptor::blockEdgePoints() const
{ {
return edgePoints_; return edgePoints_;

6
src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -76,7 +76,7 @@ class blockDescriptor
Vector<label> meshDensity_; Vector<label> meshDensity_;
//- Block edge points //- Block edge points
List< List<point> > edgePoints_; List<List<point>> edgePoints_;
//- Block edge weighting factors //- Block edge weighting factors
scalarListList edgeWeights_; scalarListList edgeWeights_;
@ -155,7 +155,7 @@ public:
const cellShape& blockShape() const; const cellShape& blockShape() const;
//- Return the block points along each edge //- Return the block points along each edge
const List< List<point> >& blockEdgePoints() const; const List<List<point>>& blockEdgePoints() const;
//- Return the weightings along each edge //- Return the weightings along each edge
const scalarListList& blockEdgeWeights() const; const scalarListList& blockEdgeWeights() const;

6
src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -334,7 +334,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
} }
// Shrink it // Shrink it
forAllIter(Map< DynamicList<label> >, facePointEdges, iter) forAllIter(Map<DynamicList<label>>, facePointEdges, iter)
{ {
iter().shrink(); iter().shrink();
@ -361,7 +361,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
} }
Pout<< " Constructed point-edge adressing:" << endl; Pout<< " Constructed point-edge adressing:" << endl;
forAllConstIter(Map< DynamicList<label> >, facePointEdges, iter) forAllConstIter(Map<DynamicList<label>>, facePointEdges, iter)
{ {
Pout<< " vertex " << iter.key() << " is connected to edges " Pout<< " vertex " << iter.key() << " is connected to edges "
<< iter() << endl; << iter() << endl;

6
src/sampling/meshToMesh0/meshToMesh0Templates.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -365,7 +365,7 @@ void Foam::meshToMesh0::interpolate
template<class Type, class CombineOp> template<class Type, class CombineOp>
Foam::tmp< Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> > Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::meshToMesh0::interpolate Foam::meshToMesh0::interpolate
( (
const GeometricField<Type, fvPatchField, volMesh>& fromVf, const GeometricField<Type, fvPatchField, volMesh>& fromVf,
@ -437,7 +437,7 @@ Foam::meshToMesh0::interpolate
template<class Type, class CombineOp> template<class Type, class CombineOp>
Foam::tmp< Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> > Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::meshToMesh0::interpolate Foam::meshToMesh0::interpolate
( (
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf, const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,

4
src/sampling/sampledSet/sampledSets/sampledSets.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -72,7 +72,7 @@ class sampledSets
public: public:
//- The set formatter //- The set formatter
autoPtr< writer<Type> > formatter; autoPtr<writer<Type>> formatter;
//- Construct null //- Construct null
fieldGroup() fieldGroup()

10
src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -30,7 +30,7 @@ License
template<class Face> template<class Face>
Foam::autoPtr< Foam::MeshedSurface<Face> > Foam::autoPtr<Foam::MeshedSurface<Face>>
Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext) Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
{ {
if (debug) if (debug)
@ -50,7 +50,7 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
if (supported.found(ext)) if (supported.found(ext))
{ {
// create indirectly // create indirectly
autoPtr< MeshedSurface<Face> > surf(new MeshedSurface<Face>); autoPtr<MeshedSurface<Face>> surf(new MeshedSurface<Face>);
surf().transfer(FriendType::New(name, ext)()); surf().transfer(FriendType::New(name, ext)());
return surf; return surf;
@ -66,12 +66,12 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
<< exit(FatalError); << exit(FatalError);
} }
return autoPtr< MeshedSurface<Face> >(cstrIter()(name)); return autoPtr<MeshedSurface<Face>>(cstrIter()(name));
} }
template<class Face> template<class Face>
Foam::autoPtr< Foam::MeshedSurface<Face> > Foam::autoPtr<Foam::MeshedSurface<Face>>
Foam::MeshedSurface<Face>::New(const fileName& name) Foam::MeshedSurface<Face>::New(const fileName& name)
{ {
word ext = name.ext(); word ext = name.ext();

6
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face> template<class Face>
Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> > Foam::autoPtr<Foam::UnsortedMeshedSurface<Face>>
Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext) Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
{ {
if (debug) if (debug)
@ -72,7 +72,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
template<class Face> template<class Face>
Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> > Foam::autoPtr<Foam::UnsortedMeshedSurface<Face>>
Foam::UnsortedMeshedSurface<Face>::New(const fileName& name) Foam::UnsortedMeshedSurface<Face>::New(const fileName& name)
{ {
word ext = name.ext(); word ext = name.ext();

4
src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -63,7 +63,7 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read
is >> this->storedPoints(); is >> this->storedPoints();
// triFaces read with attached keys // triFaces read with attached keys
List< Keyed<triFace> > facesRead(is); List<Keyed<triFace>> facesRead(is);
List<Face> faceLst(facesRead.size()); List<Face> faceLst(facesRead.size());
List<label> zoneIds(facesRead.size()); List<label> zoneIds(facesRead.size());