diff --git a/applications/test/Distribution/Test-Distribution.C b/applications/test/Distribution/Test-Distribution.C index 209f46a36ca3f5debfc092ba9837be0238b72d5c..f893e1e4bc44603bd2cd788e9ca9d02b3965c657 100644 --- a/applications/test/Distribution/Test-Distribution.C +++ b/applications/test/Distribution/Test-Distribution.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 @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) << "Median " << dS.median() << endl; - reduce(dS, sumOp< Distribution<scalar> >()); + reduce(dS, sumOp<Distribution<scalar>>()); if (Pstream::master()) { diff --git a/applications/test/Hashing/Test-Hashing.C b/applications/test/Hashing/Test-Hashing.C index 63da9431f183f3a428e1f127cb3f484fe69293af..0ab7e9a7cb633dff3170aef30ca6b0c095225fe1 100644 --- a/applications/test/Hashing/Test-Hashing.C +++ b/applications/test/Hashing/Test-Hashing.C @@ -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 @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) } else if (listType == "labelListList") { - List< List<label> > lst(is); + List<List<label>> lst(is); forAll(lst, i) { diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C index 874f787119e31445666ef2d5a9e85854beb8492e..2d80394ea49d71323b5624b05c536b74c8192093 100644 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.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 @@ -1124,7 +1124,7 @@ int main(int argc, char *argv[]) meshedSurface rawSurface ( xferCopy(polyPoints), - xferCopyTo< faceList >(boundaryFaces) + xferCopyTo<faceList>(boundaryFaces) ); // Write locally numbered surface diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C index 165c7c273f41dcb4b1a73d75fca09db6ca0f95f3..901890c59d71d69a55132f82efcddb16aaa84bc2 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C +++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.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 @@ -517,7 +517,7 @@ int main(int argc, char *argv[]) cloudDirs.size() ); // Particles per cell - PtrList< List<SLList<indexedParticle*>*> > cellParticles + PtrList<List<SLList<indexedParticle*>*> > cellParticles ( cloudDirs.size() ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H index 7a6bd938dc466be02a3dfa887bf732dbcd7db6dd..0231f2e4dd42d357686d155c98233def36eaf008 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H @@ -4,7 +4,7 @@ HashTable<word> volumeFields; // 2. the fields for each cloud: -HashTable< HashTable<word> > cloudFields; +HashTable<HashTable<word>> cloudFields; if (timeDirs.size()) { diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C index 7603f8a4a85e1029b7834becd67dd7544896c457..1ab971475eecbc4863f59c81b1d9a150e016d0ed 100644 --- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C +++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.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 @@ -95,8 +95,8 @@ int main(int argc, char *argv[]) Info<< endl; - ::List< ::Vector> vert; // global list of vertices - ::List< ::tridata> tri; // global list of triangles + ::List<::Vector> vert; // global list of vertices + ::List<::tridata> tri; // global list of triangles // 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); // rearrange the vertex list - ::List< ::Vector> temp_list; + ::List<::Vector> temp_list; for (int i=0;i<vert.num;i++) { temp_list.Add(vert[i]); diff --git a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H index 4bb70e27ac5d8e84c837ee51da704ff5b8a5fce8..6026fe1256cb8b0973a77f271201fffad69f04ca 100644 --- a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H @@ -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 @@ -92,9 +92,9 @@ public: ); //- 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) ); @@ -108,12 +108,12 @@ public: ); //- 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 { - return tmp< fvPatch${FieldType} > + return tmp<fvPatch${FieldType} > ( new ${typeName}FixedValueFvPatch${FieldType}(*this, iF) ); diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H index 1b1baf40c673c815cee4ad0d6442345613bdc4cf..0b90345029e54cc56b0553eb7cb5ffbcfa834e28 100644 --- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H @@ -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 @@ -93,9 +93,9 @@ public: ); //- 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) ); @@ -109,12 +109,12 @@ public: ); //- 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 { - return autoPtr< pointPatchField<${TemplateType}> > + return autoPtr<pointPatchField<${TemplateType}> > ( new ${typeName}FixedValuePointPatch${FieldType}(*this, iF) ); diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H index 06e1c9887c5a31cc40d57d5eaa4a8260b04e0f4a..129fb534dd4be1299730a5436b89f6793fce9550 100644 --- a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,9 +92,9 @@ public: ); //- 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) ); @@ -108,12 +108,12 @@ public: ); //- 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 { - return tmp< fvPatch${FieldType} > + return tmp<fvPatch${FieldType} > ( new ${typeName}MixedValueFvPatch${FieldType}(*this, iF) ); diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C index 7e8e1715562b6bbba91e60c6825268cc6101d39d..c5ee3a283c50c5830c3930af0ca64a654e2dddb8 100644 --- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C +++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.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 @@ -32,7 +32,7 @@ License template<class Type> Foam::Distribution<Type>::Distribution() : - List< List<scalar> >(pTraits<Type>::nComponents), + List<List<scalar>>(pTraits<Type>::nComponents), binWidth_(pTraits<Type>::one), listStarts_(pTraits<Type>::nComponents, 0) {} @@ -41,7 +41,7 @@ Foam::Distribution<Type>::Distribution() template<class Type> Foam::Distribution<Type>::Distribution(const Type& binWidth) : - List< List<scalar> >(pTraits<Type>::nComponents), + List<List<scalar>>(pTraits<Type>::nComponents), binWidth_(binWidth), listStarts_(pTraits<Type>::nComponents, 0) {} @@ -50,7 +50,7 @@ Foam::Distribution<Type>::Distribution(const Type& binWidth) template<class Type> 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()), listStarts_(d.listStarts()) {} @@ -227,11 +227,11 @@ Type Foam::Distribution<Type>::median() const { 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++) { - List< Pair<scalar> >& normDist = normDistribution[cmpt]; + List<Pair<scalar>>& normDist = normDistribution[cmpt]; if (normDist.size()) { @@ -331,10 +331,10 @@ void Foam::Distribution<Type>::add 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 { - 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++) { @@ -349,7 +349,7 @@ Distribution<Type>::normalised() const List<label> cmptKeys = keys(cmpt); - List< Pair<scalar> >& normDist = normDistribution[cmpt]; + List<Pair<scalar>>& normDist = normDistribution[cmpt]; Pair<label> limits = validLimits(cmpt); @@ -379,10 +379,10 @@ Distribution<Type>::normalised() const 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 { - 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++) { @@ -395,7 +395,7 @@ Distribution<Type>::raw() const List<label> cmptKeys = keys(cmpt); - List< Pair<scalar> >& rawDist = rawDistribution[cmpt]; + List<Pair<scalar>>& rawDist = rawDistribution[cmpt]; Pair<label> limits = validLimits(cmpt); @@ -421,20 +421,20 @@ Distribution<Type>::raw() const 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 { - List< List< Pair<scalar> > > normalisedDistribution = normalised(); + List<List<Pair<scalar>>> normalisedDistribution = normalised(); - List< List < Pair<scalar> > > cumulativeNormalisedDistribution = + List<List<Pair<scalar>>> cumulativeNormalisedDistribution = normalisedDistribution; for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++) { - const List< Pair<scalar> >& normalisedCmpt = + const List<Pair<scalar>>& normalisedCmpt = normalisedDistribution[cmpt]; - List< Pair<scalar> >& cumNormalisedCmpt = + List<Pair<scalar>>& cumNormalisedCmpt = cumulativeNormalisedDistribution[cmpt]; scalar sum = 0.0; @@ -457,18 +457,18 @@ Distribution<Type>::cumulativeNormalised() const 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 { - 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++) { - 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; @@ -503,15 +503,15 @@ void Foam::Distribution<Type>::clear() template<class Type> 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++) { - 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]); @@ -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++) { - 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 ( @@ -570,7 +570,7 @@ void Foam::Distribution<Type>::operator= << abort(FatalError); } - List< List<scalar> >::operator=(rhs); + List<List<scalar>>::operator=(rhs); binWidth_ = rhs.binWidth(); @@ -587,7 +587,7 @@ Foam::Istream& Foam::operator>> Distribution<Type>& d ) { - is >> static_cast<List< List<scalar> >&>(d) + is >> static_cast<List<List<scalar>>&>(d) >> d.binWidth_ >> d.listStarts_; @@ -605,7 +605,7 @@ Foam::Ostream& Foam::operator<< 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.listStarts_; @@ -628,7 +628,7 @@ Foam::Distribution<Type> Foam::operator+ // The coarsest binWidth is the sensible choice 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[1] = d2.raw(); @@ -639,7 +639,7 @@ Foam::Distribution<Type> Foam::operator+ { List<scalar>& cmptDistribution = d[cmpt]; - const List < Pair<scalar> >& cmptRaw = rawDists[rDI][cmpt]; + const List<Pair<scalar>>& cmptRaw = rawDists[rDI][cmpt]; forAll(cmptRaw, rI) { diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H index d84a1c763a9f3ca1185215fabc55ad4460e2ee11..0faff2764c28c8c92bfeccbc428de5a8e9dc4a5d 100644 --- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.H +++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.H @@ -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,7 +62,7 @@ Ostream& operator<<(Ostream&, const Distribution<Type>&); template<class Type> class Distribution : - public List< List<scalar> > + public List<List<scalar>> { // Private data @@ -125,18 +125,18 @@ public: //- Return the normalised distribution (probability density) // and bins - List< List<Pair<scalar> > > normalised() const; + List<List<Pair<scalar>> > normalised() const; //- 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 // 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 // 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. // Leaves the same number of them and the same binWidth. diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H index c6ed4d1569a4fcce4ff2d45b21c45957525a994e..80323a7b730e4ce224bdf88cbc9d8ebb8b755c3e 100644 --- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H +++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H @@ -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 @@ -300,7 +300,7 @@ template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv> inline Foam::Xfer<Foam::List<T> > Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::xfer() { - return xferMoveTo< List<T> >(*this); + return xferMoveTo<List<T>>(*this); } diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H index 0ebbcf6a4dc96d92734f26b2eaecb7d37c20c7c0..fa69e0a646e2bd7e8ff61834aa4d33d6de23df2d 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H @@ -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 @@ public: //- Hashing function class. // Use Hasher directly for contiguous data. Otherwise hash incrementally. - template< class HashT=Hash<T> > + template<class HashT=Hash<T> > class Hash { public: @@ -127,7 +127,7 @@ public: FixedList(Istream&); //- Clone - inline autoPtr< FixedList<T, Size> > clone() const; + inline autoPtr<FixedList<T, Size> > clone() const; // Member Functions diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H index 053a4e4e6d56555ef957904bc07e7304586b46e3..16f7f1b16d31c510b5bc012f64c6dced06d9146e 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H @@ -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 @@ -95,10 +95,10 @@ inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst) 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 { - return autoPtr< FixedList<T, Size> >(new FixedList<T, Size>(*this)); + return autoPtr<FixedList<T, Size> >(new FixedList<T, Size>(*this)); } diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H index ccec25c25e42e8ec812727e9d3310998370f488c..1766cbe028e6cc4e867d7600e15cbe47be1d2fe6 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H @@ -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 @@ -235,7 +235,7 @@ public: explicit inline PackedList(const UIndirectList<label>&); //- Clone - inline autoPtr< PackedList<nBits> > clone() const; + inline autoPtr<PackedList<nBits>> clone() const; // Member Functions diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H index 98a419186572d3502f090a6fb10f7c8c5bbbc869..ce8b19e59273d3a42fe9026b1694a99fbe6a0b3a 100644 --- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H +++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ inline const Foam::SubList<T>& Foam::SubList<T>::null() template<class T> inline Foam::SubList<T>::operator const Foam::List<T>&() const { - return *reinterpret_cast< const List<T>* >(this); + return *reinterpret_cast<const List<T>* >(this); } diff --git a/src/OpenFOAM/db/error/StaticAssert.H b/src/OpenFOAM/db/error/StaticAssert.H index bfebf929e345051003581d80c8979a649daf54e9..4e139b120adc6eeb97076c6d2b8fe65d827a1f5d 100644 --- a/src/OpenFOAM/db/error/StaticAssert.H +++ b/src/OpenFOAM/db/error/StaticAssert.H @@ -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 @@ -77,7 +77,7 @@ class StaticAssertionTest {}; #define StaticAssert(Test) \ typedef ::Foam::StaticAssertionTest \ < \ - sizeof( ::Foam::StaticAssertionFailed< ((Test) ? true : false) > ) \ + sizeof( ::Foam::StaticAssertionFailed<((Test) ? true : false)>) \ > StaticAssertMacro(StaticAssertionTest, __LINE__) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H index 2a02143f4a8e8e583ee39d8446acdd969c592cd1..062ff5e8536d906db3726c94c135141764201321 100644 --- a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H +++ b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H @@ -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 @@ -37,7 +37,7 @@ Description (baseType,thisType,argNames) \ \ /* Add the thisType constructor function to the table */ \ - baseType::add##argNames##ConstructorToTable< thisType > \ + baseType::add##argNames##ConstructorToTable<thisType> \ add##thisType##argNames##ConstructorTo##baseType##Table_ @@ -46,7 +46,7 @@ Description (baseType,thisType,argNames,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_ \ (#lookup) @@ -56,7 +56,7 @@ Description (baseType,thisType,argNames) \ \ /* Add the thisType constructor function to the table */ \ - baseType::addRemovable##argNames##ConstructorToTable< thisType > \ + baseType::addRemovable##argNames##ConstructorToTable<thisType> \ addRemovable##thisType##argNames##ConstructorTo##baseType##Table_ @@ -65,7 +65,7 @@ Description (baseType,thisType,argNames,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 \ ##baseType##Table_(#lookup) @@ -79,7 +79,7 @@ Description (baseType,thisType,Targ,argNames) \ \ /* 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_ @@ -89,7 +89,7 @@ Description (baseType,thisType,Targ,argNames,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 \ ##Table_(#lookup) @@ -103,7 +103,7 @@ Description (baseType,thisType,Targ,argNames) \ \ /* 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_ @@ -113,7 +113,7 @@ Description (baseType,thisType,Targ,argNames,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## \ Targ##Table_(#lookup) diff --git a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H index b49ab8ccb91997908781aa88254c8700c620c3d0..ad692a32768502dda855fdbe97b636c95dfd6751 100644 --- a/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H +++ b/src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,10 @@ Description (autoPtr,baseType,argNames,argList,parList) \ \ /* Construct from argList function pointer type */ \ - typedef autoPtr< baseType > (*argNames##ConstructorPtr)argList; \ + typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \ \ /* Construct from argList function table type */ \ - typedef HashTable< argNames##ConstructorPtr, word, string::hash > \ + typedef HashTable<argNames##ConstructorPtr, word, string::hash> \ argNames##ConstructorTable; \ \ /* Construct from argList function pointer table pointer */ \ @@ -66,14 +66,14 @@ Description static void destroy##argNames##ConstructorTables(); \ \ /* Class to add constructor from argList to table */ \ - template< class baseType##Type > \ + template<class baseType##Type> \ class add##argNames##ConstructorToTable \ { \ 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 \ @@ -99,7 +99,7 @@ Description \ /* Class to add constructor from argList to table */ \ /* Remove only the entry (not the table) upon destruction */ \ - template< class baseType##Type > \ + template<class baseType##Type> \ class addRemovable##argNames##ConstructorToTable \ { \ /* retain lookup name for later removal */ \ @@ -107,9 +107,9 @@ Description \ 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 \ @@ -141,10 +141,10 @@ Description (autoPtr,baseType,argNames,argList,parList) \ \ /* Construct from argList function pointer type */ \ - typedef autoPtr< baseType > (*argNames##ConstructorPtr)argList; \ + typedef autoPtr<baseType> (*argNames##ConstructorPtr)argList; \ \ /* Construct from argList function table type */ \ - typedef HashTable< argNames##ConstructorPtr, word, string::hash > \ + typedef HashTable<argNames##ConstructorPtr, word, string::hash> \ argNames##ConstructorTable; \ \ /* Construct from argList function pointer table pointer */ \ @@ -157,14 +157,14 @@ Description static void destroy##argNames##ConstructorTables(); \ \ /* Class to add constructor from argList to table */ \ - template< class baseType##Type > \ + template<class baseType##Type> \ class add##argNames##ConstructorToTable \ { \ 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 \ @@ -196,7 +196,7 @@ Description }; \ \ /* Class to add constructor from argList to table */ \ - template< class baseType##Type > \ + template<class baseType##Type> \ class addRemovable##argNames##ConstructorToTable \ { \ /* retain lookup name for later removal */ \ @@ -204,9 +204,9 @@ Description \ 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 \ @@ -325,14 +325,14 @@ Description (baseType,argNames,Targ) \ \ /* Table constructor called from the table add function */ \ - void baseType< Targ >::construct##argNames##ConstructorTables() \ + void baseType<Targ>::construct##argNames##ConstructorTables() \ { \ static bool constructed = false; \ if (!constructed) \ { \ constructed = true; \ - baseType< Targ >::argNames##ConstructorTablePtr_ \ - = new baseType< Targ >::argNames##ConstructorTable; \ + baseType<Targ>::argNames##ConstructorTablePtr_ \ + = new baseType<Targ>::argNames##ConstructorTable; \ } \ } @@ -344,12 +344,12 @@ Description (baseType,argNames,Targ) \ \ /* 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_; \ - baseType< Targ >::argNames##ConstructorTablePtr_ = NULL; \ + delete baseType<Targ>::argNames##ConstructorTablePtr_; \ + baseType<Targ>::argNames##ConstructorTablePtr_ = NULL; \ } \ } @@ -361,8 +361,8 @@ Description (baseType,argNames,Targ) \ \ /* Define the constructor function table */ \ - baseType< Targ >::argNames##ConstructorTable* \ - baseType< Targ >::argNames##ConstructorTablePtr_ = NULL + baseType<Targ>::argNames##ConstructorTable* \ + baseType<Targ>::argNames##ConstructorTablePtr_ = NULL // external use: diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H index f185163e3a886cabd711898c8062c9bd03d5e851..72c49353a7da1cf27115b7f0b8aeea3a7d2e158a 100644 --- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H +++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicFieldI.H @@ -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 @@ -311,7 +311,7 @@ template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv> inline Foam::Xfer<Foam::List<T> > Foam::DynamicField<T, SizeInc, SizeMult, SizeDiv>::xfer() { - return xferMoveTo< List<T> >(*this); + return xferMoveTo<List<T>>(*this); } diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H index d2d5aabe9c6301d54c463cf2a0c5c08c42f626e1..18d3c589c7c162c4f1546db688d1981155342f17 100644 --- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H +++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,7 +118,7 @@ inline void Foam::SubField<Type>::operator=(const SubField<Type>& rhs) template<class Type> inline Foam::SubField<Type>::operator const Foam::Field<Type>&() const { - return *reinterpret_cast< const Field<Type>* >(this); + return *reinterpret_cast<const Field<Type>* >(this); } diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H index 0ac15a7cab0e1589bf60c60a885e7f1833c8ebef..a2353fdd2280fdff5e23f02f4967b2ad1537706f 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H @@ -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 @@ -37,7 +37,7 @@ SourceFiles // Only used internally #define makeTypeTableReadersTypeName(typeTableReader, dataType) \ \ - defineNamedTemplateTypeNameAndDebug(typeTableReader< dataType >, 0) + defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0) // Sometimes used externally #define makeTableReadersTypeName(typeTableReader) \ @@ -51,7 +51,7 @@ SourceFiles // Define type info for single dataType template instantiation (eg, vector) #define makeTableReaderType(typeTableReader, dataType) \ \ - defineNamedTemplateTypeNameAndDebug(typeTableReader< dataType >, 0); \ + defineNamedTemplateTypeNameAndDebug(typeTableReader<dataType>, 0); \ addTemplatedToRunTimeSelectionTable \ ( \ tableReader, typeTableReader, dataType, dictionary \ diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H index eaafd563f3bd3d1074e769c5f649e973a4e0eba9..21e839cf3cc44431fc3113fabb3cc413db155a74 100644 --- a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H +++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H @@ -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 @@ -50,7 +50,7 @@ inline Foam::labelRange::labelRange(const label start, const label size) inline Foam::labelRange::const_iterator::const_iterator() : - range_(*reinterpret_cast< Foam::labelRange* >(0)), + range_(*reinterpret_cast<Foam::labelRange* >(0)), index_(-1) {} diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H index 2c6f75aeccc155cbc9740d63cc28d6439eab9796..739d582e9fe39073e963b4aae45a977136b1b73a 100644 --- a/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H +++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H @@ -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 @@ -42,7 +42,7 @@ inline Foam::labelRanges::labelRanges(const label nElem) inline Foam::labelRanges::const_iterator::const_iterator() : - list_(*reinterpret_cast< Foam::labelRanges* >(0)), + list_(*reinterpret_cast<Foam::labelRanges* >(0)), index_(-1), subIndex_(-1) {} diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.C b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C index de0e43052a0f778617c37e0b59d9cfeb5832596c..4a7cde89edaa8eb0ca4926f1a94e1eacb27a8a71 100644 --- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.C +++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C @@ -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 @@ -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) { diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H index a4cda161637ac2c88196a917837bf2cea0d63378..700f794908a663b21619c49922a151a5a372ccff 100644 --- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H +++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H @@ -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 @@ -83,7 +83,7 @@ public: hashedWordList(const UList<word>& names); //- 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 hashedWordList(const label nNames, const char** names); diff --git a/src/fileFormats/sampledSetWriters/writer.C b/src/fileFormats/sampledSetWriters/writer.C index 6ccf51c743871e6b280b889ace654b7070e444fd..a6abbed258d0caa30bdae4e26f418ab2e8421b28 100644 --- a/src/fileFormats/sampledSetWriters/writer.C +++ b/src/fileFormats/sampledSetWriters/writer.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 @@ -31,7 +31,7 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // template<class Type> -Foam::autoPtr< Foam::writer<Type> > Foam::writer<Type>::New +Foam::autoPtr<Foam::writer<Type>> Foam::writer<Type>::New ( const word& writeType ) diff --git a/src/fileFormats/sampledSetWriters/writers.H b/src/fileFormats/sampledSetWriters/writers.H index 601e7bcd16108f6be6d2e74d9fb524dee6ea62b2..95665cbb649b688a00c996cc351c4308c9318b84 100644 --- a/src/fileFormats/sampledSetWriters/writers.H +++ b/src/fileFormats/sampledSetWriters/writers.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ SourceFiles // Only used internally #define makeTypeSetWritersTypeName(typeWriter, dataType) \ \ - defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0) + defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0) // Sometimes used externally #define makeSetWritersTypeName(typeWriter) \ @@ -55,7 +55,7 @@ SourceFiles // Define type info for single dataType template instantiation (eg, vector) #define makeSetWriterType(typeWriter, dataType) \ \ - defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0); \ + defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0); \ addTemplatedToRunTimeSelectionTable \ ( \ writer, typeWriter, dataType, word \ diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 882517721888accc78479d358c6a88a0b1c6b8dc..8f5a2d37890e0b2fd214c0da69cf5d3318ca0f19 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.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 @@ -2178,7 +2178,7 @@ Foam::tmp<Foam::fvMatrix<Type> > Foam::operator* template<class Type> Foam::tmp<Foam::fvMatrix<Type> > Foam::operator* ( - const tmp< DimensionedField<scalar, volMesh> >& tdsf, + const tmp<DimensionedField<scalar, volMesh> >& tdsf, const fvMatrix<Type>& A ) { diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C index f04b7363a45f1292179d42c0b4f144fc98b9d355..a65a18ac105fd241d30fb2b01c48789c95d0a166 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.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 @@ -52,7 +52,7 @@ void Foam::bufferedAccumulator<Type>::accumulateAndResetBuffer(const label b) template<class Type> Foam::bufferedAccumulator<Type>::bufferedAccumulator() : - List< Field<Type> >(), + List<Field<Type>>(), averagesTaken_(), bufferOffsets_() {} @@ -66,7 +66,7 @@ Foam::bufferedAccumulator<Type>::bufferedAccumulator const label bufferingInterval ) : - List< Field<Type> >(), + List<Field<Type>>(), averagesTaken_(), bufferOffsets_() { @@ -85,7 +85,7 @@ Foam::bufferedAccumulator<Type>::bufferedAccumulator 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()), bufferOffsets_(bA.bufferOffsets()) {} @@ -217,7 +217,7 @@ void Foam::bufferedAccumulator<Type>::operator= << abort(FatalError); } - List< Field<Type> >::operator=(rhs); + List<Field<Type>>::operator=(rhs); averagesTaken_ = rhs.averagesTaken(); diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H index 8d462902f48ce69cf294d90391b37e1407f4e720..a96d90b192a790aff2850afa366016b687f25774 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H @@ -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 @@ -60,7 +60,7 @@ Ostream& operator<< template<class Type> class bufferedAccumulator : - public List< Field<Type> > + public List<Field<Type>> { // Private data diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C index 247fe3d37db15d852699271ebbbb9175ca4d977a..88d8888a49a4a8a6ac72e0e7886626ee7bd2ca3e 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C @@ -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 @@ -34,7 +34,7 @@ Foam::operator<<(Ostream& os, const bufferedAccumulator<Type>& bA) { os << bA.averagesTaken_ - << static_cast<const List< Field<Type> >&>(bA) + << static_cast<const List<Field<Type>>&>(bA) << bA.bufferOffsets(); // Check state of Ostream diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C index 54ac66d1fa1959d148704af68b57849086eb7988..b3aedbeb1834cb63629416443b444a97109b0f2c 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.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 @@ -62,7 +62,7 @@ void Foam::correlationFunction<Type>::setTimesAndSizes ); tZeroBuffers_ = - Field< Field<Type> > + Field<Field<Type>> ( nBuffers, Field<Type> diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H index 0c02e412df859d307e452e02b8ee85cda17e93d2..6fcf25d8ed3412091211afc1e618480ab110dcc4 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H @@ -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 @@ -67,7 +67,7 @@ class correlationFunction const polyMesh& mesh_; - Field< Field<Type> > tZeroBuffers_; + Field<Field<Type>> tZeroBuffers_; scalar duration_; scalar sampleInterval_; @@ -137,7 +137,7 @@ public: // Access - inline const Field< Field<Type> >& tZeroBuffers() const; + inline const Field<Field<Type>>& tZeroBuffers() const; inline scalar duration() const; diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H index c3296a928ac06a6daab2f6bdd89ee2c30425917a..0be64171853bf0de56a24500b472dc08cab3ebbe 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H @@ -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 @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ template<class Type> -inline const Foam::Field< Foam::Field<Type> >& +inline const Foam::Field<Foam::Field<Type>>& Foam::correlationFunction<Type>::tZeroBuffers() const { return tZeroBuffers_; diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C index bc02f151a1fcabe5a092c36f40421e306fd3eff1..e3f9bea103237ca3cdb227a3373e0a5166253abf 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.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 @@ -68,7 +68,7 @@ Foam::distribution::distribution(const scalar binWidth) Foam::distribution::distribution(const distribution& d) : - Map<label>(static_cast< Map<label> >(d)), + Map<label>(static_cast<Map<label>>(d)), binWidth_(d.binWidth()) {} diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H index 6d6617d652084e773ca496e7bdcafa61e9cdaec5..b730adb56eaa781b2c1e6d9a901916a97f63d78d 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H @@ -1,24 +1,24 @@ // Fields for data gathering -List< scalarField > allSpeciesN_RU +List<scalarField> allSpeciesN_RU ( molecules.potential().nIds(), scalarField (mesh.nCells(), 0.0) ); -List< scalarField > allSpeciesM_RU +List<scalarField> allSpeciesM_RU ( molecules.potential().nIds(), scalarField (mesh.nCells(), 0.0) ); -List< vectorField > allSpeciesVelocitySum_RU +List<vectorField> allSpeciesVelocitySum_RU ( molecules.potential().nIds(), vectorField (mesh.nCells(), vector::zero) ); -List< scalarField > allSpeciesVelocityMagSquaredSum_RU +List<scalarField> allSpeciesVelocityMagSquaredSum_RU ( molecules.potential().nIds(), scalarField (mesh.nCells(), 0.0) diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H index af0197b5fe4dc0fc2e75858e9f49ba86f3b0a273..4bd50ebafc5c087bf12fb3021fef4a1efa58f48f 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H @@ -1,24 +1,24 @@ if (runTime.outputTime()) { - allSpeciesN_RU = List< scalarField > + allSpeciesN_RU = List<scalarField> ( molecules.potential().nIds(), scalarField(mesh.nCells(), 0.0) ); - allSpeciesM_RU = List< scalarField > + allSpeciesM_RU = List<scalarField> ( molecules.potential().nIds(), scalarField(mesh.nCells(), 0.0) ); - allSpeciesVelocitySum_RU = List< vectorField > + allSpeciesVelocitySum_RU = List<vectorField> ( molecules.potential().nIds(), vectorField(mesh.nCells(), vector::zero) ); - allSpeciesVelocityMagSquaredSum_RU = List< scalarField > + allSpeciesVelocityMagSquaredSum_RU = List<scalarField> ( molecules.potential().nIds(), scalarField(mesh.nCells(), 0.0) diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C index 0775247d7e8e8b79a3b4370f5fbb79d123616440..535a298015295f1a639df988c5ea4e3b16e1fb87 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.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 @@ -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 { 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 { List<Pair<scalar> > energyTab(energyLookup_.size()); diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C index b9483f579614c909a7e624af302630963e2e28c0..c1022a64344d5a12ddf372a981bc2246f315a88d 100644 --- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C +++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C @@ -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 @@ -31,9 +31,9 @@ bool Foam::pairPotential::writeEnergyAndForceTables(Ostream& os) const Info<< "Writing energy and force tables to file for potential " << 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) { diff --git a/src/mesh/blockMesh/block/blockCreate.C b/src/mesh/blockMesh/block/blockCreate.C index 85c6c583b9eefdbbe3a92f625a2df1530d7197a1..b3ce7d3a31623552b2b29066cecb98392bd3c73d 100644 --- a/src/mesh/blockMesh/block/blockCreate.C +++ b/src/mesh/blockMesh/block/blockCreate.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 @@ -47,7 +47,7 @@ void Foam::block::createPoints() const // List of edge point and weighting factors - const List< List<point> >& p = blockEdgePoints(); + const List<List<point>>& p = blockEdgePoints(); const scalarListList& w = blockEdgeWeights(); // diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C index 1357a9e5668e712ed8703d3c5cd940b00d863342..1bdb4a82d7ddc8af0b99449d6fb1be7a277550bc 100644 --- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C +++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.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 @@ -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 { return edgePoints_; diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H index df3bfa8a390b9acdf5788b2a2e6105311c09f167..a1e6e60798524d0e29731c9cb618d1e501353584 100644 --- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H +++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H @@ -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 @@ -76,7 +76,7 @@ class blockDescriptor Vector<label> meshDensity_; //- Block edge points - List< List<point> > edgePoints_; + List<List<point>> edgePoints_; //- Block edge weighting factors scalarListList edgeWeights_; @@ -155,7 +155,7 @@ public: const cellShape& blockShape() const; //- 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 const scalarListList& blockEdgeWeights() const; diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C index 70f548ad006b903958e5ac626bc77d2e8937db35..0c294d0c32f61c0cb193f3fc1b1c0f619f94f987 100644 --- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C +++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.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 @@ -334,7 +334,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing } // Shrink it - forAllIter(Map< DynamicList<label> >, facePointEdges, iter) + forAllIter(Map<DynamicList<label>>, facePointEdges, iter) { iter().shrink(); @@ -361,7 +361,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing } 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 " << iter() << endl; diff --git a/src/sampling/meshToMesh0/meshToMesh0Templates.C b/src/sampling/meshToMesh0/meshToMesh0Templates.C index 9595399bd20092f2ad544dfd097a28762ed948da..c535ee07a28cdf253f0db4268863b0f65da81990 100644 --- a/src/sampling/meshToMesh0/meshToMesh0Templates.C +++ b/src/sampling/meshToMesh0/meshToMesh0Templates.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 @@ -365,7 +365,7 @@ void Foam::meshToMesh0::interpolate 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 ( const GeometricField<Type, fvPatchField, volMesh>& fromVf, @@ -437,7 +437,7 @@ Foam::meshToMesh0::interpolate 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 ( const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf, diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H index 430039a2cea485fff5457d294c5fd447a8ecee7c..7efa29fcca1a8f55e64d50d33f6c3bcfbd7950b4 100644 --- a/src/sampling/sampledSet/sampledSets/sampledSets.H +++ b/src/sampling/sampledSet/sampledSets/sampledSets.H @@ -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 @@ -72,7 +72,7 @@ class sampledSets public: //- The set formatter - autoPtr< writer<Type> > formatter; + autoPtr<writer<Type>> formatter; //- Construct null fieldGroup() diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C index d20c3fc77936e9f9397bfa5b7420b430bfab32b0..02f92594d783a95e40a3bbf9fc179c0b64062d6c 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C +++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.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 @@ -30,7 +30,7 @@ License template<class Face> -Foam::autoPtr< Foam::MeshedSurface<Face> > +Foam::autoPtr<Foam::MeshedSurface<Face>> Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext) { if (debug) @@ -50,7 +50,7 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext) if (supported.found(ext)) { // create indirectly - autoPtr< MeshedSurface<Face> > surf(new MeshedSurface<Face>); + autoPtr<MeshedSurface<Face>> surf(new MeshedSurface<Face>); surf().transfer(FriendType::New(name, ext)()); return surf; @@ -66,12 +66,12 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext) << exit(FatalError); } - return autoPtr< MeshedSurface<Face> >(cstrIter()(name)); + return autoPtr<MeshedSurface<Face>>(cstrIter()(name)); } template<class Face> -Foam::autoPtr< Foam::MeshedSurface<Face> > +Foam::autoPtr<Foam::MeshedSurface<Face>> Foam::MeshedSurface<Face>::New(const fileName& name) { word ext = name.ext(); diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C index 9a2e01992db10d114383d9fcfd8df985ad586ada..c1974960f74566f355dca7d9d4be2a067c20c33c 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.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 @@ -28,7 +28,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<class Face> -Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> > +Foam::autoPtr<Foam::UnsortedMeshedSurface<Face>> Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext) { if (debug) @@ -72,7 +72,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext) template<class Face> -Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> > +Foam::autoPtr<Foam::UnsortedMeshedSurface<Face>> Foam::UnsortedMeshedSurface<Face>::New(const fileName& name) { word ext = name.ext(); diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C index 418bcd9ce7dcd0745b5261744c9007f594200dc2..bc5b582cdc4cad7d237b71f5647ccf5e104deb83 100644 --- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.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 @@ -63,7 +63,7 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read is >> this->storedPoints(); // triFaces read with attached keys - List< Keyed<triFace> > facesRead(is); + List<Keyed<triFace>> facesRead(is); List<Face> faceLst(facesRead.size()); List<label> zoneIds(facesRead.size());