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

ENH: Consistency updates after Foundation merge and code tidying

Browse Source
This commit is contained in:
Andrew Heather
2016-04-25 16:46:56 +01:00
parent d3157ac905
commit b9313ef2fe
242 changed files with 923 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/meshTools/AABBTree/AABBTree.C
View File

@ -82,8 +82,8 @@ void Foam::AABBTree<Type>::writeOBJ
const bool writeLinesOnly,
const treeBoundBox& bb,
const label nodeI,
const List<Pair<treeBoundBox> >& bbs,
const List<Pair<label> >& nodes,
const List<Pair<treeBoundBox>>& bbs,
const List<Pair<label>>& nodes,
label& vertI,
Ostream& os
) const
@ -133,7 +133,7 @@ void Foam::AABBTree<Type>::createBoxes
const treeBoundBox& bb,
const label nodeI,
DynamicList<Pair<treeBoundBox> >& bbs,
DynamicList<Pair<treeBoundBox>>& bbs,
DynamicList<labelPair>& nodes,
DynamicList<labelList>& addressing
) const
@ -356,7 +356,7 @@ Foam::AABBTree<Type>::AABBTree
}
DynamicList<Pair<treeBoundBox> > bbs(maxLevel);
DynamicList<Pair<treeBoundBox>> bbs(maxLevel);
DynamicList<labelPair> nodes(maxLevel);
DynamicList<labelList> addr(maxLevel);

6
src/meshTools/AABBTree/AABBTree.H
View File

@ -109,8 +109,8 @@ protected:
const bool writeLinesOnly,
const treeBoundBox& bb,
const label nodeI,
const List<Pair<treeBoundBox> >& bbs,
const List<Pair<label> >& nodes,
const List<Pair<treeBoundBox>>& bbs,
const List<Pair<label>>& nodes,
label& vertI,
Ostream& os
) const;
@ -126,7 +126,7 @@ protected:
const treeBoundBox& bb,
const label nodeI,
DynamicList<Pair<treeBoundBox> >& bbs,
DynamicList<Pair<treeBoundBox>>& bbs,
DynamicList<labelPair>& nodes,
DynamicList<labelList>& addressing
) const;

2
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
View File

@ -1119,7 +1119,7 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::append
)
{
// Create a new interpolation
autoPtr<AMIInterpolation<SourcePatch, TargetPatch> > newPtr
autoPtr<AMIInterpolation<SourcePatch, TargetPatch>> newPtr
(
new AMIInterpolation<SourcePatch, TargetPatch>
(

4
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatchTemplates.C
View File

@ -39,7 +39,7 @@ Foam::tmp<Foam::Field<Type>> Foam::cyclicACMIPolyPatch::interpolate
{
const scalarField& w = AMI().srcWeightsSum();
tmp<Field<Type> > interpField(AMI().interpolateToSource(fldCouple));
tmp<Field<Type>> interpField(AMI().interpolateToSource(fldCouple));
return interpField + (1.0 - w)*fldNonOverlap;
}
@ -47,7 +47,7 @@ Foam::tmp<Foam::Field<Type>> Foam::cyclicACMIPolyPatch::interpolate
{
const scalarField& w = neighbPatch().AMI().tgtWeightsSum();
tmp<Field<Type> > interpField
tmp<Field<Type>> interpField
(
neighbPatch().AMI().interpolateToTarget(fldCouple)
);

4
src/meshTools/algorithms/PointEdgeWave/PointData.H
View File

@ -181,13 +181,13 @@ public:
//- Data associated with PointData types is contiguous
template<>
inline bool contiguous<PointData<scalar> >()
inline bool contiguous<PointData<scalar>>()
{
return true;
}
template<>
inline bool contiguous<PointData<vector> >()
inline bool contiguous<PointData<vector>>()
{
return true;
}

17
src/meshTools/regionSplit/regionSplit.C
View File

@ -344,13 +344,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
// Get the wanted region labels into recvNonLocal
labelListList recvNonLocal(Pstream::nProcs());
labelListList sizes;
Pstream::exchange<labelList, label>
(
sendNonLocal,
recvNonLocal,
sizes
);
Pstream::exchange<labelList, label>(sendNonLocal, recvNonLocal);
// Now we have the wanted compact region labels that procI wants in
// recvNonLocal[procI]. Construct corresponding list of compact
@ -371,14 +365,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
// Send back (into recvNonLocal)
recvNonLocal.clear();
recvNonLocal.setSize(sendWantedLocal.size());
sizes.clear();
Pstream::exchange<labelList, label>
(
sendWantedLocal,
recvNonLocal,
sizes
);
Pstream::exchange<labelList, label>(sendWantedLocal, recvNonLocal);
sendWantedLocal.clear();
// Now recvNonLocal contains for every element in setNonLocal the

10
src/meshTools/searchableSurface/searchableCone.C
View File

@ -30,10 +30,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchableCone, 0);
addToRunTimeSelectionTable(searchableSurface, searchableCone, dict);
defineTypeNameAndDebug(searchableCone, 0);
addToRunTimeSelectionTable(searchableSurface, searchableCone, dict);
}
@ -74,7 +72,7 @@ void Foam::searchableCone::boundingSpheres
Foam::tmp<Foam::pointField> Foam::searchableCone::points() const
{
tmp<pointField> tPts(new pointField(2));
pointField& pts = tPts();
pointField& pts = tPts.ref();
pts[0] = point1_;
pts[1] = point2_;
@ -939,7 +937,7 @@ void Foam::searchableCone::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());

2
src/meshTools/searchableSurface/searchableCone.H
View File

@ -237,7 +237,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- Find any intersection on line from start to end

2
src/meshTools/searchableSurface/searchableRotatedBox.C
View File

@ -295,7 +295,7 @@ void Foam::searchableRotatedBox::findLineAll
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >& info
List<List<pointIndexHit>>& info
) const
{
info.setSize(start.size());

2
src/meshTools/searchableSurface/searchableRotatedBox.H
View File

@ -215,7 +215,7 @@ public:
(
const pointField& start,
const pointField& end,
List<List<pointIndexHit> >&
List<List<pointIndexHit>>&
) const;
//- From a set of points and indices get the region