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 removing spaces between closing ">"s

Browse Source
This commit is contained in:
Henry Weller
2016-01-10 22:41:16 +00:00
parent 4eba393fe1
commit 56fa7c0906
1426 changed files with 8375 additions and 8375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sampling/cuttingPlane/cuttingPlane.H
View File

@ -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
@ -169,10 +169,10 @@ public:
//- Sample the cell field
template<class Type>
tmp<Field<Type> > sample(const Field<Type>&) const;
tmp<Field<Type>> sample(const Field<Type>&) const;
template<class Type>
tmp<Field<Type> > sample(const tmp<Field<Type> >&) const;
tmp<Field<Type>> sample(const tmp<Field<Type>>&) const;
// Member Operators

12
src/sampling/cuttingPlane/cuttingPlaneTemplates.C
View File

@ -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
@ -33,22 +33,22 @@ Description
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::cuttingPlane::sample
Foam::tmp<Foam::Field<Type>> Foam::cuttingPlane::sample
(
const Field<Type>& fld
) const
{
return tmp<Field<Type> >(new Field<Type>(fld, cutCells()));
return tmp<Field<Type>>(new Field<Type>(fld, cutCells()));
}
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::cuttingPlane::sample
Foam::tmp<Foam::Field<Type>> Foam::cuttingPlane::sample
(
const tmp<Field<Type> >& tfld
const tmp<Field<Type>>& tfld
) const
{
tmp<Field<Type> > tsf = sample(tfld());
tmp<Field<Type>> tsf = sample(tfld());
tfld.clear();
return tsf;
}

10
src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -106,11 +106,11 @@ void Foam::cellVolumeWeightMethod::calculateAddressing
label srcCellI = srcSeedI;
label tgtCellI = tgtSeedI;
List<DynamicList<label> > srcToTgtAddr(src_.nCells());
List<DynamicList<scalar> > srcToTgtWght(src_.nCells());
List<DynamicList<label>> srcToTgtAddr(src_.nCells());
List<DynamicList<scalar>> srcToTgtWght(src_.nCells());
List<DynamicList<label> > tgtToSrcAddr(tgt_.nCells());
List<DynamicList<scalar> > tgtToSrcWght(tgt_.nCells());
List<DynamicList<label>> tgtToSrcAddr(tgt_.nCells());
List<DynamicList<scalar>> tgtToSrcWght(tgt_.nCells());
// list of tgt cell neighbour cells
DynamicList<label> nbrTgtCells(10);

6
src/sampling/meshToMesh/calcMethod/direct/directMethod.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -116,8 +116,8 @@ void Foam::directMethod::calculateAddressing
// store a list of src cells already mapped
labelList srcTgtSeed(src_.nCells(), -1);
List<DynamicList<label> > srcToTgt(src_.nCells());
List<DynamicList<label> > tgtToSrc(tgt_.nCells());
List<DynamicList<label>> srcToTgt(src_.nCells());
List<DynamicList<label>> tgtToSrc(tgt_.nCells());
DynamicList<label> srcSeeds(10);

8
src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -102,8 +102,8 @@ void Foam::mapNearestMethod::calculateAddressing
label& startSeedI
)
{
List<DynamicList<label> > srcToTgt(src_.nCells());
List<DynamicList<label> > tgtToSrc(tgt_.nCells());
List<DynamicList<label>> srcToTgt(src_.nCells());
List<DynamicList<label>> tgtToSrc(tgt_.nCells());
const scalarField& srcVc = src_.cellVolumes();
const scalarField& tgtVc = tgt_.cellVolumes();
@ -284,7 +284,7 @@ void Foam::mapNearestMethod::setNextNearestCells
Foam::label Foam::mapNearestMethod::findMappedSrcCell
(
const label tgtCellI,
const List<DynamicList<label> >& tgtToSrc
const List<DynamicList<label>>& tgtToSrc
) const
{
DynamicList<label> testCells(10);

4
src/sampling/meshToMesh/calcMethod/mapNearest/mapNearestMethod.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,7 +108,7 @@ protected:
virtual label findMappedSrcCell
(
const label tgtCellI,
const List<DynamicList<label> >& tgtToSrc
const List<DynamicList<label>>& tgtToSrc
) const;
//- Disallow default bitwise copy construct

4
src/sampling/meshToMesh/meshToMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -306,7 +306,7 @@ void Foam::meshToMesh::calculate(const word& methodName)
);
// cache maps and reset addresses
List<Map<label> > cMap;
List<Map<label>> cMap;
srcMapPtr_.reset
(
new mapDistribute(globalSrcCells, tgtToSrcCellAddr_, cMap)

50
src/sampling/meshToMesh/meshToMesh.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -341,7 +341,7 @@ public:
//- Return the src field mapped to the tgt mesh with a defined
// operation. Initial values of the result are set to zero
template<class Type, class CombineOp>
tmp<Field<Type> > mapSrcToTgt
tmp<Field<Type>> mapSrcToTgt
(
const Field<Type>& srcFld,
const CombineOp& cop
@ -350,16 +350,16 @@ public:
//- Convenience function to map a tmp field to the tgt mesh
// with a defined operation
template<class Type, class CombineOp>
tmp<Field<Type> > mapSrcToTgt
tmp<Field<Type>> mapSrcToTgt
(
const tmp<Field<Type> >& tsrcFld,
const tmp<Field<Type>>& tsrcFld,
const CombineOp& cop
) const;
//- Convenience function to map a field to the tgt mesh with a
// default operation (plusEqOp)
template<class Type>
tmp<Field<Type> > mapSrcToTgt
tmp<Field<Type>> mapSrcToTgt
(
const Field<Type>& srcFld
) const;
@ -367,9 +367,9 @@ public:
//- Convenience function to map a tmp field to the tgt mesh
// with a default operation (plusEqOp)
template<class Type>
tmp<Field<Type> > mapSrcToTgt
tmp<Field<Type>> mapSrcToTgt
(
const tmp<Field<Type> >& tsrcFld
const tmp<Field<Type>>& tsrcFld
) const;
@ -389,7 +389,7 @@ public:
//- Return the tgt field mapped to the src mesh with a defined
// operation. Initial values of the result are set to zero
template<class Type, class CombineOp>
tmp<Field<Type> > mapTgtToSrc
tmp<Field<Type>> mapTgtToSrc
(
const Field<Type>& tgtFld,
const CombineOp& cop
@ -398,16 +398,16 @@ public:
//- Convenience function to map a tmp field to the src mesh
// with a defined operation
template<class Type, class CombineOp>
tmp<Field<Type> > mapTgtToSrc
tmp<Field<Type>> mapTgtToSrc
(
const tmp<Field<Type> >& ttgtFld,
const tmp<Field<Type>>& ttgtFld,
const CombineOp& cop
) const;
//- Convenience function to map a field to the src mesh with a
// default operation (plusEqOp)
template<class Type>
tmp<Field<Type> > mapTgtToSrc
tmp<Field<Type>> mapTgtToSrc
(
const Field<Type>& tgtFld
) const;
@ -415,9 +415,9 @@ public:
//- Convenience function to map a tmp field to the src mesh
// with a default operation (plusEqOp)
template<class Type>
tmp<Field<Type> > mapTgtToSrc
tmp<Field<Type>> mapTgtToSrc
(
const tmp<Field<Type> >& ttgtFld
const tmp<Field<Type>>& ttgtFld
) const;
@ -437,7 +437,7 @@ public:
//- Interpolate a field with a defined operation. The initial
// values of the result are set to zero
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const CombineOp& cop
@ -446,9 +446,9 @@ public:
//- Interpolate a tmp field with a defined operation. The
// initial values of the result are set to zero
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >&
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
tfield,
const CombineOp& cop
) const;
@ -456,7 +456,7 @@ public:
//- Convenience function to map a field with a default
// operation (plusEqOp)
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
(
const GeometricField<Type, fvPatchField, volMesh>& field
) const;
@ -464,9 +464,9 @@ public:
//- Convenience function to map a tmp field with a default
// operation (plusEqOp)
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapSrcToTgt
tmp<GeometricField<Type, fvPatchField, volMesh>> mapSrcToTgt
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >&
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
tfield
) const;
@ -487,7 +487,7 @@ public:
//- Interpolate a field with a defined operation. The initial
// values of the result are set to zero
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const CombineOp& cop
@ -496,9 +496,9 @@ public:
//- Interpolate a tmp field with a defined operation. The
// initial values of the result are set to zero
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >&
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
tfield,
const CombineOp& cop
) const;
@ -506,7 +506,7 @@ public:
//- Convenience function to map a field with a default
// operation (plusEqOp)
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
(
const GeometricField<Type, fvPatchField, volMesh>& field
) const;
@ -514,9 +514,9 @@ public:
//- Convenience function to map a tmp field with a default
// operation (plusEqOp)
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > mapTgtToSrc
tmp<GeometricField<Type, fvPatchField, volMesh>> mapTgtToSrc
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >&
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
tfield
) const;
};

6
src/sampling/meshToMesh/meshToMeshParallelOps.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -156,7 +156,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
{
// per processor indices into all segments to send
List<DynamicList<label> > dynSendMap(Pstream::nProcs());
List<DynamicList<label>> dynSendMap(Pstream::nProcs());
label iniSize = floor(tgt.nCells()/Pstream::nProcs());
forAll(dynSendMap, procI)
@ -579,7 +579,7 @@ void Foam::meshToMesh::distributeAndMergeCells
// Count any coupled faces
typedef FixedList<label, 3> label3;
typedef HashTable<label, label3, label3::Hash<> > procCoupleInfo;
typedef HashTable<label, label3, label3::Hash<>> procCoupleInfo;
procCoupleInfo procFaceToGlobalCell;
forAll(allNbrProcIDs, procI)

62
src/sampling/meshToMesh/meshToMeshTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -146,13 +146,13 @@ void Foam::meshToMesh::mapSrcToTgt
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
(
const Field<Type>& srcField,
const CombineOp& cop
) const
{
tmp<Field<Type> > tresult
tmp<Field<Type>> tresult
(
new Field<Type>
(
@ -168,9 +168,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
(
const tmp<Field<Type> >& tsrcField,
const tmp<Field<Type>>& tsrcField,
const CombineOp& cop
) const
{
@ -179,7 +179,7 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
(
const Field<Type>& srcField
) const
@ -189,9 +189,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapSrcToTgt
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapSrcToTgt
(
const tmp<Field<Type> >& tsrcField
const tmp<Field<Type>>& tsrcField
) const
{
return mapSrcToTgt(tsrcField());
@ -265,13 +265,13 @@ void Foam::meshToMesh::mapTgtToSrc
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
(
const Field<Type>& tgtField,
const CombineOp& cop
) const
{
tmp<Field<Type> > tresult
tmp<Field<Type>> tresult
(
new Field<Type>
(
@ -287,9 +287,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
template<class Type, class CombineOp>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
(
const tmp<Field<Type> >& ttgtField,
const tmp<Field<Type>>& ttgtField,
const CombineOp& cop
) const
{
@ -298,7 +298,7 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
(
const Field<Type>& tgtField
) const
@ -308,9 +308,9 @@ Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::meshToMesh::mapTgtToSrc
Foam::tmp<Foam::Field<Type>> Foam::meshToMesh::mapTgtToSrc
(
const tmp<Field<Type> >& ttgtField
const tmp<Field<Type>>& ttgtField
) const
{
return mapTgtToSrc(ttgtField(), plusEqOp<Type>());
@ -342,7 +342,7 @@ void Foam::meshToMesh::mapSrcToTgt
if (AMIList[i].singlePatchProc() != -1)
{
// Clone and map (since rmap does not do general mapping)
tmp<fvPatchField<Type> > tnewTgt
tmp<fvPatchField<Type>> tnewTgt
(
fvPatchField<Type>::New
(
@ -383,7 +383,7 @@ void Foam::meshToMesh::mapSrcToTgt
template<class Type, class CombineOp>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapSrcToTgt
(
const GeometricField<Type, fvPatchField, volMesh>& field,
@ -398,7 +398,7 @@ Foam::meshToMesh::mapSrcToTgt
const typename fieldType::GeometricBoundaryField& srcBfld =
field.boundaryField();
PtrList<fvPatchField<Type> > tgtPatchFields(tgtBm.size());
PtrList<fvPatchField<Type>> tgtPatchFields(tgtBm.size());
// constuct tgt boundary patch types as copy of 'field' boundary types
// note: this will provide place holders for fields with additional
@ -473,10 +473,10 @@ Foam::meshToMesh::mapSrcToTgt
template<class Type, class CombineOp>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapSrcToTgt
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield,
const CombineOp& cop
) const
{
@ -485,7 +485,7 @@ Foam::meshToMesh::mapSrcToTgt
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapSrcToTgt
(
const GeometricField<Type, fvPatchField, volMesh>& field
@ -496,10 +496,10 @@ Foam::meshToMesh::mapSrcToTgt
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapSrcToTgt
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield
) const
{
return mapSrcToTgt(tfield(), plusEqOp<Type>());
@ -531,7 +531,7 @@ void Foam::meshToMesh::mapTgtToSrc
if (AMIList[i].singlePatchProc() != -1)
{
// Clone and map (since rmap does not do general mapping)
tmp<fvPatchField<Type> > tnewSrc
tmp<fvPatchField<Type>> tnewSrc
(
fvPatchField<Type>::New
(
@ -572,7 +572,7 @@ void Foam::meshToMesh::mapTgtToSrc
template<class Type, class CombineOp>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapTgtToSrc
(
const GeometricField<Type, fvPatchField, volMesh>& field,
@ -587,7 +587,7 @@ Foam::meshToMesh::mapTgtToSrc
const typename fieldType::GeometricBoundaryField& tgtBfld =
field.boundaryField();
PtrList<fvPatchField<Type> > srcPatchFields(srcBm.size());
PtrList<fvPatchField<Type>> srcPatchFields(srcBm.size());
// constuct src boundary patch types as copy of 'field' boundary types
// note: this will provide place holders for fields with additional
@ -662,10 +662,10 @@ Foam::meshToMesh::mapTgtToSrc
template<class Type, class CombineOp>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapTgtToSrc
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield,
const CombineOp& cop
) const
{
@ -674,7 +674,7 @@ Foam::meshToMesh::mapTgtToSrc
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapTgtToSrc
(
const GeometricField<Type, fvPatchField, volMesh>& field
@ -685,10 +685,10 @@ Foam::meshToMesh::mapTgtToSrc
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh::mapTgtToSrc
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfield
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfield
) const
{
return mapTgtToSrc(tfield(), plusEqOp<Type>());

12
src/sampling/meshToMesh0/meshToMesh0.H
View File

@ -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 @@ public:
void interpolateInternalField
(
Field<Type>&,
const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
order=INTERPOLATE,
const CombineOp& cop = eqOp<Type>()
) const;
@ -331,7 +331,7 @@ public:
void interpolate
(
GeometricField<Type, fvPatchField, volMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
order=INTERPOLATE,
const CombineOp& cop = eqOp<Type>()
) const;
@ -339,7 +339,7 @@ public:
//- Interpolate volume field
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > interpolate
tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
(
const GeometricField<Type, fvPatchField, volMesh>&,
order=INTERPOLATE,
@ -347,9 +347,9 @@ public:
) const;
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh> > interpolate
tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
order=INTERPOLATE,
const CombineOp& cop = eqOp<Type>()
) const;

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

@ -232,7 +232,7 @@ template<class Type, class CombineOp>
void Foam::meshToMesh0::interpolateInternalField
(
Field<Type>& toF,
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
meshToMesh0::order ord,
const CombineOp& cop
) const
@ -310,9 +310,9 @@ void Foam::meshToMesh0::interpolate
<< exit(FatalError);
}
if (isA<mixedFvPatchField<Type> >(toVf.boundaryField()[patchi]))
if (isA<mixedFvPatchField<Type>>(toVf.boundaryField()[patchi]))
{
refCast<mixedFvPatchField<Type> >
refCast<mixedFvPatchField<Type>>
(
toVf.boundaryField()[patchi]
).refValue() = toVf.boundaryField()[patchi];
@ -354,7 +354,7 @@ template<class Type, class CombineOp>
void Foam::meshToMesh0::interpolate
(
GeometricField<Type, fvPatchField, volMesh>& toVf,
const tmp<GeometricField<Type, fvPatchField, volMesh> >& tfromVf,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
meshToMesh0::order ord,
const CombineOp& cop
) const
@ -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,
@ -388,7 +388,7 @@ Foam::meshToMesh0::interpolate
}
// Create and map the patch field values
PtrList<fvPatchField<Type> > patchFields
PtrList<fvPatchField<Type>> patchFields
(
boundaryAddressing_.size()
);
@ -413,7 +413,7 @@ Foam::meshToMesh0::interpolate
// Create the complete field from the pieces
tmp<GeometricField<Type, fvPatchField, volMesh> > ttoF
tmp<GeometricField<Type, fvPatchField, volMesh>> ttoF
(
new GeometricField<Type, fvPatchField, volMesh>
(
@ -437,15 +437,15 @@ 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,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
meshToMesh0::order ord,
const CombineOp& cop
) const
{
tmp<GeometricField<Type, fvPatchField, volMesh> > tint =
tmp<GeometricField<Type, fvPatchField, volMesh>> tint =
interpolate(tfromVf(), ord, cop);
tfromVf.clear();

8
src/sampling/probes/patchProbes.H
View File

@ -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
@ -94,7 +94,7 @@ class patchProbes
//- Sample a volume field at all locations
template<class Type>
tmp<Field<Type> > sample
tmp<Field<Type>> sample
(
const GeometricField<Type, fvPatchField, volMesh>&
) const;
@ -102,7 +102,7 @@ class patchProbes
//- Sample a surface field at all locations
template<class Type>
tmp<Field<Type> > sample
tmp<Field<Type>> sample
(
const GeometricField<Type, fvsPatchField, surfaceMesh>&
) const;
@ -110,7 +110,7 @@ class patchProbes
//- Sample a single field on all sample locations
template<class Type>
tmp<Field<Type> > sample(const word& fieldName) const;
tmp<Field<Type>> sample(const word& fieldName) const;
//- Disallow default bitwise copy construct

18
src/sampling/probes/patchProbesTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -123,7 +123,7 @@ void Foam::patchProbes::sampleAndWrite
sampleAndWrite
(
mesh_.lookupObject
<GeometricField<Type, fvPatchField, volMesh> >
<GeometricField<Type, fvPatchField, volMesh>>
(
fields[fieldI]
)
@ -175,7 +175,7 @@ void Foam::patchProbes::sampleAndWriteSurfaceFields
sampleAndWrite
(
mesh_.lookupObject
<GeometricField<Type, fvsPatchField, surfaceMesh> >
<GeometricField<Type, fvsPatchField, surfaceMesh>>
(
fields[fieldI]
)
@ -189,7 +189,7 @@ void Foam::patchProbes::sampleAndWriteSurfaceFields
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::patchProbes::sample
(
const GeometricField<Type, fvPatchField, volMesh>& vField
@ -197,7 +197,7 @@ Foam::patchProbes::sample
{
const Type unsetVal(-VGREAT*pTraits<Type>::one);
tmp<Field<Type> > tValues
tmp<Field<Type>> tValues
(
new Field<Type>(this->size(), unsetVal)
);
@ -226,12 +226,12 @@ Foam::patchProbes::sample
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::patchProbes::sample(const word& fieldName) const
{
return sample
(
mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh> >
mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh>>
(
fieldName
)
@ -240,7 +240,7 @@ Foam::patchProbes::sample(const word& fieldName) const
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::patchProbes::sample
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
@ -248,7 +248,7 @@ Foam::patchProbes::sample
{
const Type unsetVal(-VGREAT*pTraits<Type>::one);
tmp<Field<Type> > tValues
tmp<Field<Type>> tValues
(
new Field<Type>(this->size(), unsetVal)
);

10
src/sampling/probes/probes.H
View File

@ -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
@ -274,22 +274,22 @@ public:
//- Sample a volume field at all locations
template<class Type>
tmp<Field<Type> > sample
tmp<Field<Type>> sample
(
const GeometricField<Type, fvPatchField, volMesh>&
) const;
//- Sample a single vol field on all sample locations
template<class Type>
tmp<Field<Type> > sample(const word& fieldName) const;
tmp<Field<Type>> sample(const word& fieldName) const;
//- Sample a single scalar field on all sample locations
template<class Type>
tmp<Field<Type> > sampleSurfaceFields(const word& fieldName) const;
tmp<Field<Type>> sampleSurfaceFields(const word& fieldName) const;
//- Sample a surface field at all locations
template<class Type>
tmp<Field<Type> > sample
tmp<Field<Type>> sample
(
const GeometricField<Type, fvsPatchField, surfaceMesh>&
) const;

24
src/sampling/probes/probesTemplates.C
View File

@ -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
@ -150,7 +150,7 @@ void Foam::probes::sampleAndWrite(const fieldGroup<Type>& fields)
sampleAndWrite
(
mesh_.lookupObject
<GeometricField<Type, fvPatchField, volMesh> >
<GeometricField<Type, fvPatchField, volMesh>>
(
fields[fieldI]
)
@ -199,7 +199,7 @@ void Foam::probes::sampleAndWriteSurfaceFields(const fieldGroup<Type>& fields)
sampleAndWrite
(
mesh_.lookupObject
<GeometricField<Type, fvsPatchField, surfaceMesh> >
<GeometricField<Type, fvsPatchField, surfaceMesh>>
(
fields[fieldI]
)
@ -212,7 +212,7 @@ void Foam::probes::sampleAndWriteSurfaceFields(const fieldGroup<Type>& fields)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::probes::sample
(
const GeometricField<Type, fvPatchField, volMesh>& vField
@ -220,7 +220,7 @@ Foam::probes::sample
{
const Type unsetVal(-VGREAT*pTraits<Type>::one);
tmp<Field<Type> > tValues
tmp<Field<Type>> tValues
(
new Field<Type>(this->size(), unsetVal)
);
@ -229,7 +229,7 @@ Foam::probes::sample
if (fixedLocations_)
{
autoPtr<interpolation<Type> > interpolator
autoPtr<interpolation<Type>> interpolator
(
interpolation<Type>::New(interpolationScheme_, vField)
);
@ -268,12 +268,12 @@ Foam::probes::sample
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::probes::sample(const word& fieldName) const
{
return sample
(
mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh> >
mesh_.lookupObject<GeometricField<Type, fvPatchField, volMesh>>
(
fieldName
)
@ -282,7 +282,7 @@ Foam::probes::sample(const word& fieldName) const
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::probes::sample
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
@ -290,7 +290,7 @@ Foam::probes::sample
{
const Type unsetVal(-VGREAT*pTraits<Type>::one);
tmp<Field<Type> > tValues
tmp<Field<Type>> tValues
(
new Field<Type>(this->size(), unsetVal)
);
@ -313,12 +313,12 @@ Foam::probes::sample
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::probes::sampleSurfaceFields(const word& fieldName) const
{
return sample
(
mesh_.lookupObject<GeometricField<Type, fvsPatchField, surfaceMesh> >
mesh_.lookupObject<GeometricField<Type, fvsPatchField, surfaceMesh>>
(
fieldName
)

8
src/sampling/sampledSet/sampledSets/sampledSets.C
View File

@ -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 @@ void Foam::sampledSets::combineSampledSets
const sampledSet& samplePts = sampledSets[setI];
// Collect data from all processors
List<List<point> > gatheredPts(Pstream::nProcs());
List<List<point>> gatheredPts(Pstream::nProcs());
gatheredPts[Pstream::myProcNo()] = samplePts;
Pstream::gatherList(gatheredPts);
@ -79,9 +79,9 @@ void Foam::sampledSets::combineSampledSets
// Combine processor lists into one big list.
List<point> allPts
(
ListListOps::combine<List<point> >
ListListOps::combine<List<point>>
(
gatheredPts, accessOp<List<point> >()
gatheredPts, accessOp<List<point>>()
)
);
labelList allSegments

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

@ -108,7 +108,7 @@ class sampledSets
template<class Type>
class volFieldSampler
:
public List<Field<Type> >
public List<Field<Type>>
{
//- Name of this collection of values
const word name_;
@ -133,7 +133,7 @@ class sampledSets
//- Construct from components
volFieldSampler
(
const List<Field<Type> >& values,
const List<Field<Type>>& values,
const word& name
);
@ -224,16 +224,16 @@ class sampledSets
template<class T>
void combineSampledValues
(
const PtrList<volFieldSampler<T> >& sampledFields,
const PtrList<volFieldSampler<T>>& sampledFields,
const labelListList& indexSets,
PtrList<volFieldSampler<T> >& masterFields
PtrList<volFieldSampler<T>>& masterFields
);
template<class Type>
void writeSampleFile
(
const coordSet& masterSampleSet,
const PtrList<volFieldSampler<Type> >& masterFields,
const PtrList<volFieldSampler<Type>>& masterFields,
const label setI,
const fileName& timeDir,
const writer<Type>& formatter

34
src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
View File

@ -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
@ -37,10 +37,10 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
const PtrList<sampledSet>& samplers
)
:
List<Field<Type> >(samplers.size()),
List<Field<Type>>(samplers.size()),
name_(field.name())
{
autoPtr<interpolation<Type> > interpolator
autoPtr<interpolation<Type>> interpolator
(
interpolation<Type>::New(interpolationScheme, field)
);
@ -83,7 +83,7 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
const PtrList<sampledSet>& samplers
)
:
List<Field<Type> >(samplers.size()),
List<Field<Type>>(samplers.size()),
name_(field.name())
{
forAll(samplers, setI)
@ -112,11 +112,11 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
template<class Type>
Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
(
const List<Field<Type> >& values,
const List<Field<Type>>& values,
const word& name
)
:
List<Field<Type> >(values),
List<Field<Type>>(values),
name_(name)
{}
@ -125,7 +125,7 @@ template<class Type>
void Foam::sampledSets::writeSampleFile
(
const coordSet& masterSampleSet,
const PtrList<volFieldSampler<Type> >& masterFields,
const PtrList<volFieldSampler<Type>>& masterFields,
const label setI,
const fileName& timeDir,
const writer<Type>& formatter
@ -168,19 +168,19 @@ void Foam::sampledSets::writeSampleFile
template<class T>
void Foam::sampledSets::combineSampledValues
(
const PtrList<volFieldSampler<T> >& sampledFields,
const PtrList<volFieldSampler<T>>& sampledFields,
const labelListList& indexSets,
PtrList<volFieldSampler<T> >& masterFields
PtrList<volFieldSampler<T>>& masterFields
)
{
forAll(sampledFields, fieldi)
{
List<Field<T> > masterValues(indexSets.size());
List<Field<T>> masterValues(indexSets.size());
forAll(indexSets, setI)
{
// Collect data from all processors
List<Field<T> > gatheredData(Pstream::nProcs());
List<Field<T>> gatheredData(Pstream::nProcs());
gatheredData[Pstream::myProcNo()] = sampledFields[fieldi][setI];
Pstream::gatherList(gatheredData);
@ -188,10 +188,10 @@ void Foam::sampledSets::combineSampledValues
{
Field<T> allData
(
ListListOps::combine<Field<T> >
ListListOps::combine<Field<T>>
(
gatheredData,
Foam::accessOp<Field<T> >()
Foam::accessOp<Field<T>>()
)
);
@ -233,7 +233,7 @@ void Foam::sampledSets::sampleAndWrite
}
// Storage for interpolated values
PtrList<volFieldSampler<Type> > sampledFields(fields.size());
PtrList<volFieldSampler<Type>> sampledFields(fields.size());
forAll(fields, fieldi)
{
@ -292,7 +292,7 @@ void Foam::sampledSets::sampleAndWrite
(
interpolationScheme_,
mesh_.lookupObject
<GeometricField<Type, fvPatchField, volMesh> >
<GeometricField<Type, fvPatchField, volMesh>>
(fields[fieldi]),
*this
)
@ -306,7 +306,7 @@ void Foam::sampledSets::sampleAndWrite
new volFieldSampler<Type>
(
mesh_.lookupObject
<GeometricField<Type, fvPatchField, volMesh> >
<GeometricField<Type, fvPatchField, volMesh>>
(fields[fieldi]),
*this
)
@ -318,7 +318,7 @@ void Foam::sampledSets::sampleAndWrite
// Combine sampled fields from processors.
// Note: only master results are valid
PtrList<volFieldSampler<Type> > masterFields(sampledFields.size());
PtrList<volFieldSampler<Type>> masterFields(sampledFields.size());
combineSampledValues(sampledFields, indexSets_, masterFields);
if (Pstream::master())

6
src/sampling/sampledSurface/distanceSurface/distanceSurface.H
View File

@ -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
@ -105,14 +105,14 @@ class distanceSurface
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> >
tmp<Field<Type>>
interpolateField(const interpolation<Type>&) const;

12
src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::distanceSurface::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
@ -39,14 +39,14 @@ Foam::distanceSurface::sampleField
{
if (cell_)
{
return tmp<Field<Type> >
return tmp<Field<Type>>
(
new Field<Type>(vField, isoSurfCellPtr_().meshCells())
);
}
else
{
return tmp<Field<Type> >
return tmp<Field<Type>>
(
new Field<Type>(vField, isoSurfPtr_().meshCells())
);
@ -55,7 +55,7 @@ Foam::distanceSurface::sampleField
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::distanceSurface::interpolateField
(
const interpolation<Type>& interpolator
@ -67,7 +67,7 @@ Foam::distanceSurface::interpolateField
const GeometricField<Type, fvPatchField, volMesh>& volFld =
interpolator.psi();
tmp<GeometricField<Type, pointPatchField, pointMesh> > pointFld
tmp<GeometricField<Type, pointPatchField, pointMesh>> pointFld
(
volPointInterpolation::New(fvm).interpolate(volFld)
);

12
src/sampling/sampledSurface/isoSurface/isoSurface.C
View File

@ -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
@ -1205,7 +1205,7 @@ bool Foam::isoSurface::validTri(const triSurface& surf, const label faceI)
void Foam::isoSurface::calcAddressing
(
const triSurface& surf,
List<FixedList<label, 3> >& faceEdges,
List<FixedList<label, 3>>& faceEdges,
labelList& edgeFace0,
labelList& edgeFace1,
Map<labelList>& edgeFacesRest
@ -1404,7 +1404,7 @@ void Foam::isoSurface::calcAddressing
void Foam::isoSurface::walkOrientation
(
const triSurface& surf,
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const label seedTriI,
@ -1490,7 +1490,7 @@ void Foam::isoSurface::walkOrientation
void Foam::isoSurface::orientSurface
(
triSurface& surf,
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const Map<labelList>& edgeFacesRest
@ -1585,7 +1585,7 @@ bool Foam::isoSurface::danglingTriangle
// Mark triangles to keep. Returns number of dangling triangles.
Foam::label Foam::isoSurface::markDanglingTriangles
(
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const Map<labelList>& edgeFacesRest,
@ -2021,7 +2021,7 @@ Foam::isoSurface::isoSurface
if (false)
{
List<FixedList<label, 3> > faceEdges;
List<FixedList<label, 3>> faceEdges;
labelList edgeFace0, edgeFace1;
Map<labelList> edgeFacesRest;

14
src/sampling/sampledSurface/isoSurface/isoSurface.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -236,7 +236,7 @@ class isoSurface
//- Return input field with coupled (and empty) patch values rewritten
template<class Type>
tmp<SlicedGeometricField
<Type, fvPatchField, slicedFvPatchField, volMesh> >
<Type, fvPatchField, slicedFvPatchField, volMesh>>
adaptPatchFields
(
const GeometricField<Type, fvPatchField, volMesh>& fld
@ -338,7 +338,7 @@ class isoSurface
void calcAddressing
(
const triSurface& surf,
List<FixedList<label, 3> >& faceEdges,
List<FixedList<label, 3>>& faceEdges,
labelList& edgeFace0,
labelList& edgeFace1,
Map<labelList>& edgeFacesRest
@ -348,7 +348,7 @@ class isoSurface
static void walkOrientation
(
const triSurface& surf,
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const label seedTriI,
@ -359,7 +359,7 @@ class isoSurface
static void orientSurface
(
triSurface&,
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const Map<labelList>& edgeFacesRest
@ -375,7 +375,7 @@ class isoSurface
//- Mark all non-fully connected triangles
static label markDanglingTriangles
(
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const Map<labelList>& edgeFacesRest,
@ -428,7 +428,7 @@ public:
//- Interpolates cCoords,pCoords. Uses the references to the original
// fields used to create the iso surface.
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& cCoords,
const Field<Type>& pCoords

12
src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
View File

@ -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 @@ bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label faceI)
void Foam::isoSurfaceCell::calcAddressing
(
const triSurface& surf,
List<FixedList<label, 3> >& faceEdges,
List<FixedList<label, 3>>& faceEdges,
labelList& edgeFace0,
labelList& edgeFace1,
Map<labelList>& edgeFacesRest
@ -1225,7 +1225,7 @@ void Foam::isoSurfaceCell::calcAddressing
//void Foam::isoSurfaceCell::walkOrientation
//(
// const triSurface& surf,
// const List<FixedList<label, 3> >& faceEdges,
// const List<FixedList<label, 3>>& faceEdges,
// const labelList& edgeFace0,
// const labelList& edgeFace1,
// const label seedTriI,
@ -1293,7 +1293,7 @@ void Foam::isoSurfaceCell::calcAddressing
//void Foam::isoSurfaceCell::orientSurface
//(
// triSurface& surf,
// const List<FixedList<label, 3> >& faceEdges,
// const List<FixedList<label, 3>>& faceEdges,
// const labelList& edgeFace0,
// const labelList& edgeFace1,
// const Map<labelList>& edgeFacesRest
@ -1388,7 +1388,7 @@ bool Foam::isoSurfaceCell::danglingTriangle
// Mark triangles to keep. Returns number of dangling triangles.
Foam::label Foam::isoSurfaceCell::markDanglingTriangles
(
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const Map<labelList>& edgeFacesRest,
@ -1671,7 +1671,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
if (regularise)
{
List<FixedList<label, 3> > faceEdges;
List<FixedList<label, 3>> faceEdges;
labelList edgeFace0, edgeFace1;
Map<labelList> edgeFacesRest;

14
src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -265,7 +265,7 @@ class isoSurfaceCell
void calcAddressing
(
const triSurface& surf,
List<FixedList<label, 3> >& faceEdges,
List<FixedList<label, 3>>& faceEdges,
labelList& edgeFace0,
labelList& edgeFace1,
Map<labelList>& edgeFacesRest
@ -275,7 +275,7 @@ class isoSurfaceCell
//static void walkOrientation
//(
// const triSurface& surf,
// const List<FixedList<label, 3> >& faceEdges,
// const List<FixedList<label, 3>>& faceEdges,
// const labelList& edgeFace0,
// const labelList& edgeFace1,
// const label seedTriI,
@ -286,7 +286,7 @@ class isoSurfaceCell
//static void orientSurface
//(
// triSurface&,
// const List<FixedList<label, 3> >& faceEdges,
// const List<FixedList<label, 3>>& faceEdges,
// const labelList& edgeFace0,
// const labelList& edgeFace1,
// const Map<labelList>& edgeFacesRest
@ -302,7 +302,7 @@ class isoSurfaceCell
//- Mark all non-fully connected triangles
static label markDanglingTriangles
(
const List<FixedList<label, 3> >& faceEdges,
const List<FixedList<label, 3>>& faceEdges,
const labelList& edgeFace0,
const labelList& edgeFace1,
const Map<labelList>& edgeFacesRest,
@ -358,7 +358,7 @@ public:
//- Interpolates cCoords,pCoords. Takes the original fields
// used to create the iso surface.
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const scalarField& cVals,
const scalarField& pVals,
@ -368,7 +368,7 @@ public:
//- Interpolates cCoords,pCoords.
template<class Type>
tmp<Field<Type> > interpolate
tmp<Field<Type>> interpolate
(
const Field<Type>& cCoords,
const Field<Type>& pCoords

10
src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
View File

@ -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
@ -507,7 +507,7 @@ void Foam::isoSurfaceCell::generateTriPoints
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::isoSurfaceCell::interpolate
(
const scalarField& cVals,
@ -543,7 +543,7 @@ Foam::isoSurfaceCell::interpolate
// One value per point
tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
Field<Type>& values = tvalues();
forAll(triPoints, i)
@ -561,7 +561,7 @@ Foam::isoSurfaceCell::interpolate
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::isoSurfaceCell::interpolate
(
const Field<Type>& cCoords,
@ -595,7 +595,7 @@ Foam::isoSurfaceCell::interpolate
// One value per point
tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
Field<Type>& values = tvalues();
forAll(triPoints, i)

16
src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
View File

@ -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
@ -39,7 +39,7 @@ Foam::tmp<Foam::SlicedGeometricField
Foam::fvPatchField,
Foam::slicedFvPatchField,
Foam::volMesh
> >
>>
Foam::isoSurface::adaptPatchFields
(
const GeometricField<Type, fvPatchField, volMesh>& fld
@ -125,7 +125,7 @@ Foam::isoSurface::adaptPatchFields
const scalarField& w = mesh.weights().boundaryField()[patchI];
tmp<Field<Type> > f =
tmp<Field<Type>> f =
w*pfld.patchInternalField()
+ (1.0-w)*pfld.patchNeighbourField();
@ -682,15 +682,15 @@ void Foam::isoSurface::generateTriPoints
//template<class Type>
//Foam::tmp<Foam::Field<Type> >
//Foam::tmp<Foam::Field<Type>>
//Foam::isoSurface::sample(const Field<Type>& vField) const
//{
// return tmp<Field<Type> >(new Field<Type>(vField, meshCells()));
// return tmp<Field<Type>>(new Field<Type>(vField, meshCells()));
//}
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::isoSurface::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& cCoords,
@ -704,7 +704,7 @@ Foam::isoSurface::interpolate
fvPatchField,
slicedFvPatchField,
volMesh
> > c2(adaptPatchFields(cCoords));
>> c2(adaptPatchFields(cCoords));
DynamicList<Type> triPoints(nCutCells_);
@ -733,7 +733,7 @@ Foam::isoSurface::interpolate
// One value per point
tmp<Field<Type> > tvalues
tmp<Field<Type>> tvalues
(
new Field<Type>(points().size(), pTraits<Type>::zero)
);

6
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
View File

@ -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
@ -123,14 +123,14 @@ class sampledIsoSurface
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> >
tmp<Field<Type>>
interpolateField(const interpolation<Type>&) const;

6
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
View File

@ -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
@ -92,14 +92,14 @@ class sampledIsoSurfaceCell
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> >
tmp<Field<Type>>
interpolateField(const interpolation<Type>&) const;

10
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledIsoSurfaceCell::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
@ -41,12 +41,12 @@ Foam::sampledIsoSurfaceCell::sampleField
// Recreate geometry if time has changed
updateGeometry();
return tmp<Field<Type> >(new Field<Type>(vField, meshCells_));
return tmp<Field<Type>>(new Field<Type>(vField, meshCells_));
}
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledIsoSurfaceCell::interpolateField
(
const interpolation<Type>& interpolator
@ -56,7 +56,7 @@ Foam::sampledIsoSurfaceCell::interpolateField
updateGeometry();
// One value per point
tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
Field<Type>& values = tvalues();
boolList pointDone(points().size(), false);

14
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledIsoSurface::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
@ -40,12 +40,12 @@ Foam::sampledIsoSurface::sampleField
// Recreate geometry if time has changed
updateGeometry();
return tmp<Field<Type> >(new Field<Type>(vField, surface().meshCells()));
return tmp<Field<Type>>(new Field<Type>(vField, surface().meshCells()));
}
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledIsoSurface::interpolateField
(
const interpolation<Type>& interpolator
@ -60,13 +60,13 @@ Foam::sampledIsoSurface::interpolateField
if (subMeshPtr_.valid())
{
tmp<GeometricField<Type, fvPatchField, volMesh> > tvolSubFld =
tmp<GeometricField<Type, fvPatchField, volMesh>> tvolSubFld =
subMeshPtr_().interpolate(volFld);
const GeometricField<Type, fvPatchField, volMesh>& volSubFld =
tvolSubFld();
tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointSubFld =
tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointSubFld =
volPointInterpolation::New(volSubFld.mesh()).interpolate(volSubFld);
// Sample.
@ -82,7 +82,7 @@ Foam::sampledIsoSurface::interpolateField
}
else
{
tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointFld =
tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointFld =
volPointInterpolation::New(volFld.mesh()).interpolate(volFld);
// Sample.

6
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
View File

@ -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
@ -103,14 +103,14 @@ class sampledCuttingPlane
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> >
tmp<Field<Type>>
interpolateField(const interpolation<Type>&) const;

14
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
View File

@ -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,18 +31,18 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledCuttingPlane::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const
{
return tmp<Field<Type> >(new Field<Type>(vField, surface().meshCells()));
return tmp<Field<Type>>(new Field<Type>(vField, surface().meshCells()));
}
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledCuttingPlane::interpolateField
(
const interpolation<Type>& interpolator
@ -54,13 +54,13 @@ Foam::sampledCuttingPlane::interpolateField
if (subMeshPtr_.valid())
{
tmp<GeometricField<Type, fvPatchField, volMesh> > tvolSubFld =
tmp<GeometricField<Type, fvPatchField, volMesh>> tvolSubFld =
subMeshPtr_().interpolate(volFld);
const GeometricField<Type, fvPatchField, volMesh>& volSubFld =
tvolSubFld();
tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointSubFld =
tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointSubFld =
volPointInterpolation::New(volSubFld.mesh()).interpolate(volSubFld);
// Sample.
@ -76,7 +76,7 @@ Foam::sampledCuttingPlane::interpolateField
}
else
{
tmp<GeometricField<Type, pointPatchField, pointMesh> > tpointFld
tmp<GeometricField<Type, pointPatchField, pointMesh>> tpointFld
(
volPointInterpolation::New(volFld.mesh()).interpolate(volFld)
);

8
src/sampling/sampledSurface/sampledPatch/sampledPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -84,20 +84,20 @@ class sampledPatch
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
//- Sample surface field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
) const;
template<class Type>
tmp<Field<Type> > interpolateField(const interpolation<Type>&) const;
tmp<Field<Type>> interpolateField(const interpolation<Type>&) const;
//- Re-map action on triangulation or cleanup
virtual void remapFaces(const labelUList& faceMap);

14
src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,14 +28,14 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledPatch::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const
{
// One value per face
tmp<Field<Type> > tvalues(new Field<Type>(patchFaceLabels_.size()));
tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels_.size()));
Field<Type>& values = tvalues();
forAll(patchFaceLabels_, i)
{
@ -49,14 +49,14 @@ Foam::sampledPatch::sampleField
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledPatch::sampleField
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
) const
{
// One value per face
tmp<Field<Type> > tvalues(new Field<Type>(patchFaceLabels_.size()));
tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels_.size()));
Field<Type>& values = tvalues();
forAll(patchFaceLabels_, i)
@ -70,14 +70,14 @@ Foam::sampledPatch::sampleField
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledPatch::interpolateField
(
const interpolation<Type>& interpolator
) const
{
// One value per vertex
tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
Field<Type>& values = tvalues();
const labelList& own = mesh().faceOwner();

6
src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -66,13 +66,13 @@ class sampledPatchInternalField
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> > interpolateField(const interpolation<Type>&) const;
tmp<Field<Type>> interpolateField(const interpolation<Type>&) const;
public:

8
src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,14 +30,14 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledPatchInternalField::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const
{
// One value per face
tmp<Field<Type> > tvalues(new Field<Type>(patchFaceLabels().size()));
tmp<Field<Type>> tvalues(new Field<Type>(patchFaceLabels().size()));
Field<Type>& values = tvalues();
forAll(patchStart(), i)
@ -65,7 +65,7 @@ Foam::sampledPatchInternalField::sampleField
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledPatchInternalField::interpolateField
(
const interpolation<Type>& interpolator

6
src/sampling/sampledSurface/sampledPlane/sampledPlane.H
View File

@ -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
@ -70,14 +70,14 @@ class sampledPlane
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> >
tmp<Field<Type>>
interpolateField(const interpolation<Type>&) const;

10
src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,25 +28,25 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledPlane::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const
{
return tmp<Field<Type> >(new Field<Type>(vField, meshCells()));
return tmp<Field<Type>>(new Field<Type>(vField, meshCells()));
}
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledPlane::interpolateField
(
const interpolation<Type>& interpolator
) const
{
// One value per point
tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
Field<Type>& values = tvalues();
boolList pointDone(points().size(), false);

22
src/sampling/sampledSurface/sampledSurface/sampledSurface.C
View File

@ -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
@ -287,10 +287,10 @@ Foam::tmp<Foam::tensorField> Foam::sampledSurface::sample
}
Foam::tmp<Foam::Field<Foam::scalar> >
Foam::tmp<Foam::Field<Foam::scalar>>
Foam::sampledSurface::project(const Field<scalar>& field) const
{
tmp<Field<scalar> > tRes(new Field<scalar>(faces().size()));
tmp<Field<scalar>> tRes(new Field<scalar>(faces().size()));
Field<scalar>& res = tRes();
forAll(faces(), faceI)
@ -302,37 +302,37 @@ Foam::sampledSurface::project(const Field<scalar>& field) const
}
Foam::tmp<Foam::Field<Foam::scalar> >
Foam::tmp<Foam::Field<Foam::scalar>>
Foam::sampledSurface::project(const Field<vector>& field) const
{
tmp<Field<scalar> > tRes(new Field<scalar>(faces().size()));
tmp<Field<scalar>> tRes(new Field<scalar>(faces().size()));
project(tRes(), field);
return tRes;
}
Foam::tmp<Foam::Field<Foam::vector> >
Foam::tmp<Foam::Field<Foam::vector>>
Foam::sampledSurface::project(const Field<sphericalTensor>& field) const
{
tmp<Field<vector> > tRes(new Field<vector>(faces().size()));
tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
project(tRes(), field);
return tRes;
}
Foam::tmp<Foam::Field<Foam::vector> >
Foam::tmp<Foam::Field<Foam::vector>>
Foam::sampledSurface::project(const Field<symmTensor>& field) const
{
tmp<Field<vector> > tRes(new Field<vector>(faces().size()));
tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
project(tRes(), field);
return tRes;
}
Foam::tmp<Foam::Field<Foam::vector> >
Foam::tmp<Foam::Field<Foam::vector>>
Foam::sampledSurface::project(const Field<tensor>& field) const
{
tmp<Field<vector> > tRes(new Field<vector>(faces().size()));
tmp<Field<vector>> tRes(new Field<vector>(faces().size()));
project(tRes(), field);
return tRes;
}

22
src/sampling/sampledSurface/sampledSurface/sampledSurface.H
View File

@ -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
@ -135,12 +135,12 @@ class sampledSurface
void project
(
Field<ReturnType>&,
const tmp<Field<Type> >&
const tmp<Field<Type>>&
) const;
//- Project field onto surface
template<class ReturnType, class Type>
tmp<Field<ReturnType> > project(const tmp<Field<Type> >&) const;
tmp<Field<ReturnType>> project(const tmp<Field<Type>>&) const;
protected:
@ -295,7 +295,7 @@ public:
//- Integration of a field across the surface
template<class Type>
Type integrate(const tmp<Field<Type> >&) const;
Type integrate(const tmp<Field<Type>>&) const;
//- Area-averaged value of a field across the surface
template<class Type>
@ -303,26 +303,26 @@ public:
//- Area-averaged value of a field across the surface
template<class Type>
Type average(const tmp<Field<Type> >&) const;
Type average(const tmp<Field<Type>>&) const;
//- Project field onto surface
tmp<Field<scalar> > project(const Field<scalar>&) const;
tmp<Field<scalar>> project(const Field<scalar>&) const;
//- Project field onto surface
tmp<Field<scalar> > project(const Field<vector>&) const;
tmp<Field<scalar>> project(const Field<vector>&) const;
//- Project field onto surface
tmp<Field<vector> > project(const Field<sphericalTensor>&) const;
tmp<Field<vector>> project(const Field<sphericalTensor>&) const;
//- Project field onto surface
tmp<Field<vector> > project(const Field<symmTensor>&) const;
tmp<Field<vector>> project(const Field<symmTensor>&) const;
//- Project field onto surface
tmp<Field<vector> > project(const Field<tensor>&) const;
tmp<Field<vector>> project(const Field<tensor>&) const;
//- Interpolate from points to cell centre
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > pointAverage
tmp<GeometricField<Type, fvPatchField, volMesh>> pointAverage
(
const GeometricField<Type, pointPatchField, pointMesh>& pfld
) const;

18
src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
View File

@ -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 @@ Type Foam::sampledSurface::integrate(const Field<Type>& field) const
template<class Type>
Type Foam::sampledSurface::integrate(const tmp<Field<Type> >& field) const
Type Foam::sampledSurface::integrate(const tmp<Field<Type>>& field) const
{
Type value = integrate(field());
field.clear();
@ -95,7 +95,7 @@ Type Foam::sampledSurface::average(const Field<Type>& field) const
template<class Type>
Type Foam::sampledSurface::average(const tmp<Field<Type> >& field) const
Type Foam::sampledSurface::average(const tmp<Field<Type>>& field) const
{
Type value = average(field());
field.clear();
@ -130,7 +130,7 @@ template<class ReturnType, class Type>
void Foam::sampledSurface::project
(
Field<ReturnType>& res,
const tmp<Field<Type> >& field
const tmp<Field<Type>>& field
) const
{
project(res, field());
@ -139,20 +139,20 @@ void Foam::sampledSurface::project
template<class ReturnType, class Type>
Foam::tmp<Foam::Field<ReturnType> >
Foam::tmp<Foam::Field<ReturnType>>
Foam::sampledSurface::project
(
const tmp<Field<Type> >& field
const tmp<Field<Type>>& field
) const
{
tmp<Field<ReturnType> > tRes(new Field<ReturnType>(faces().size()));
tmp<Field<ReturnType>> tRes(new Field<ReturnType>(faces().size()));
project(tRes(), field);
return tRes;
}
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::sampledSurface::pointAverage
(
const GeometricField<Type, pointPatchField, pointMesh>& pfld
@ -160,7 +160,7 @@ Foam::sampledSurface::pointAverage
{
const fvMesh& mesh = dynamic_cast<const fvMesh&>(pfld.mesh()());
tmp<GeometricField<Type, fvPatchField, volMesh> > tcellAvg
tmp<GeometricField<Type, fvPatchField, volMesh>> tcellAvg
(
new GeometricField<Type, fvPatchField, volMesh>
(

10
src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,7 +45,7 @@ void Foam::sampledSurfaces::writeSurface
if (Pstream::parRun())
{
// Collect values from all processors
List<Field<Type> > gatheredValues(Pstream::nProcs());
List<Field<Type>> gatheredValues(Pstream::nProcs());
gatheredValues[Pstream::myProcNo()] = values;
Pstream::gatherList(gatheredValues);
@ -54,10 +54,10 @@ void Foam::sampledSurfaces::writeSurface
// Combine values into single field
Field<Type> allValues
(
ListListOps::combine<Field<Type> >
ListListOps::combine<Field<Type>>
(
gatheredValues,
accessOp<Field<Type> >()
accessOp<Field<Type>>()
)
);
@ -113,7 +113,7 @@ void Foam::sampledSurfaces::sampleAndWrite
)
{
// interpolator for this field
autoPtr<interpolation<Type> > interpolatorPtr;
autoPtr<interpolation<Type>> interpolatorPtr;
const word& fieldName = vField.name();
const fileName outputDir = outputPath_/vField.time().timeName();

8
src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
View File

@ -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
@ -118,7 +118,7 @@ private:
mutable bool needsUpdate_;
//- Search tree for all non-coupled boundary faces
mutable autoPtr<indexedOctree<treeDataFace> > boundaryTreePtr_;
mutable autoPtr<indexedOctree<treeDataFace>> boundaryTreePtr_;
//- From local surface triangle to mesh cell/face.
labelList sampleElements_;
@ -134,14 +134,14 @@ private:
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> >
tmp<Field<Type>>
interpolateField(const interpolation<Type>&) const;
bool update(const meshSearch& meshSearcher);

10
src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,14 +28,14 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledTriSurfaceMesh::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const
{
// One value per face
tmp<Field<Type> > tvalues(new Field<Type>(sampleElements_.size()));
tmp<Field<Type>> tvalues(new Field<Type>(sampleElements_.size()));
Field<Type>& values = tvalues();
if (sampleSource_ == cells || sampleSource_ == insideCells)
@ -84,14 +84,14 @@ Foam::sampledTriSurfaceMesh::sampleField
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledTriSurfaceMesh::interpolateField
(
const interpolation<Type>& interpolator
) const
{
// One value per vertex
tmp<Field<Type> > tvalues(new Field<Type>(sampleElements_.size()));
tmp<Field<Type>> tvalues(new Field<Type>(sampleElements_.size()));
Field<Type>& values = tvalues();
if (sampleSource_ == cells || sampleSource_ == insideCells)

6
src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
View File

@ -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
@ -90,14 +90,14 @@ class sampledThresholdCellFaces
//- Sample field on faces
template<class Type>
tmp<Field<Type> > sampleField
tmp<Field<Type>> sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
template<class Type>
tmp<Field<Type> >
tmp<Field<Type>>
interpolateField(const interpolation<Type>&) const;

10
src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,7 +33,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledThresholdCellFaces::sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
@ -42,12 +42,12 @@ Foam::sampledThresholdCellFaces::sampleField
// Recreate geometry if time has changed
updateGeometry();
return tmp<Field<Type> >(new Field<Type>(vField, meshCells_));
return tmp<Field<Type>>(new Field<Type>(vField, meshCells_));
}
template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::tmp<Foam::Field<Type>>
Foam::sampledThresholdCellFaces::interpolateField
(
const interpolation<Type>& interpolator
@ -57,7 +57,7 @@ Foam::sampledThresholdCellFaces::interpolateField
updateGeometry();
// One value per point
tmp<Field<Type> > tvalues(new Field<Type>(points().size()));
tmp<Field<Type>> tvalues(new Field<Type>(points().size()));
Field<Type>& values = tvalues();
boolList pointDone(points().size(), false);

8
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -261,7 +261,7 @@ void Foam::nastranSurfaceWriter::writeGeometry
(
const pointField& points,
const faceList& faces,
List<DynamicList<face> >& decomposedFaces,
List<DynamicList<face>>& decomposedFaces,
OFstream& os
) const
{
@ -339,7 +339,7 @@ Foam::nastranSurfaceWriter::nastranSurfaceWriter(const dictionary& options)
writeFormat_ = writeFormatNames_.read(options.lookup("format"));
}
List<Tuple2<word, word> > fieldSet(options.lookup("fields"));
List<Tuple2<word, word>> fieldSet(options.lookup("fields"));
forAll(fieldSet, i)
{
@ -382,7 +382,7 @@ void Foam::nastranSurfaceWriter::write
<< "$" << nl
<< "BEGIN BULK" << nl;
List<DynamicList<face> > decomposedFaces(faces.size());
List<DynamicList<face>> decomposedFaces(faces.size());
writeGeometry(points, faces, decomposedFaces, os);

4
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -119,7 +119,7 @@ private:
(
const pointField& points,
const faceList& faces,
List<DynamicList<face> >& decomposedFaces,
List<DynamicList<face>>& decomposedFaces,
OFstream& os
) const;

4
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -163,7 +163,7 @@ void Foam::nastranSurfaceWriter::writeTemplate
<< "$" << nl
<< "BEGIN BULK" << nl;
List<DynamicList<face> > decomposedFaces(faces.size());
List<DynamicList<face>> decomposedFaces(faces.size());
writeGeometry(points, faces, decomposedFaces, os);