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/dynamicMesh/boundaryMesh/boundaryMesh.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
@ -925,7 +925,7 @@ Foam::labelList Foam::boundaryMesh::getNearest
bbMax.z() += 2*tol;
const scalar planarTol =
indexedOctree<treeDataPrimitivePatch<uindirectPrimitivePatch> >::
indexedOctree<treeDataPrimitivePatch<uindirectPrimitivePatch>>::
perturbTol();
@ -1259,7 +1259,7 @@ void Foam::boundaryMesh::patchify
if (newPatchPtrList.size())
{
List<DynamicList<label> > patchFaces(nNewPatches);
List<DynamicList<label>> patchFaces(nNewPatches);
// Give reasonable estimate for size of patches
label nAvgFaces =

6
src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.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
@ -256,14 +256,14 @@ void Foam::fvMeshAdder::MapVolFields
HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fields
(
mesh.objectRegistry::lookupClass
<GeometricField<Type, fvPatchField, volMesh> >
<GeometricField<Type, fvPatchField, volMesh>>
()
);
HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fieldsToAdd
(
meshToAdd.objectRegistry::lookupClass
<GeometricField<Type, fvPatchField, volMesh> >
<GeometricField<Type, fvPatchField, volMesh>>
()
);

36
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.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
@ -397,15 +397,15 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::repatch
// is currently not supported by updateMesh.
// Store boundary fields (we only do this for surfaceFields)
PtrList<FieldField<fvsPatchField, scalar> > sFlds;
PtrList<FieldField<fvsPatchField, scalar>> sFlds;
saveBoundaryFields<scalar, surfaceMesh>(sFlds);
PtrList<FieldField<fvsPatchField, vector> > vFlds;
PtrList<FieldField<fvsPatchField, vector>> vFlds;
saveBoundaryFields<vector, surfaceMesh>(vFlds);
PtrList<FieldField<fvsPatchField, sphericalTensor> > sptFlds;
PtrList<FieldField<fvsPatchField, sphericalTensor>> sptFlds;
saveBoundaryFields<sphericalTensor, surfaceMesh>(sptFlds);
PtrList<FieldField<fvsPatchField, symmTensor> > sytFlds;
PtrList<FieldField<fvsPatchField, symmTensor>> sytFlds;
saveBoundaryFields<symmTensor, surfaceMesh>(sytFlds);
PtrList<FieldField<fvsPatchField, tensor> > tFlds;
PtrList<FieldField<fvsPatchField, tensor>> tFlds;
saveBoundaryFields<tensor, surfaceMesh>(tFlds);
// Change the mesh (no inflation). Note: parallel comms allowed.
@ -763,7 +763,7 @@ void Foam::fvMeshDistribute::findCouples
{
// Store domain neighbour as map so we can easily look for pair
// with same face+proc.
HashTable<label, labelPair, labelPair::Hash<> > map(domainFace.size());
HashTable<label, labelPair, labelPair::Hash<>> map(domainFace.size());
forAll(domainProc, bFaceI)
{
@ -790,7 +790,7 @@ void Foam::fvMeshDistribute::findCouples
{
labelPair myData(sourceFace[bFaceI], sourceProc[bFaceI]);
HashTable<label, labelPair, labelPair::Hash<> >::const_iterator
HashTable<label, labelPair, labelPair::Hash<>>::const_iterator
iter = map.find(myData);
if (iter != map.end())
@ -906,7 +906,7 @@ void Foam::fvMeshDistribute::addProcPatches
(
const labelList& nbrProc, // processor that neighbour is now on
const labelList& referPatchID, // patchID (or -1) I originated from
List<Map<label> >& procPatchID
List<Map<label>>& procPatchID
)
{
// Now use the neighbourFace/Proc to repatch the mesh. These lists
@ -1016,7 +1016,7 @@ Foam::labelList Foam::fvMeshDistribute::getBoundaryPatch
(
const labelList& nbrProc, // new processor per boundary face
const labelList& referPatchID, // patchID (or -1) I originated from
const List<Map<label> >& procPatchID // per proc the new procPatches
const List<Map<label>>& procPatchID // per proc the new procPatches
)
{
labelList patchIDs(nbrProc);
@ -2199,7 +2199,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// Per neighbour processor, per originating patch, the patchID
// For faces resulting from internal faces or normal processor patches
// the originating patch is -1. For cyclics this is the cyclic patchID.
List<Map<label> > procPatchID;
List<Map<label>> procPatchID;
// Add processor and processorCyclic patches.
addProcPatches(sourceNewNbrProc, sourcePatch, procPatchID);
@ -2233,11 +2233,11 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
// Bit of hack: processorFvPatchField does not get reset since created
// from nothing so explicitly reset.
initPatchFields<volScalarField, processorFvPatchField<scalar> >
initPatchFields<volScalarField, processorFvPatchField<scalar>>
(
pTraits<scalar>::zero
);
initPatchFields<volVectorField, processorFvPatchField<vector> >
initPatchFields<volVectorField, processorFvPatchField<vector>>
(
pTraits<vector>::zero
);
@ -2249,20 +2249,20 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
(
pTraits<sphericalTensor>::zero
);
initPatchFields<volSymmTensorField, processorFvPatchField<symmTensor> >
initPatchFields<volSymmTensorField, processorFvPatchField<symmTensor>>
(
pTraits<symmTensor>::zero
);
initPatchFields<volTensorField, processorFvPatchField<tensor> >
initPatchFields<volTensorField, processorFvPatchField<tensor>>
(
pTraits<tensor>::zero
);
initPatchFields<surfaceScalarField, processorFvsPatchField<scalar> >
initPatchFields<surfaceScalarField, processorFvsPatchField<scalar>>
(
pTraits<scalar>::zero
);
initPatchFields<surfaceVectorField, processorFvsPatchField<vector> >
initPatchFields<surfaceVectorField, processorFvsPatchField<vector>>
(
pTraits<vector>::zero
);
@ -2282,7 +2282,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
(
pTraits<symmTensor>::zero
);
initPatchFields<surfaceTensorField, processorFvsPatchField<tensor> >
initPatchFields<surfaceTensorField, processorFvsPatchField<tensor>>
(
pTraits<tensor>::zero
);

10
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.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
@ -106,7 +106,7 @@ class fvMeshDistribute
template<class T, class Mesh>
void saveBoundaryFields
(
PtrList<FieldField<fvsPatchField, T> >& bflds
PtrList<FieldField<fvsPatchField, T>>& bflds
) const;
//- Map boundary fields
@ -114,7 +114,7 @@ class fvMeshDistribute
void mapBoundaryFields
(
const mapPolyMesh& map,
const PtrList<FieldField<fvsPatchField, T> >& oldBflds
const PtrList<FieldField<fvsPatchField, T>>& oldBflds
);
//- Init patch fields of certain type
@ -232,7 +232,7 @@ class fvMeshDistribute
(
const labelList&, // processor that neighbour is now on
const labelList&, // -1 or patch that face originated from
List<Map<label> >& procPatchID
List<Map<label>>& procPatchID
);
//- Get boundary faces to be repatched. Is -1 or new patchID
@ -240,7 +240,7 @@ class fvMeshDistribute
(
const labelList& neighbourNewProc, // new processor per b. face
const labelList& referPatchID, // -1 or original patch
const List<Map<label> >& procPatchID// patchID
const List<Map<label>>& procPatchID// patchID
);
//- Send mesh and coupling data.

6
src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.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
@ -59,7 +59,7 @@ void Foam::fvMeshDistribute::printFieldInfo(const fvMesh& mesh)
template<class T, class Mesh>
void Foam::fvMeshDistribute::saveBoundaryFields
(
PtrList<FieldField<fvsPatchField, T> >& bflds
PtrList<FieldField<fvsPatchField, T>>& bflds
) const
{
typedef GeometricField<T, fvsPatchField, Mesh> fldType;
@ -89,7 +89,7 @@ template<class T, class Mesh>
void Foam::fvMeshDistribute::mapBoundaryFields
(
const mapPolyMesh& map,
const PtrList<FieldField<fvsPatchField, T> >& oldBflds
const PtrList<FieldField<fvsPatchField, T>>& oldBflds
)
{
const labelList& oldPatchStarts = map.oldPatchStarts();

10
src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.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
@ -405,7 +405,7 @@ Foam::boundaryCutter::~boundaryCutter()
void Foam::boundaryCutter::setRefinement
(
const Map<point>& pointToPos,
const Map<List<point> >& edgeToCuts,
const Map<List<point>>& edgeToCuts,
const Map<labelPair>& faceToSplit,
const Map<point>& faceToFeaturePoint,
polyTopoChange& meshMod
@ -446,7 +446,7 @@ void Foam::boundaryCutter::setRefinement
// Map from edge label to sorted list of points
Map<labelList> edgeToAddedPoints(edgeToCuts.size());
forAllConstIter(Map<List<point> >, edgeToCuts, iter)
forAllConstIter(Map<List<point>>, edgeToCuts, iter)
{
label edgeI = iter.key();
@ -869,12 +869,12 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
{
// Create copy since we're deleting entries
HashTable<labelList, edge, Hash<edge> >
HashTable<labelList, edge, Hash<edge>>
newEdgeAddedPoints(edgeAddedPoints_.size());
for
(
HashTable<labelList, edge, Hash<edge> >::const_iterator iter =
HashTable<labelList, edge, Hash<edge>>::const_iterator iter =
edgeAddedPoints_.begin();
iter != edgeAddedPoints_.end();
++iter

8
src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
View File

@ -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
@ -71,7 +71,7 @@ class boundaryCutter
const polyMesh& mesh_;
//- Per edge sorted (start to end) list of points added.
HashTable<labelList, edge, Hash<edge> > edgeAddedPoints_;
HashTable<labelList, edge, Hash<edge>> edgeAddedPoints_;
//- Per face the mid point added.
Map<label> faceAddedPoint_;
@ -146,7 +146,7 @@ public:
void setRefinement
(
const Map<point>& pointToPos,
const Map<List<point> >& edgeToCuts,
const Map<List<point>>& edgeToCuts,
const Map<labelPair>& faceToSplit,
const Map<point>& faceToFeaturePoint,
polyTopoChange& meshMod
@ -159,7 +159,7 @@ public:
// Access
//- Per edge a sorted list (start to end) of added points.
const HashTable<labelList, edge, Hash<edge> >& edgeAddedPoints()
const HashTable<labelList, edge, Hash<edge>>& edgeAddedPoints()
const
{
return edgeAddedPoints_;

10
src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.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
@ -492,7 +492,7 @@ Foam::face Foam::meshCutAndRemove::addEdgeCutsToFace(const label faceI) const
// Check if edge has been cut.
label fp1 = f.fcIndex(fp);
HashTable<label, edge, Hash<edge> >::const_iterator fnd =
HashTable<label, edge, Hash<edge>>::const_iterator fnd =
addedPoints_.find(edge(f[fp], f[fp1]));
if (fnd != addedPoints_.end())
@ -554,7 +554,7 @@ Foam::face Foam::meshCutAndRemove::loopToFace
if (edgeI != -1)
{
// Existing edge. Insert split-edge point if any.
HashTable<label, edge, Hash<edge> >::const_iterator fnd =
HashTable<label, edge, Hash<edge>>::const_iterator fnd =
addedPoints_.find(mesh().edges()[edgeI]);
if (fnd != addedPoints_.end())
@ -1315,11 +1315,11 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
}
{
HashTable<label, edge, Hash<edge> > newAddedPoints(addedPoints_.size());
HashTable<label, edge, Hash<edge>> newAddedPoints(addedPoints_.size());
for
(
HashTable<label, edge, Hash<edge> >::const_iterator iter =
HashTable<label, edge, Hash<edge>>::const_iterator iter =
addedPoints_.begin();
iter != addedPoints_.end();
++iter

6
src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
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
@ -70,7 +70,7 @@ class meshCutAndRemove
//- Points added in last setRefinement. Per split edge label of added
// point
HashTable<label, edge, Hash<edge> > addedPoints_;
HashTable<label, edge, Hash<edge>> addedPoints_;
// Private Static Functions
@ -225,7 +225,7 @@ public:
//- Points added. Per split edge label of added point.
// (note: fairly useless across topology changes since one of the
// points of the edge will probably disappear)
const HashTable<label, edge, Hash<edge> >& addedPoints() const
const HashTable<label, edge, Hash<edge>>& addedPoints() const
{
return addedPoints_;
}

10
src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.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
@ -424,7 +424,7 @@ Foam::face Foam::meshCutter::addEdgeCutsToFace(const label faceI) const
// Check if edge has been cut.
label fp1 = f.fcIndex(fp);
HashTable<label, edge, Hash<edge> >::const_iterator fnd =
HashTable<label, edge, Hash<edge>>::const_iterator fnd =
addedPoints_.find(edge(f[fp], f[fp1]));
if (fnd != addedPoints_.end())
@ -483,7 +483,7 @@ Foam::face Foam::meshCutter::loopToFace
if (edgeI != -1)
{
// Existing edge. Insert split-edge point if any.
HashTable<label, edge, Hash<edge> >::const_iterator fnd =
HashTable<label, edge, Hash<edge>>::const_iterator fnd =
addedPoints_.find(mesh().edges()[edgeI]);
if (fnd != addedPoints_.end())
@ -1043,11 +1043,11 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
}
{
HashTable<label, edge, Hash<edge> > newAddedPoints(addedPoints_.size());
HashTable<label, edge, Hash<edge>> newAddedPoints(addedPoints_.size());
for
(
HashTable<label, edge, Hash<edge> >::const_iterator iter =
HashTable<label, edge, Hash<edge>>::const_iterator iter =
addedPoints_.begin();
iter != addedPoints_.end();
++iter

6
src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.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
@ -148,7 +148,7 @@ class meshCutter
//- Points added in last setRefinement. Per split edge label of added
// point
HashTable<label, edge, Hash<edge> > addedPoints_;
HashTable<label, edge, Hash<edge>> addedPoints_;
// Private Static Functions
@ -307,7 +307,7 @@ public:
}
//- Points added. Per split edge label of added point
const HashTable<label, edge, Hash<edge> >& addedPoints() const
const HashTable<label, edge, Hash<edge>>& addedPoints() const
{
return addedPoints_;
}

4
src/dynamicMesh/motionSmoother/motionSmootherAlgo.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
@ -770,7 +770,7 @@ Foam::tmp<Foam::pointField> Foam::motionSmootherAlgo::curPoints() const
actualPatchFieldTypes.setSize(pfld.size());
forAll(pfld, patchI)
{
if (isA<fixedValuePointPatchField<vector> >(pfld[patchI]))
if (isA<fixedValuePointPatchField<vector>>(pfld[patchI]))
{
// Get rid of funny
actualPatchFieldTypes[patchI] =

6
src/dynamicMesh/motionSmoother/motionSmootherAlgo.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
@ -171,7 +171,7 @@ class motionSmootherAlgo
//- Average of connected points.
template<class Type>
tmp<GeometricField<Type, pointPatchField, pointMesh> > avg
tmp<GeometricField<Type, pointPatchField, pointMesh>> avg
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
const scalarField& edgeWeight
@ -179,7 +179,7 @@ class motionSmootherAlgo
//- Average postion of connected points.
template<class Type>
tmp<GeometricField<Type, pointPatchField, pointMesh> > avgPositions
tmp<GeometricField<Type, pointPatchField, pointMesh>> avgPositions
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
const scalarField& edgeWeight

6
src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.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
@ -135,14 +135,14 @@ void Foam::motionSmootherAlgo::checkConstraints
// Average of connected points.
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh>>
Foam::motionSmootherAlgo::avg
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
const scalarField& edgeWeight
) const
{
tmp<GeometricField<Type, pointPatchField, pointMesh> > tres
tmp<GeometricField<Type, pointPatchField, pointMesh>> tres
(
new GeometricField<Type, pointPatchField, pointMesh>
(

4
src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
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
@ -142,7 +142,7 @@ SourceFiles
namespace Foam
{
typedef HashTable<labelList, edge, Hash<edge> > edgeLookup;
typedef HashTable<labelList, edge, Hash<edge>> edgeLookup;
// Forward declaration of classes

42
src/dynamicMesh/polyMeshAdder/polyMeshAdder.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
@ -872,7 +872,7 @@ void Foam::polyMeshAdder::mergePointZones
DynamicList<word>& zoneNames,
labelList& from1ToAll,
List<DynamicList<label> >& pzPoints
List<DynamicList<label>>& pzPoints
)
{
zoneNames.setCapacity(pz0.size() + pz1.size());
@ -1011,8 +1011,8 @@ void Foam::polyMeshAdder::mergeFaceZones
DynamicList<word>& zoneNames,
labelList& from1ToAll,
List<DynamicList<label> >& fzFaces,
List<DynamicList<bool> >& fzFlips
List<DynamicList<label>>& fzFaces,
List<DynamicList<bool>>& fzFlips
)
{
const faceZoneMesh& fz0 = mesh0.faceZones();
@ -1199,7 +1199,7 @@ void Foam::polyMeshAdder::mergeCellZones
DynamicList<word>& zoneNames,
labelList& from1ToAll,
List<DynamicList<label> >& czCells
List<DynamicList<label>>& czCells
)
{
zoneNames.setCapacity(cz0.size() + cz1.size());
@ -1335,14 +1335,14 @@ void Foam::polyMeshAdder::mergeZones
const labelList& from1ToAllCells,
DynamicList<word>& pointZoneNames,
List<DynamicList<label> >& pzPoints,
List<DynamicList<label>>& pzPoints,
DynamicList<word>& faceZoneNames,
List<DynamicList<label> >& fzFaces,
List<DynamicList<bool> >& fzFlips,
List<DynamicList<label>>& fzFaces,
List<DynamicList<bool>>& fzFlips,
DynamicList<word>& cellZoneNames,
List<DynamicList<label> >& czCells
List<DynamicList<label>>& czCells
)
{
labelList from1ToAllPZones;
@ -1393,14 +1393,14 @@ void Foam::polyMeshAdder::mergeZones
void Foam::polyMeshAdder::addZones
(
const DynamicList<word>& pointZoneNames,
const List<DynamicList<label> >& pzPoints,
const List<DynamicList<label>>& pzPoints,
const DynamicList<word>& faceZoneNames,
const List<DynamicList<label> >& fzFaces,
const List<DynamicList<bool> >& fzFlips,
const List<DynamicList<label>>& fzFaces,
const List<DynamicList<bool>>& fzFlips,
const DynamicList<word>& cellZoneNames,
const List<DynamicList<label> >& czCells,
const List<DynamicList<label>>& czCells,
polyMesh& mesh
)
@ -1546,14 +1546,14 @@ Foam::autoPtr<Foam::polyMesh> Foam::polyMeshAdder::add
// ~~~~~
DynamicList<word> pointZoneNames;
List<DynamicList<label> > pzPoints;
List<DynamicList<label>> pzPoints;
DynamicList<word> faceZoneNames;
List<DynamicList<label> > fzFaces;
List<DynamicList<bool> > fzFlips;
List<DynamicList<label>> fzFaces;
List<DynamicList<bool>> fzFlips;
DynamicList<word> cellZoneNames;
List<DynamicList<label> > czCells;
List<DynamicList<label>> czCells;
mergeZones
(
@ -1763,14 +1763,14 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
// ~~~~~
DynamicList<word> pointZoneNames;
List<DynamicList<label> > pzPoints;
List<DynamicList<label>> pzPoints;
DynamicList<word> faceZoneNames;
List<DynamicList<label> > fzFaces;
List<DynamicList<bool> > fzFlips;
List<DynamicList<label>> fzFaces;
List<DynamicList<bool>> fzFlips;
DynamicList<word> cellZoneNames;
List<DynamicList<label> > czCells;
List<DynamicList<label>> czCells;
mergeZones
(

26
src/dynamicMesh/polyMeshAdder/polyMeshAdder.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
@ -169,7 +169,7 @@ private:
DynamicList<word>& zoneNames,
labelList& from1ToAll,
List<DynamicList<label> >& pzPoints
List<DynamicList<label>>& pzPoints
);
//- Merge face zones
@ -185,8 +185,8 @@ private:
DynamicList<word>& zoneNames,
labelList& from1ToAll,
List<DynamicList<label> >& fzFaces,
List<DynamicList<bool> >& fzFlips
List<DynamicList<label>>& fzFaces,
List<DynamicList<bool>>& fzFlips
);
//- Merge cell zones
@ -200,7 +200,7 @@ private:
DynamicList<word>& zoneNames,
labelList& from1ToAll,
List<DynamicList<label> >& czCells
List<DynamicList<label>>& czCells
);
//- Merge point/face/cell zone information
@ -219,28 +219,28 @@ private:
const labelList& from1ToAllCells,
DynamicList<word>& pointZoneNames,
List<DynamicList<label> >& pzPoints,
List<DynamicList<label>>& pzPoints,
DynamicList<word>& faceZoneNames,
List<DynamicList<label> >& fzFaces,
List<DynamicList<bool> >& fzFlips,
List<DynamicList<label>>& fzFaces,
List<DynamicList<bool>>& fzFlips,
DynamicList<word>& cellZoneNames,
List<DynamicList<label> >& czCells
List<DynamicList<label>>& czCells
);
//- Create new zones and add to new mesh.
static void addZones
(
const DynamicList<word>& pointZoneNames,
const List<DynamicList<label> >& pzPoints,
const List<DynamicList<label>>& pzPoints,
const DynamicList<word>& faceZoneNames,
const List<DynamicList<label> >& fzFaces,
const List<DynamicList<bool> >& fzFlips,
const List<DynamicList<label>>& fzFaces,
const List<DynamicList<bool>>& fzFlips,
const DynamicList<word>& cellZoneNames,
const List<DynamicList<label> >& czCells,
const List<DynamicList<label>>& czCells,
polyMesh& mesh
);

8
src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.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
@ -1120,7 +1120,7 @@ Foam::label Foam::edgeCollapser::syncCollapse
void Foam::edgeCollapser::filterFace
(
const Map<DynamicList<label> >& collapseStrings,
const Map<DynamicList<label>>& collapseStrings,
const List<pointEdgeCollapse>& allPointInfo,
face& f
) const
@ -1317,7 +1317,7 @@ bool Foam::edgeCollapser::setRefinement
// Create strings of edges.
// Map from collapseIndex(=global master point) to set of points
Map<DynamicList<label> > collapseStrings;
Map<DynamicList<label>> collapseStrings;
{
// 1. Count elements per collapseIndex
Map<label> nPerIndex(mesh_.nPoints()/10);
@ -1363,7 +1363,7 @@ bool Foam::edgeCollapser::setRefinement
// OFstream str2("collapseStrings_" + name(count) + ".obj");
// // Dump point collapses
// forAllConstIter(Map<DynamicList<label> >, collapseStrings, iter)
// forAllConstIter(Map<DynamicList<label>>, collapseStrings, iter)
// {
// const label masterPoint = iter.key();
// const DynamicList<label>& edgeCollapses = iter();

4
src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.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
@ -231,7 +231,7 @@ private:
//- Renumber f with new vertices. Removes consecutive duplicates
void filterFace
(
const Map<DynamicList<label> >& collapseStrings,
const Map<DynamicList<label>>& collapseStrings,
const List<pointEdgeCollapse>& allPointInfo,
face& f
) const;

4
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.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
@ -4632,7 +4632,7 @@ void Foam::hexRef8::checkMesh() const
{
// Check how many faces between owner and neighbour. Should
// be only one.
HashTable<label, labelPair, labelPair::Hash<> >
HashTable<label, labelPair, labelPair::Hash<>>
cellToFace(2*pp.size());
label faceI = pp.start();

18
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.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
@ -1316,7 +1316,7 @@ Foam::labelList Foam::polyTopoChange::selectFaces
// label)
void Foam::polyTopoChange::calcPatchPointMap
(
const List<Map<label> >& oldPatchMeshPointMaps,
const List<Map<label>>& oldPatchMeshPointMaps,
const polyBoundaryMesh& boundary,
labelListList& patchPointMap
) const
@ -1867,7 +1867,7 @@ void Foam::polyTopoChange::resetZones
void Foam::polyTopoChange::calcFaceZonePointMap
(
const polyMesh& mesh,
const List<Map<label> >& oldFaceZoneMeshPointMaps,
const List<Map<label>>& oldFaceZoneMeshPointMaps,
labelListList& faceZonePointMap
) const
{
@ -2051,10 +2051,10 @@ void Foam::polyTopoChange::compactAndReorder
List<objectMap>& cellsFromEdges,
List<objectMap>& cellsFromFaces,
List<objectMap>& cellsFromCells,
List<Map<label> >& oldPatchMeshPointMaps,
List<Map<label>>& oldPatchMeshPointMaps,
labelList& oldPatchNMeshPoints,
labelList& oldPatchStarts,
List<Map<label> >& oldFaceZoneMeshPointMaps
List<Map<label>>& oldFaceZoneMeshPointMaps
)
{
if (mesh.boundaryMesh().size() != nPatches_)
@ -3059,10 +3059,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
List<objectMap> cellsFromFaces;
List<objectMap> cellsFromCells;
// old mesh info
List<Map<label> > oldPatchMeshPointMaps;
List<Map<label>> oldPatchMeshPointMaps;
labelList oldPatchNMeshPoints;
labelList oldPatchStarts;
List<Map<label> > oldFaceZoneMeshPointMaps;
List<Map<label>> oldFaceZoneMeshPointMaps;
// Compact, reorder patch faces and calculate mesh/patch maps.
compactAndReorder
@ -3328,10 +3328,10 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
List<objectMap> cellsFromCells;
// old mesh info
List<Map<label> > oldPatchMeshPointMaps;
List<Map<label>> oldPatchMeshPointMaps;
labelList oldPatchNMeshPoints;
labelList oldPatchStarts;
List<Map<label> > oldFaceZoneMeshPointMaps;
List<Map<label>> oldFaceZoneMeshPointMaps;
// Compact, reorder patch faces and calculate mesh/patch maps.
compactAndReorder

12
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.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
@ -201,7 +201,7 @@ class polyTopoChange
template<class T>
static void reorder(const labelList& map, DynamicList<T>&);
template<class T>
static void reorder(const labelList& map, List<DynamicList<T> >&);
static void reorder(const labelList& map, List<DynamicList<T>>&);
template<class T>
static void renumberKey(const labelList& map, Map<T>&);
@ -322,7 +322,7 @@ class polyTopoChange
//- Calculate mapping for patchpoints only
void calcPatchPointMap
(
const List<Map<label> >&,
const List<Map<label>>&,
const polyBoundaryMesh&,
labelListList&
) const;
@ -356,7 +356,7 @@ class polyTopoChange
void calcFaceZonePointMap
(
const polyMesh&,
const List<Map<label> >&,
const List<Map<label>>&,
labelListList&
) const;
@ -391,10 +391,10 @@ class polyTopoChange
List<objectMap>& cellsFromEdges,
List<objectMap>& cellsFromFaces,
List<objectMap>& cellsFromCells,
List<Map<label> >& oldPatchMeshPointMaps,
List<Map<label>>& oldPatchMeshPointMaps,
labelList& oldPatchNMeshPoints,
labelList& oldPatchStarts,
List<Map<label> >& oldFaceZoneMeshPointMaps
List<Map<label>>& oldFaceZoneMeshPointMaps
);
public:

6
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.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
@ -53,11 +53,11 @@ template<class T>
void Foam::polyTopoChange::reorder
(
const labelList& oldToNew,
List<DynamicList<T> >& lst
List<DynamicList<T>>& lst
)
{
// Create copy
List<DynamicList<T> > oldLst(lst);
List<DynamicList<T>> oldLst(lst);
forAll(oldToNew, elemI)
{

4
src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.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
@ -258,7 +258,7 @@ void Foam::refinementHistory::freeSplitCell(const label index)
// Make sure parent does not point to me anymore.
if (split.parent_ >= 0)
{
autoPtr<FixedList<label, 8> >& subCellsPtr =
autoPtr<FixedList<label, 8>>& subCellsPtr =
splitCells_[split.parent_].addedCellsPtr_;
if (subCellsPtr.valid())

4
src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.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
@ -107,7 +107,7 @@ public:
label parent_;
//- Cells this cell was refined into
autoPtr<FixedList<label, 8> > addedCellsPtr_;
autoPtr<FixedList<label, 8>> addedCellsPtr_;
//- Construct null (parent = -1)
splitCell8();

4
src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.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
@ -77,7 +77,7 @@ public:
//class dummyTransformList
//{
//public:
// void operator()(const coupledPolyPatch&, Field<List<T> >&) const
// void operator()(const coupledPolyPatch&, Field<List<T>>&) const
// {}
//};
//// Dummy template specialisation. Used in synchronisation.

8
src/dynamicMesh/slidingInterface/coupleSlidingInterface.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
@ -239,8 +239,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
// For every master and slave edge make a list of points to be added into
// that edge.
List<DynamicList<label> > pointsIntoMasterEdges(masterEdges.size());
List<DynamicList<label> > pointsIntoSlaveEdges(slaveEdges.size());
List<DynamicList<label>> pointsIntoMasterEdges(masterEdges.size());
List<DynamicList<label>> pointsIntoSlaveEdges(slaveEdges.size());
// Add all points from the slave patch that have hit the edge
forAll(slavePointEdgeHits, pointI)
@ -400,7 +400,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
<< abort(FatalError);
}
Map<Pair<edge> >& addToCpepm = *cutPointEdgePairMapPtr_;
Map<Pair<edge>>& addToCpepm = *cutPointEdgePairMapPtr_;
// Clear the old map
addToCpepm.clear();

8
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.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
@ -94,8 +94,8 @@ void Foam::enrichedPatch::calcCutFaces() const
// the points projected onto the face.
// Create a set of edge usage parameters
HashSet<edge, Hash<edge> > edgesUsedOnce(pp.size());
HashSet<edge, Hash<edge> > edgesUsedTwice
HashSet<edge, Hash<edge>> edgesUsedOnce(pp.size());
HashSet<edge, Hash<edge>> edgesUsedTwice
(pp.size()*primitiveMesh::edgesPerPoint_);
@ -361,7 +361,7 @@ void Foam::enrichedPatch::calcCutFaces() const
);
// Increment the usage count using two hash sets
HashSet<edge, Hash<edge> >::iterator euoIter =
HashSet<edge, Hash<edge>>::iterator euoIter =
edgesUsedOnce.find(curCutFaceEdge);
if (euoIter == edgesUsedOnce.end())

8
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.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
@ -51,7 +51,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
// Master face points lists the points of the enriched master face plus
// points projected into the master face
Map<DynamicList<label> > mpf(meshPoints().size());
Map<DynamicList<label>> mpf(meshPoints().size());
const faceList& ef = enrichedFaces();
@ -62,7 +62,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
// Pout<< "Cur face in pfAddr: " << curFace << endl;
forAll(curFace, pointI)
{
Map<DynamicList<label> >::iterator mpfIter =
Map<DynamicList<label>>::iterator mpfIter =
mpf.find(curFace[pointI]);
if (mpfIter == mpf.end())
@ -101,7 +101,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
const label mergedSmp =
pointMergeMap().find(slaveMeshPoints[pointI])();
Map<DynamicList<label> >::iterator mpfIter =
Map<DynamicList<label>>::iterator mpfIter =
mpf.find(mergedSmp);
if (mpfIter == mpf.end())

4
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.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
@ -46,7 +46,7 @@ void Foam::enrichedPatch::calcPointPoints() const
// Go through all faces and add the previous and next point as the
// neighbour for each point. While inserting points, reject the
// duplicates (as every internal edge will be visited twice).
List<DynamicList<label, primitiveMesh::edgesPerPoint_> >
List<DynamicList<label, primitiveMesh::edgesPerPoint_>>
pp(meshPoints().size());
const faceList& lf = localFaces();

8
src/dynamicMesh/slidingInterface/slidingInterface.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
@ -298,7 +298,7 @@ Foam::slidingInterface::slidingInterface
retiredPointMapPtr_ = new Map<label>(dict.lookup("retiredPointMap"));
cutPointEdgePairMapPtr_ =
new Map<Pair<edge> >(dict.lookup("cutPointEdgePairMap"));
new Map<Pair<edge>>(dict.lookup("cutPointEdgePairMap"));
}
else
{
@ -434,7 +434,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
const Map<label>& rpm = retiredPointMap();
const Map<Pair<edge> >& cpepm = cutPointEdgePairMap();
const Map<Pair<edge>>& cpepm = cutPointEdgePairMap();
const Map<label>& slaveZonePointMap =
mesh.faceZones()[slaveFaceZoneID_.index()]().meshPointMap();
@ -471,7 +471,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
// A cut point is not a projected slave point. Therefore, it
// must be an edge-to-edge intersection.
Map<Pair<edge> >::const_iterator cpepmIter =
Map<Pair<edge>>::const_iterator cpepmIter =
cpepm.find(cutPoints[pointI]);
if (cpepmIter != cpepm.end())

6
src/dynamicMesh/slidingInterface/slidingInterface.H
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
@ -185,7 +185,7 @@ private:
//- Cut edge pairs
// For cut points created by intersection two edges,
// store the master-slave edge pair used in creation
mutable Map<Pair<edge> >* cutPointEdgePairMapPtr_;
mutable Map<Pair<edge>>* cutPointEdgePairMapPtr_;
//- Slave point hit. The index of master point hit by the
// slave point in projection. For no point hit, set to -1
@ -250,7 +250,7 @@ private:
const Map<label>& retiredPointMap() const;
//- Cut point edge pair map
const Map<Pair<edge> >& cutPointEdgePairMap() const;
const Map<Pair<edge>>& cutPointEdgePairMap() const;
//- Clear addressing
void clearAddressing() const;

12
src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.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
@ -210,7 +210,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
// Ditto for cut point edge map. This is a rough guess of its size
//
cutPointEdgePairMapPtr_ =
new Map<Pair<edge> >
new Map<Pair<edge>>
(
faceZones[slaveFaceZoneID_.index()]().nEdges()
);
@ -390,10 +390,10 @@ void Foam::slidingInterface::renumberAttachedAddressing
}
// Renumber the cut point edge pair map. Need to take a copy!
const Map<Pair<edge> > cpepm = cutPointEdgePairMap();
const Map<Pair<edge>> cpepm = cutPointEdgePairMap();
Map<Pair<edge> >* newCpepmPtr = new Map<Pair<edge> >(cpepm.size());
Map<Pair<edge> >& newCpepm = *newCpepmPtr;
Map<Pair<edge>>* newCpepmPtr = new Map<Pair<edge>>(cpepm.size());
Map<Pair<edge>>& newCpepm = *newCpepmPtr;
const labelList cpepmToc = cpepm.toc();
@ -539,7 +539,7 @@ const Foam::Map<Foam::label>& Foam::slidingInterface::retiredPointMap() const
}
const Foam::Map<Foam::Pair<Foam::edge> >&
const Foam::Map<Foam::Pair<Foam::edge>>&
Foam::slidingInterface::cutPointEdgePairMap() const
{
if (!cutPointEdgePairMapPtr_)