Commit 60513758 authored by Mark Olesen's avatar Mark Olesen

COMP: template specialization in incorrect namespace

STYLE: avoid local variable name masking
parent 3dd1a13b
...@@ -2,7 +2,7 @@ ...@@ -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 | Copyright (C) 2017-2018 OpenCFD Ltd. \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -280,9 +280,11 @@ namespace Tools ...@@ -280,9 +280,11 @@ namespace Tools
}; };
// Specializations
//- Template specialization for symmTensor ordering //- Template specialization for symmTensor ordering
template<> template<>
inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(float data[]) inline void Tools::remapTuple<Foam::symmTensor>(float data[])
{ {
std::swap(data[1], data[3]); // swap XY <-> YY std::swap(data[1], data[3]); // swap XY <-> YY
std::swap(data[2], data[5]); // swap XZ <-> ZZ std::swap(data[2], data[5]); // swap XZ <-> ZZ
...@@ -291,7 +293,7 @@ inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(float data[]) ...@@ -291,7 +293,7 @@ inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(float data[])
//- Template specialization for symmTensor ordering //- Template specialization for symmTensor ordering
template<> template<>
inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(double data[]) inline void Tools::remapTuple<Foam::symmTensor>(double data[])
{ {
std::swap(data[1], data[3]); // swap XY <-> YY std::swap(data[1], data[3]); // swap XY <-> YY
std::swap(data[2], data[5]); // swap XZ <-> ZZ std::swap(data[2], data[5]); // swap XZ <-> ZZ
...@@ -303,6 +305,7 @@ inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(double data[]) ...@@ -303,6 +305,7 @@ inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(double data[])
} // End namespace vtk } // End namespace vtk
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "foamVtkToolsI.H" #include "foamVtkToolsI.H"
......
...@@ -21,22 +21,19 @@ License ...@@ -21,22 +21,19 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
InClass InNamespace
Foam::vtk::Tools Foam::vtk::Tools
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef foamVtkToolsTemplates_C
#define foamVtkToolsTemplates_C
// OpenFOAM includes // OpenFOAM includes
#include "error.H" #include "error.H"
// VTK includes // VTK includes
#include <vtkFloatArray.h> #include "vtkFloatArray.h"
#include <vtkCellData.h> #include "vtkCellData.h"
#include <vtkPointData.h> #include "vtkPointData.h"
#include <vtkSmartPointer.h> #include "vtkSmartPointer.h"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -52,9 +49,9 @@ Foam::vtk::Tools::Patch::points(const PatchType& p) ...@@ -52,9 +49,9 @@ Foam::vtk::Tools::Patch::points(const PatchType& p)
vtkpoints->SetNumberOfPoints(pts.size()); vtkpoints->SetNumberOfPoints(pts.size());
vtkIdType pointId = 0; vtkIdType pointId = 0;
for (const point& p : pts) for (const point& pt : pts)
{ {
vtkpoints->SetPoint(pointId++, p.v_); vtkpoints->SetPoint(pointId++, pt.v_);
} }
return vtkpoints; return vtkpoints;
...@@ -258,8 +255,4 @@ Foam::vtk::Tools::convertFieldToVTK ...@@ -258,8 +255,4 @@ Foam::vtk::Tools::convertFieldToVTK
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* // // ************************************************************************* //
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment