Commit 84f57f59 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixing compatibility with nvcc.

parent cb3eda9d

install

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=no

WITH_CUDA=yes

TEMPLATE_EXPLICIT_INSTANTIATION=yes

#VERBOSE="VERBOSE=1"

src/mesh/tnlGrid2D.h

+5 −0
Original line number Diff line number Diff line
@@ -226,8 +226,13 @@ class tnlGrid< 2, Real, Device, Index > : public tnlObject 
#endif

   Index getNumberOfCells() const;



#ifdef HAVE_NOT_CXX11

   template< int nx,

             int ny >

#else

   template< int nx = 1,

             int ny = 1 >

#endif

#ifdef HAVE_CUDA

   __device__ __host__

#endif

src/mesh/tnlGrid3D.h

+18 −2
Original line number Diff line number Diff line
@@ -284,13 +284,29 @@ class tnlGrid< 3, Real, Device, Index > : public tnlObject 
#endif

   Index getNumberOfCells() const;



   template< int nx = 1, int ny = 1, int nz = 1 >

#ifdef HAVE_NOT_CXX11

   template< int nx,

             int ny,

             int nz >

#else

   template< int nx = 1,

             int ny = 1,

             int nz = 1 >

#endif

#ifdef HAVE_CUDA

   __device__ __host__

#endif

   Index getNumberOfFaces() const;



   template< int dx = 1, int dy = 1, int dz = 1 >

#ifdef HAVE_NOT_CXX11

   template< int dx,

             int dy,

             int dz >

#else

   template< int dx = 1,

             int dy = 1,

             int dz = 1 >

#endif

#ifdef HAVE_CUDA

   __device__ __host__

#endif