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

STYLE: use move insert in featurePointConformer

Browse Source
This commit is contained in:
Mark Olesen
2019-09-30 09:40:59 +02:00
committed by Andrew Heather
parent a1727f4ba5
commit dcff32ea65
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2013-2016 OpenFOAM Foundation | Copyright (C) 2013-2016 OpenFOAM Foundation
@ -125,7 +125,7 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
const label ptI const label ptI
) const ) const
{ {
typedef DynamicList<autoPtr<plane>> planeDynList; typedef DynamicList<autoPtr<plane>> planeDynList;
typedef Foam::indexedVertexEnum::vertexType vertexType; typedef Foam::indexedVertexEnum::vertexType vertexType;
forAll(masterPoints, pI) forAll(masterPoints, pI)
@ -135,8 +135,6 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
const Foam::point& masterPt = masterPoints[pI]; const Foam::point& masterPt = masterPoints[pI];
const vertexType masterType = masterPointsTypes[pI]; const vertexType masterType = masterPointsTypes[pI];
// Info<< " Master = " << masterPt << endl;
pts.append pts.append
( (
Vb Vb
@ -162,8 +160,6 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
const Foam::point slavePt = reflPlane.mirror(masterPt); const Foam::point slavePt = reflPlane.mirror(masterPt);
// Info<< " Slave " << planeI << " = " << slavePt << endl;
const vertexType slaveType = const vertexType slaveType =
( (
masterType == Vb::vtInternalFeaturePoint masterType == Vb::vtInternalFeaturePoint
@ -270,7 +266,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
Foam::point pt = featPt + pointMotionDirection; Foam::point pt = featPt + pointMotionDirection;
planeDynList firstPlane; planeDynList firstPlane;
firstPlane.append(autoPtr<plane>(new plane(featPt, n))); firstPlane.append(autoPtr<plane>::New(featPt, n));
masterPoints.append(pt); masterPoints.append(pt);
@ -281,18 +277,10 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
: Vb::vtInternalFeaturePoint // false : Vb::vtInternalFeaturePoint // false
); );
//Info<< " " << " " << firstPlane << endl;
// const Foam::point reflectedPoint = reflectPointInPlane
// (
// masterPoints.last(),
// firstPlane.last()()
// );
masterPointReflections.insert masterPointReflections.insert
( (
masterPoints.size() - 1, masterPoints.size() - 1,
firstPlane std::move(firstPlane)
); );
} }
// else if // else if
@ -305,7 +293,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
// Foam::point pt = featPt + pointMotionDirection; // Foam::point pt = featPt + pointMotionDirection;
// //
// planeDynList firstPlane; // planeDynList firstPlane;
// firstPlane.append(autoPtr<plane>(new plane(featPt, n))); // firstPlane.append(autoPtr<plane>::New(featPt, n));
// //
// masterPoints.append(pt); // masterPoints.append(pt);
// //
@ -338,7 +326,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
masterPointReflections[masterPoints.size() - 1].append masterPointReflections[masterPoints.size() - 1].append
( (
autoPtr<plane>(new plane(featPt, n)) autoPtr<plane>::New(featPt, n)
); );
} }