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

10
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.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
@ -531,8 +531,8 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
// edge for extrusion.
List<List<point> > edgeFaceNormals(pp.nEdges());
List<List<bool> > edgeFaceExtrude(pp.nEdges());
List<List<point>> edgeFaceNormals(pp.nEdges());
List<List<bool>> edgeFaceExtrude(pp.nEdges());
const labelListList& edgeFaces = pp.edgeFaces();
const vectorField& faceNormals = pp.faceNormals();
@ -557,7 +557,7 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
mesh,
meshEdges,
edgeFaceNormals,
globalMeshData::ListPlusEqOp<List<point> >(), // combine operator
globalMeshData::ListPlusEqOp<List<point>>(), // combine operator
List<point>() // null value
);
@ -566,7 +566,7 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
mesh,
meshEdges,
edgeFaceExtrude,
globalMeshData::ListPlusEqOp<List<bool> >(), // combine operator
globalMeshData::ListPlusEqOp<List<bool>>(), // combine operator
List<bool>() // null value
);

62
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.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
@ -189,9 +189,9 @@ class autoSnapDriver
const vectorField& faceSurfaceNormal,
const labelList& faceSurfaceRegion,
List<List<point> >& pointFaceSurfNormals,
List<List<point> >& pointFaceDisp,
List<List<point> >& pointFaceCentres,
List<List<point>>& pointFaceSurfNormals,
List<List<point>>& pointFaceDisp,
List<List<point>>& pointFaceCentres,
List<labelList>& pointFacePatchID
) const;
void correctAttraction
@ -233,7 +233,7 @@ class autoSnapDriver
const indirectPrimitivePatch& pp,
const scalarField& snapDist,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
const vectorField& rawPatchAttraction,
@ -302,9 +302,9 @@ class autoSnapDriver
const vectorField& nearestDisp,
const label pointI,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
DynamicList<point>& surfacePoints,
@ -326,9 +326,9 @@ class autoSnapDriver
const scalarField& snapDist,
const vectorField& nearestDisp,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
vectorField& patchAttraction,
@ -347,16 +347,16 @@ class autoSnapDriver
const scalarField& snapDist,
const vectorField& nearestDisp,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
List<labelList>& pointAttractor,
List<List<pointConstraint> >& pointConstraints,
List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
List<List<DynamicList<point> > >& edgeAttractors,
List<List<DynamicList<pointConstraint> > >& edgeConstraints,
List<List<DynamicList<point>>>& edgeAttractors,
List<List<DynamicList<pointConstraint>>>& edgeConstraints,
vectorField& patchAttraction,
List<pointConstraint>& patchConstraints
) const;
@ -373,10 +373,10 @@ class autoSnapDriver
// Feature-point to pp point
List<labelList>& pointAttractor,
List<List<pointConstraint> >& pointConstraints,
List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
List<List<DynamicList<point> > >& edgeAttractors,
List<List<DynamicList<pointConstraint> > >& edgeConstraints,
List<List<DynamicList<point>>>& edgeAttractors,
List<List<DynamicList<pointConstraint>>>& edgeConstraints,
// pp point to nearest feature
vectorField& patchAttraction,
List<pointConstraint>& patchConstraints
@ -390,10 +390,10 @@ class autoSnapDriver
// Feature-point to pp point
const List<labelList>& pointAttractor,
const List<List<pointConstraint> >& pointConstraints,
const List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
const List<List<DynamicList<point> > >& edgeAttractors,
const List<List<DynamicList<pointConstraint> > >&,
const List<List<DynamicList<point>>>& edgeAttractors,
const List<List<DynamicList<pointConstraint>>>&,
const vectorField& rawPatchAttraction,
const List<pointConstraint>& rawPatchConstraints,
@ -415,8 +415,8 @@ class autoSnapDriver
const label pointI,
const point& estimatedPt,
List<List<DynamicList<point> > >&,
List<List<DynamicList<pointConstraint> > >&,
List<List<DynamicList<point>>>&,
List<List<DynamicList<pointConstraint>>>&,
vectorField&,
List<pointConstraint>&
) const;
@ -438,10 +438,10 @@ class autoSnapDriver
// Feature-point to pp point
List<labelList>& pointAttractor,
List<List<pointConstraint> >& pointConstraints,
List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
List<List<DynamicList<point> > >& edgeAttractors,
List<List<DynamicList<pointConstraint> > >& edgeConstraints,
List<List<DynamicList<point>>>& edgeAttractors,
List<List<DynamicList<pointConstraint>>>& edgeConstraints,
// pp point to nearest feature
vectorField& patchAttraction,
List<pointConstraint>& patchConstraints
@ -457,9 +457,9 @@ class autoSnapDriver
const scalarField& snapDist,
const vectorField& nearestDisp,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
vectorField& patchAttraction,

80
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.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
@ -450,9 +450,9 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
const vectorField& faceSurfaceNormal,
const labelList& faceSurfaceGlobalRegion,
List<List<point> >& pointFaceSurfNormals,
List<List<point> >& pointFaceDisp,
List<List<point> >& pointFaceCentres,
List<List<point>>& pointFaceSurfNormals,
List<List<point>>& pointFaceDisp,
List<List<point>>& pointFaceCentres,
List<labelList>& pointFacePatchID
) const
{
@ -827,9 +827,9 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
const vectorField& nearestDisp,
const label pointI,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
DynamicList<point>& surfacePoints,
@ -1020,9 +1020,9 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
const scalarField& snapDist,
const vectorField& nearestDisp,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
vectorField& patchAttraction,
@ -1314,7 +1314,7 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
const indirectPrimitivePatch& pp,
const scalarField& snapDist,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
const vectorField& rawPatchAttraction,
@ -1609,8 +1609,8 @@ Foam::autoSnapDriver::findNearFeatureEdge
const label pointI,
const point& estimatedPt,
List<List<DynamicList<point> > >& edgeAttractors,
List<List<DynamicList<pointConstraint> > >& edgeConstraints,
List<List<DynamicList<point>>>& edgeAttractors,
List<List<DynamicList<pointConstraint>>>& edgeConstraints,
vectorField& patchAttraction,
List<pointConstraint>& patchConstraints
) const
@ -1679,10 +1679,10 @@ Foam::autoSnapDriver::findNearFeaturePoint
// Feature-point to pp point
List<labelList>& pointAttractor,
List<List<pointConstraint> >& pointConstraints,
List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
List<List<DynamicList<point> > >& edgeAttractors,
List<List<DynamicList<pointConstraint> > >& edgeConstraints,
List<List<DynamicList<point>>>& edgeAttractors,
List<List<DynamicList<pointConstraint>>>& edgeConstraints,
// pp point to nearest feature
vectorField& patchAttraction,
List<pointConstraint>& patchConstraints
@ -1783,17 +1783,17 @@ void Foam::autoSnapDriver::determineFeatures
const scalarField& snapDist,
const vectorField& nearestDisp,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
// Feature-point to pp point
List<labelList>& pointAttractor,
List<List<pointConstraint> >& pointConstraints,
List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
List<List<DynamicList<point> > >& edgeAttractors,
List<List<DynamicList<pointConstraint> > >& edgeConstraints,
List<List<DynamicList<point>>>& edgeAttractors,
List<List<DynamicList<pointConstraint>>>& edgeConstraints,
// pp point to nearest feature
vectorField& patchAttraction,
List<pointConstraint>& patchConstraints
@ -2205,10 +2205,10 @@ void Foam::autoSnapDriver::determineBaffleFeatures
// Feature-point to pp point
List<labelList>& pointAttractor,
List<List<pointConstraint> >& pointConstraints,
List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
List<List<DynamicList<point> > >& edgeAttractors,
List<List<DynamicList<pointConstraint> > >& edgeConstraints,
List<List<DynamicList<point>>>& edgeAttractors,
List<List<DynamicList<pointConstraint>>>& edgeConstraints,
// pp point to nearest feature
vectorField& patchAttraction,
List<pointConstraint>& patchConstraints
@ -2218,7 +2218,7 @@ void Foam::autoSnapDriver::determineBaffleFeatures
const refinementFeatures& features = meshRefiner_.features();
// Calculate edge-faces
List<List<point> > edgeFaceNormals(pp.nEdges());
List<List<point>> edgeFaceNormals(pp.nEdges());
// Fill local data
forAll(pp.edgeFaces(), edgeI)
@ -2462,10 +2462,10 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
// Feature-point to pp point
const List<labelList>& pointAttractor,
const List<List<pointConstraint> >& pointConstraints,
const List<List<pointConstraint>>& pointConstraints,
// Feature-edge to pp point
const List<List<DynamicList<point> > >& edgeAttractors,
const List<List<DynamicList<pointConstraint> > >& edgeConstraints,
const List<List<DynamicList<point>>>& edgeAttractors,
const List<List<DynamicList<pointConstraint>>>& edgeConstraints,
const vectorField& rawPatchAttraction,
const List<pointConstraint>& rawPatchConstraints,
@ -2594,8 +2594,8 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
forAll(edgeAttractors, featI)
{
const List<DynamicList<point> >& edgeAttr = edgeAttractors[featI];
const List<DynamicList<pointConstraint> >& edgeConstr =
const List<DynamicList<point>>& edgeAttr = edgeAttractors[featI];
const List<DynamicList<pointConstraint>>& edgeConstr =
edgeConstraints[featI];
forAll(edgeAttr, featEdgeI)
@ -2723,9 +2723,9 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
const scalarField& snapDist,
const vectorField& nearestDisp,
const List<List<point> >& pointFaceSurfNormals,
const List<List<point> >& pointFaceDisp,
const List<List<point> >& pointFaceCentres,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
const List<List<point>>& pointFaceCentres,
const labelListList& pointFacePatchID,
vectorField& patchAttraction,
@ -2739,8 +2739,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
// Per feature, per feature-edge a list of attraction points and their
// originating vertex.
List<List<DynamicList<point> > > edgeAttractors(features.size());
List<List<DynamicList<pointConstraint> > > edgeConstraints
List<List<DynamicList<point>>> edgeAttractors(features.size());
List<List<DynamicList<pointConstraint>>> edgeConstraints
(
features.size()
);
@ -2755,7 +2755,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
// This list is only used to subset the feature-points that are actually
// used.
List<labelList> pointAttractor(features.size());
List<List<pointConstraint> > pointConstraints(features.size());
List<List<pointConstraint>> pointConstraints(features.size());
forAll(features, featI)
{
label nFeatPoints = features[featI].points().size();
@ -3076,9 +3076,9 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
// - faceSurfaceNormal
// - faceDisp
// - faceCentres
List<List<point> > pointFaceSurfNormals;
List<List<point> > pointFaceDisp;
List<List<point> > pointFaceCentres;
List<List<point>> pointFaceSurfNormals;
List<List<point>> pointFaceDisp;
List<List<point>> pointFaceCentres;
List<labelList> pointFacePatchID;
{

14
src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -63,9 +63,9 @@ Foam::labelList Foam::medialAxisMeshMover::getFixedValueBCs
const pointPatchField<vector>& patchFld =
fld.boundaryField()[patchI];
if (isA<valuePointPatchField<vector> >(patchFld))
if (isA<valuePointPatchField<vector>>(patchFld))
{
if (isA<zeroFixedValuePointPatchField<vector> >(patchFld))
if (isA<zeroFixedValuePointPatchField<vector>>(patchFld))
{
// Special condition of fixed boundary condition. Does not
// get adapted
@ -1116,8 +1116,8 @@ handleFeatureAngleLayerTerminations
// edge for extrusion.
List<List<point> > edgeFaceNormals(pp.nEdges());
List<List<bool> > edgeFaceExtrude(pp.nEdges());
List<List<point>> edgeFaceNormals(pp.nEdges());
List<List<bool>> edgeFaceExtrude(pp.nEdges());
const labelListList& edgeFaces = pp.edgeFaces();
const vectorField& faceNormals = pp.faceNormals();
@ -1141,7 +1141,7 @@ handleFeatureAngleLayerTerminations
mesh(),
meshEdges,
edgeFaceNormals,
globalMeshData::ListPlusEqOp<List<point> >(), // combine operator
globalMeshData::ListPlusEqOp<List<point>>(), // combine operator
List<point>() // null value
);
@ -1150,7 +1150,7 @@ handleFeatureAngleLayerTerminations
mesh(),
meshEdges,
edgeFaceExtrude,
globalMeshData::ListPlusEqOp<List<bool> >(), // combine operator
globalMeshData::ListPlusEqOp<List<bool>>(), // combine operator
List<bool>() // null value
);

10
src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -99,9 +99,9 @@ public:
);
//- Construct and return a clone
virtual autoPtr<pointPatchField<Type> > clone() const
virtual autoPtr<pointPatchField<Type>> clone() const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new zeroFixedValuePointPatchField<Type>
(
@ -119,12 +119,12 @@ public:
//- Construct and return a clone setting internal field reference
virtual autoPtr<pointPatchField<Type> > clone
virtual autoPtr<pointPatchField<Type>> clone
(
const DimensionedField<Type, pointMesh>& iF
) const
{
return autoPtr<pointPatchField<Type> >
return autoPtr<pointPatchField<Type>>
(
new zeroFixedValuePointPatchField<Type>
(

8
src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.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
@ -1015,7 +1015,7 @@ Pout<< "face:" << faceI << " verts:" << f
//
//
// // Transfer lists.
// PtrList<HashSet<edge, Hash<edge> > > regionConnectivity
// PtrList<HashSet<edge, Hash<edge>>> regionConnectivity
// (Pstream::nProcs());
// forAll(regionConnectivity, procI)
// {
@ -1024,7 +1024,7 @@ Pout<< "face:" << faceI << " verts:" << f
// regionConnectivity.set
// (
// procI,
// new HashSet<edge, Hash<edge> >
// new HashSet<edge, Hash<edge>>
// (
// coupledRegionToShifted.size()
// / Pstream::nProcs()
@ -1123,7 +1123,7 @@ Pout<< "face:" << faceI << " verts:" << f
// {
// for
// (
// HashSet<edge, Hash<edge> >::const_iterator iter =
// HashSet<edge, Hash<edge>>::const_iterator iter =
// regionConnectivity[procI].begin();
// iter != regionConnectivity[procI].end();
// ++iter

8
src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.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
@ -184,7 +184,7 @@ private:
labelIOList surfaceIndex_;
//- User supplied face based data.
List<Tuple2<mapType, labelList> > userFaceData_;
List<Tuple2<mapType, labelList>> userFaceData_;
//- Meshed patches - are treated differently. Stored as wordList since
// order changes.
@ -673,12 +673,12 @@ public:
// topo changes. Every entry is a list over all faces.
// Bit of a hack. Additional flag to say whether to maintain master
// only (false) or increase set to account for face-from-face.
const List<Tuple2<mapType, labelList> >& userFaceData() const
const List<Tuple2<mapType, labelList>>& userFaceData() const
{
return userFaceData_;
}
List<Tuple2<mapType, labelList> >& userFaceData()
List<Tuple2<mapType, labelList>>& userFaceData()
{
return userFaceData_;
}

12
src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.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
@ -185,7 +185,7 @@ void Foam::refinementFeatures::read
if (dict.found("levels"))
{
List<Tuple2<scalar, label> > distLevels(dict["levels"]);
List<Tuple2<scalar, label>> distLevels(dict["levels"]);
if (dict.size() < 1)
{
@ -298,16 +298,16 @@ void Foam::refinementFeatures::buildTrees(const label featI)
}
const Foam::PtrList<Foam::indexedOctree<Foam::treeDataEdge> >&
const Foam::PtrList<Foam::indexedOctree<Foam::treeDataEdge>>&
Foam::refinementFeatures::regionEdgeTrees() const
{
if (!regionEdgeTreesPtr_.valid())
{
regionEdgeTreesPtr_.reset
(
new PtrList<indexedOctree<treeDataEdge> >(size())
new PtrList<indexedOctree<treeDataEdge>>(size())
);
PtrList<indexedOctree<treeDataEdge> >& trees = regionEdgeTreesPtr_();
PtrList<indexedOctree<treeDataEdge>>& trees = regionEdgeTreesPtr_();
forAll(*this, featI)
{
@ -597,7 +597,7 @@ void Foam::refinementFeatures::findNearestRegionEdge
nearNormal = vector::zero;
const PtrList<indexedOctree<treeDataEdge> >& regionTrees =
const PtrList<indexedOctree<treeDataEdge>>& regionTrees =
regionEdgeTrees();
forAll(regionTrees, featI)

14
src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.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
@ -64,13 +64,13 @@ private:
labelListList levels_;
//- Edge
PtrList<indexedOctree<treeDataEdge> > edgeTrees_;
PtrList<indexedOctree<treeDataEdge>> edgeTrees_;
//- Features points
PtrList<indexedOctree<treeDataPoint> > pointTrees_;
PtrList<indexedOctree<treeDataPoint>> pointTrees_;
//- Region edge trees (demand driven)
mutable autoPtr<PtrList<indexedOctree<treeDataEdge> > >
mutable autoPtr<PtrList<indexedOctree<treeDataEdge>>>
regionEdgeTreesPtr_;
@ -93,18 +93,18 @@ private:
protected:
const PtrList<indexedOctree<treeDataEdge> >& edgeTrees() const
const PtrList<indexedOctree<treeDataEdge>>& edgeTrees() const
{
return edgeTrees_;
}
const PtrList<indexedOctree<treeDataPoint> >& pointTrees() const
const PtrList<indexedOctree<treeDataPoint>>& pointTrees() const
{
return pointTrees_;
}
const PtrList<indexedOctree<treeDataEdge> >& regionEdgeTrees() const;
const PtrList<indexedOctree<treeDataEdge>>& regionEdgeTrees() const;
public:

20
src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.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
@ -74,11 +74,11 @@ Foam::refinementSurfaces::refinementSurfaces
labelList globalLevelIncr(surfI, 0);
scalarField globalAngle(surfI, -GREAT);
PtrList<dictionary> globalPatchInfo(surfI);
List<Map<label> > regionMinLevel(surfI);
List<Map<label> > regionMaxLevel(surfI);
List<Map<label> > regionLevelIncr(surfI);
List<Map<scalar> > regionAngle(surfI);
List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
List<Map<label>> regionMinLevel(surfI);
List<Map<label>> regionMaxLevel(surfI);
List<Map<label>> regionLevelIncr(surfI);
List<Map<scalar>> regionAngle(surfI);
List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
HashSet<word> unmatchedKeys(surfacesDict.toc());
@ -289,8 +289,8 @@ Foam::refinementSurfaces::refinementSurfaces
perpendicularAngle_[globalRegionI] = regionAngle[surfI][iter.key()];
}
const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
{
label globalRegionI = regionOffset_[surfI] + iter.key();
@ -621,7 +621,7 @@ void Foam::refinementSurfaces::findAllHigherIntersections
}
// Work arrays
List<List<pointIndexHit> > hitInfo;
List<List<pointIndexHit>> hitInfo;
labelList pRegions;
vectorField pNormals;
@ -711,7 +711,7 @@ void Foam::refinementSurfaces::findAllHigherIntersections
}
// Work arrays
List<List<pointIndexHit> > hitInfo;
List<List<pointIndexHit>> hitInfo;
labelList pRegions;
vectorField pNormals;

4
src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.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
@ -60,7 +60,7 @@ const NamedEnum<shellSurfaces::refineMode, 3> shellSurfaces::refineModeNames_;
void Foam::shellSurfaces::setAndCheckLevels
(
const label shellI,
const List<Tuple2<scalar, label> >& distLevels
const List<Tuple2<scalar, label>>& distLevels
)
{
if (modes_[shellI] != DISTANCE && distLevels.size() != 1)

4
src/mesh/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.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
@ -97,7 +97,7 @@ private:
void setAndCheckLevels
(
const label shellI,
const List<Tuple2<scalar, label> >&
const List<Tuple2<scalar, label>>&
);
void orient();

6
src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.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
@ -79,7 +79,7 @@ public:
//- Class used to pass tracking data to the trackToFace function
class trackingData
:
public particle::TrackingData<Cloud<trackedParticle> >
public particle::TrackingData<Cloud<trackedParticle>>
{
public:
@ -97,7 +97,7 @@ public:
List<PackedBoolList>& featureEdgeVisited
)
:
particle::TrackingData<Cloud<trackedParticle> >(cloud),
particle::TrackingData<Cloud<trackedParticle>>(cloud),
maxLevel_(maxLevel),
featureEdgeVisited_(featureEdgeVisited)
{}

8
src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -117,7 +117,7 @@ void setBlockFaceCorrespondence
const cellList& topoCells,
const faceList::subList& topoInternalFaces,
const labelList& topoFaceCell,
List<Pair<label> >& mergeBlock
List<Pair<label>>& mergeBlock
)
{
forAll(topoInternalFaces, topoFacei)
@ -338,7 +338,7 @@ void Foam::blockMesh::calcMergeInfoFast()
topology().nInternalFaces()
);
List<Pair<label> > mergeBlockP(topoInternalFaces.size());
List<Pair<label>> mergeBlockP(topoInternalFaces.size());
setBlockFaceCorrespondence
(
topoCells,
@ -347,7 +347,7 @@ void Foam::blockMesh::calcMergeInfoFast()
mergeBlockP
);
List<Pair<label> > mergeBlockN(topoInternalFaces.size());
List<Pair<label>> mergeBlockN(topoInternalFaces.size());
setBlockFaceCorrespondence
(
topoCells,

4
src/mesh/extrudeModel/radial/radial.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,7 +51,7 @@ class radial
{
// Private data
autoPtr<DataEntry<scalar> > R_;
autoPtr<DataEntry<scalar>> R_;
public: