songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: sampledSet: use non-const access to meshSearch

Browse Source
This commit is contained in:
mattijs 2012-02-03 14:29:55 +00:00
parent 1630b2df9e
commit 561e68f8e1
22 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sampling/sampledSet/circle/circleSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -175,7 +175,7 @@ Foam::circleSet::circleSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& origin,
const vector& circleAxis,
@ -202,7 +202,7 @@ Foam::circleSet::circleSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/circle/circleSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -104,7 +104,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& origin,
const vector& circleAxis,
@ -117,7 +117,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/cloud/cloudSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,7 +108,7 @@ Foam::cloudSet::cloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords
)
@ -129,7 +129,7 @@ Foam::cloudSet::cloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/cloud/cloudSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,7 +89,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords
);
@ -99,7 +99,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/face/faceOnlySet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -331,7 +331,7 @@ Foam::faceOnlySet::faceOnlySet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -354,7 +354,7 @@ Foam::faceOnlySet::faceOnlySet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/face/faceOnlySet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -102,7 +102,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -113,7 +113,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/midPoint/midPointSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -117,7 +117,7 @@ Foam::midPointSet::midPointSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -138,7 +138,7 @@ Foam::midPointSet::midPointSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/midPoint/midPointSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -70,7 +70,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -81,7 +81,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -144,7 +144,7 @@ Foam::midPointAndFaceSet::midPointAndFaceSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -165,7 +165,7 @@ Foam::midPointAndFaceSet::midPointAndFaceSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,7 +71,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -82,7 +82,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/patchCloud/patchCloudSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -266,7 +266,7 @@ Foam::patchCloudSet::patchCloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords,
const labelHashSet& patchSet,
@ -291,7 +291,7 @@ Foam::patchCloudSet::patchCloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/patchCloud/patchCloudSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -94,7 +94,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords,
const labelHashSet& patchSet,
@ -106,7 +106,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

2
src/sampling/sampledSet/patchSeed/patchSeedSet.C
View File

@ -205,7 +205,7 @@ Foam::patchSeedSet::patchSeedSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

14
src/sampling/sampledSet/patchSeed/patchSeedSet.H
View File

@ -95,24 +95,12 @@ public:
// Constructors
// //- Construct from components
// patchSeedSet
// (
// const word& name,
// const polyMesh& mesh,
// meshSearch& searchEngine,
// const word& axis,
// const List<point>& sampleCoords,
// const labelHashSet& patchSet,
// const scalar searchDist
// );
//- Construct from dictionary
patchSeedSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/polyLine/polyLineSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -350,7 +350,7 @@ Foam::polyLineSet::polyLineSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords
)
@ -371,7 +371,7 @@ Foam::polyLineSet::polyLineSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/polyLine/polyLineSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -101,7 +101,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& samplePoints
);
@ -111,7 +111,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

11
src/sampling/sampledSet/sampledSet/sampledSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -406,7 +406,7 @@ Foam::sampledSet::sampledSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis
)
:
@ -423,7 +423,7 @@ Foam::sampledSet::sampledSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:
@ -448,7 +448,7 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
{
@ -462,7 +462,8 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
FatalErrorIn
(
"sampledSet::New"
"(const word&, const polyMesh&, meshSearch&, const dictionary&)"
"(const word&, const polyMesh&, const meshSearch&"
", const dictionary&)"
) << "Unknown sample type "
<< sampleType << nl << nl
<< "Valid sample types : " << endl

18
src/sampling/sampledSet/sampledSet/sampledSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,7 +69,7 @@ class sampledSet
const polyMesh& mesh_;
//- Reference to mesh searching class
meshSearch& searchEngine_;
const meshSearch& searchEngine_;
protected:
@ -159,7 +159,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
),
(name, mesh, searchEngine, dict)
@ -171,11 +171,11 @@ public:
class iNew
{
const polyMesh& mesh_;
meshSearch& searchEngine_;
const meshSearch& searchEngine_;
public:
iNew(const polyMesh& mesh, meshSearch& searchEngine)
iNew(const polyMesh& mesh, const meshSearch& searchEngine)
:
mesh_(mesh),
searchEngine_(searchEngine)
@ -204,7 +204,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis
);
@ -213,7 +213,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);
@ -232,7 +232,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);
@ -248,7 +248,7 @@ public:
return mesh_;
}
meshSearch& searchEngine() const
const meshSearch& searchEngine() const
{
return searchEngine_;
}

4
src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,7 +108,7 @@ Foam::triSurfaceMeshPointSet::triSurfaceMeshPointSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

4
src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -90,7 +90,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/uniform/uniformSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -425,7 +425,7 @@ Foam::uniformSet::uniformSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end,
@ -450,7 +450,7 @@ Foam::uniformSet::uniformSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/uniform/uniformSet.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-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -118,7 +118,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end,
@ -130,7 +130,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);