zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made all template declarations consistent using 'class' rather than 'typename'

Browse Source
This commit is contained in:
Henry Weller
2016-03-22 15:02:55 +00:00
parent 055a113f10
commit 44c73bfbe1
37 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,7 +75,7 @@ namespace DelaunayMeshTools
//- Write Delaunay points in the range between (and including)
// type startPointType and endPointType to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeOBJ
(
const fileName& fName,
@ -85,7 +85,7 @@ namespace DelaunayMeshTools
);
//- Write Delaunay points of type pointType to .obj file
template<typename Triangulation>
template<class Triangulation>
void writeOBJ
(
const fileName& fName,
@ -94,15 +94,15 @@ namespace DelaunayMeshTools
);
//- Write the fixed Delaunay points to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeFixedPoints(const fileName& fName, const Triangulation& t);
//- Write the boundary Delaunay points to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeBoundaryPoints(const fileName& fName, const Triangulation& t);
//- Write the processor interface to an OBJ file
template<typename Triangulation>
template<class Triangulation>
void writeProcessorInterface
(
const fileName& fName,
@ -112,7 +112,7 @@ namespace DelaunayMeshTools
//- Write the internal Delaunay vertices of the tessellation as a
// pointField that may be used to restart the meshing process
template<typename Triangulation>
template<class Triangulation>
void writeInternalDelaunayVertices
(
const fileName& instance,
@ -121,14 +121,14 @@ namespace DelaunayMeshTools
//- Draws a tet cell to an output stream. The offset is supplied as the tet
// number to be drawn.
template<typename CellHandle>
template<class CellHandle>
void drawDelaunayCell(Ostream& os, const CellHandle& c, label offset = 0);
// Field extraction
//- Extract all points in vertex-index order
template<typename Triangulation>
template<class Triangulation>
tmp<pointField> allPoints(const Triangulation& t);

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C
View File

@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeOBJ
(
const fileName& fName,
@ -77,7 +77,7 @@ void Foam::DelaunayMeshTools::writeOBJ
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeOBJ
(
const fileName& fName,
@ -89,7 +89,7 @@ void Foam::DelaunayMeshTools::writeOBJ
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeFixedPoints
(
const fileName& fName,
@ -117,7 +117,7 @@ void Foam::DelaunayMeshTools::writeFixedPoints
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeBoundaryPoints
(
const fileName& fName,
@ -145,7 +145,7 @@ void Foam::DelaunayMeshTools::writeBoundaryPoints
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeProcessorInterface
(
const fileName& fName,
@ -175,7 +175,7 @@ void Foam::DelaunayMeshTools::writeProcessorInterface
}
template<typename Triangulation>
template<class Triangulation>
void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
(
const fileName& instance,
@ -224,7 +224,7 @@ void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
}
template<typename CellHandle>
template<class CellHandle>
void Foam::DelaunayMeshTools::drawDelaunayCell
(
Ostream& os,
@ -273,7 +273,7 @@ void Foam::DelaunayMeshTools::drawDelaunayCell
}
template<typename Triangulation>
template<class Triangulation>
Foam::tmp<Foam::pointField> Foam::DelaunayMeshTools::allPoints
(
const Triangulation& t

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
View File

@ -225,7 +225,7 @@ public:
);
//- Distribute supplied the points to the appropriate processor
template<typename PointType>
template<class PointType>
autoPtr<mapDistribute> distributePoints(List<PointType>& points) const;
//- Is the given position inside the domain of this decomposition
@ -263,7 +263,7 @@ public:
) const;
//- What processor is the given position on?
template<typename PointType>
template<class PointType>
labelList processorPosition(const List<PointType>& pts) const;
//- What is the nearest processor to the given position?

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<typename PointType>
template<class PointType>
Foam::autoPtr<Foam::mapDistribute>
Foam::backgroundMeshDecomposition::distributePoints
(
@ -45,7 +45,7 @@ Foam::backgroundMeshDecomposition::distributePoints
}
template<typename PointType>
template<class PointType>
Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
(
const List<PointType>& pts

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
View File

@ -119,7 +119,7 @@ public:
typedef typename Cb::Vertex_handle Vertex_handle;
typedef typename Cb::Cell_handle Cell_handle;
template<typename TDS2>
template<class TDS2>
struct Rebind_TDS
{
typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2;

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,7 +29,7 @@ License
#include "CGALTriangulation3DKernel.H"
template<typename Cell>
template<class Cell>
Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
(
Cell& c,
@ -74,7 +74,7 @@ Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
}
template<typename Cell>
template<class Cell>
bool Foam::foamyHexMeshChecks::closePoints
(
Cell& c,
@ -104,7 +104,7 @@ bool Foam::foamyHexMeshChecks::closePoints
}
template<typename Cell>
template<class Cell>
bool Foam::foamyHexMeshChecks::smallVolume
(
Cell& c,

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,21 +34,21 @@ namespace Foam
namespace foamyHexMeshChecks
{
template<typename Cell>
template<class Cell>
scalar coplanarTet
(
Cell& c,
const scalar tol = 1e-12
);
template<typename Cell>
template<class Cell>
bool closePoints
(
Cell& c,
const scalar tol = 1e-12
);
template<typename Cell>
template<class Cell>
bool smallVolume
(
Cell& c,

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -50,10 +50,10 @@ namespace indexedCellOps
{
//- Does the Dual vertex form part of a processor patch
template<typename CellType>
template<class CellType>
Foam::label dualVertexMasterProc(const CellType& c);
template<typename CellType>
template<class CellType>
Foam::FixedList<Foam::label, 4> processorsAttached(const CellType& c);
} // End namespace indexedCellOps

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<typename CellType>
template<class CellType>
Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
{
if (!c->parallelDualVertex())
@ -56,7 +56,7 @@ Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
}
template<typename CellType>
template<class CellType>
Foam::FixedList<Foam::label, 4>
CGAL::indexedCellOps::processorsAttached(const CellType& c)
{

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
View File

@ -134,7 +134,7 @@ public:
typedef typename Tds::Vertex_handle Vertex_handle;
typedef typename Tds::Cell_handle Cell_handle;
template<typename TDS2>
template<class TDS2>
struct Rebind_TDS
{
typedef typename Vb::template Rebind_TDS<TDS2>::Other Vb2;

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -50,11 +50,11 @@ namespace indexedVertexOps
//- Return the target cell size from that stored on a pair of Delaunay vertices,
// using a mean function.
template<typename VertexType>
template<class VertexType>
Foam::scalar averageCellSize(const VertexType& vA, const VertexType& vB);
template<typename VertexType>
template<class VertexType>
inline bool uninitialised(const VertexType& v);
} // End namespace indexedVertexOps

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<typename VertexType>
template<class VertexType>
Foam::scalar CGAL::indexedVertexOps::averageCellSize
(
const VertexType& vA,
@ -47,7 +47,7 @@ Foam::scalar CGAL::indexedVertexOps::averageCellSize
}
template<typename VertexType>
template<class VertexType>
inline bool CGAL::indexedVertexOps::uninitialised(const VertexType& v)
{
return v->type() == Foam::indexedVertexEnum::vtUnassigned;

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H
View File

@ -54,7 +54,7 @@ namespace Foam
#ifdef CGAL_INEXACT
template<typename Point>
template<class Point>
inline pointFromPoint topoint(const Point& P)
{
return reinterpret_cast<pointFromPoint>(P);
@ -67,7 +67,7 @@ namespace Foam
#else
template<typename Point>
template<class Point>
inline pointFromPoint topoint(const Point& P)
{
return Foam::point

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.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
@ -50,7 +50,7 @@ namespace vectorTools
//- Test if a and b are parallel: a^b = 0
// Uses the cross product, so the tolerance is proportional to
// the sine of the angle between a and b in radians
template<typename T>
template<class T>
bool areParallel
(
const Vector<T>& a,
@ -67,7 +67,7 @@ namespace vectorTools
//- Test if a and b are orthogonal: a.b = 0
// Uses the dot product, so the tolerance is proportional to
// the cosine of the angle between a and b in radians
template<typename T>
template<class T>
bool areOrthogonal
(
const Vector<T>& a,
@ -79,7 +79,7 @@ namespace vectorTools
}
//- Test if angle between a and b is acute: a.b > 0
template<typename T>
template<class T>
bool areAcute
(
const Vector<T>& a,
@ -90,7 +90,7 @@ namespace vectorTools
}
//- Test if angle between a and b is obtuse: a.b < 0
template<typename T>
template<class T>
bool areObtuse
(
const Vector<T>& a,
@ -101,7 +101,7 @@ namespace vectorTools
}
//- Calculate angle between a and b in radians
template<typename T>
template<class T>
T cosPhi
(
const Vector<T>& a,
@ -116,7 +116,7 @@ namespace vectorTools
}
//- Calculate angle between a and b in radians
template<typename T>
template<class T>
T radAngleBetween
(
const Vector<T>& a,
@ -131,7 +131,7 @@ namespace vectorTools
}
//- Calculate angle between a and b in degrees
template<typename T>
template<class T>
T degAngleBetween
(
const Vector<T>& a,

2
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H
View File

@ -70,7 +70,7 @@ public:
typedef typename Fb::Vertex_handle Vertex_handle;
typedef typename Fb::Face_handle Face_handle;
template<typename TDS2>
template<class TDS2>
struct Rebind_TDS
{
typedef typename Fb::template Rebind_TDS<TDS2>::Other Fb2;

2
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H
View File

@ -105,7 +105,7 @@ public:
typedef typename Vb::Face_handle Face_handle;
typedef typename Vb::Point Point;
template<typename TDS2>
template<class TDS2>
struct Rebind_TDS
{
typedef typename Vb::template Rebind_TDS<TDS2>::Other Vb2;

2
src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.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

2
src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.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

4
src/OpenFOAM/memory/tmp/tmpI.H
View File

@ -372,7 +372,7 @@ inline void Foam::tmp<T>::operator=(const tmp<T>& t)
//- Return the const reference of the non-const reference argument
template<typename T>
template<class T>
inline const T& Const(T& t)
{
return t;
@ -380,7 +380,7 @@ inline const T& Const(T& t)
//- Return the const reference of the non-const rvalue reference argument
template<typename T>
template<class T>
inline const T& Const(T&& t)
{
return t;

4
src/OpenFOAM/memory/tmpNrc/tmpNrcI.H
View File

@ -302,7 +302,7 @@ inline void Foam::tmpNrc<T>::operator=(const tmpNrc<T>& t)
//- Return the const reference of the non-const reference argument
template<typename T>
template<class T>
inline const T& Const(T& t)
{
return t;
@ -310,7 +310,7 @@ inline const T& Const(T& t)
//- Return the const reference of the non-const rvalue reference argument
template<typename T>
template<class T>
inline const T& Const(T&& t)
{
return t;

2
src/OpenFOAM/primitives/nullObject/nullObjectI.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

4
src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
View File

@ -89,10 +89,10 @@ class polyMeshFilter
// Private Member Functions
template<typename T>
template<class T>
static void updateSets(const mapPolyMesh& map);
template<typename T>
template<class T>
static void copySets(const polyMesh& oldMesh, const polyMesh& newMesh);
label filterFacesLoop(const label nOriginalBadFaces);

6
src/dynamicMesh/polyMeshFilter/polyMeshFilterTemplates.C
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
@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * * //
template<typename SetType>
template<class SetType>
void Foam::polyMeshFilter::updateSets(const mapPolyMesh& map)
{
HashTable<const SetType*> sets =
@ -66,7 +66,7 @@ void Foam::polyMeshFilter::updateSets(const mapPolyMesh& map)
}
template<typename SetType>
template<class SetType>
void Foam::polyMeshFilter::copySets
(
const polyMesh& oldMesh,