Hack around nvcc bug (9e0691e2) · Commits · TNL / tnl-dev

src/TNL/Meshes/GridDetails/GridTraverser.h

+12 −4

Original line number	Diff line number	Diff line
		@@ -115,7 +115,9 @@ class GridTraverser< Meshes::Grid< 2, Real, Devices::Host, Index > >
		const CoordinatesType begin,
		const CoordinatesType end,
		SharedPointer< UserData, DeviceType >& userData,
		const int& stream = 0,
		// FIXME: hack around nvcc bug (error: default argument not at end of parameter list)
		// const int& stream = 0,
		const int& stream,
		// gridEntityParameters are passed to GridEntity's constructor
		// (i.e. orientation and basis for faces)
		const GridEntityParameters&... gridEntityParameters );
		@@ -151,7 +153,9 @@ class GridTraverser< Meshes::Grid< 2, Real, Devices::Cuda, Index > >
		const CoordinatesType& begin,
		const CoordinatesType& end,
		SharedPointer< UserData, DeviceType >& userData,
		const int& stream = 0,
		// FIXME: hack around nvcc bug (error: default argument not at end of parameter list)
		// const int& stream = 0,
		const int& stream,
		// gridEntityParameters are passed to GridEntity's constructor
		// (i.e. orientation and basis for faces)
		const GridEntityParameters&... gridEntityParameters );
		@@ -188,7 +192,9 @@ class GridTraverser< Meshes::Grid< 3, Real, Devices::Host, Index > >
		const CoordinatesType begin,
		const CoordinatesType end,
		SharedPointer< UserData, DeviceType >& userData,
		const int& stream = 0,
		// FIXME: hack around nvcc bug (error: default argument not at end of parameter list)
		// const int& stream = 0,
		const int& stream,
		// gridEntityParameters are passed to GridEntity's constructor
		// (i.e. orientation and basis for faces and edges)
		const GridEntityParameters&... gridEntityParameters );
		@@ -225,7 +231,9 @@ class GridTraverser< Meshes::Grid< 3, Real, Devices::Cuda, Index > >
		const CoordinatesType& begin,
		const CoordinatesType& end,
		SharedPointer< UserData, DeviceType >& userData,
		const int& stream = 0,
		// FIXME: hack around nvcc bug (error: default argument not at end of parameter list)
		// const int& stream = 0,
		const int& stream,
		// gridEntityParameters are passed to GridEntity's constructor
		// (i.e. orientation and basis for faces and edges)
		const GridEntityParameters&... gridEntityParameters );

src/TNL/Meshes/GridDetails/Traverser_Grid2D_impl.h

+12 −6

Original line number	Diff line number	Diff line
		@@ -38,7 +38,8 @@ processBoundaryEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0 ),
		gridPointer->getDimensions() - CoordinatesType( 1, 1 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -61,7 +62,8 @@ processInteriorEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 1, 1 ),
		gridPointer->getDimensions() - CoordinatesType( 2, 2 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -84,7 +86,8 @@ processAllEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0 ),
		gridPointer->getDimensions() - CoordinatesType( 1, 1 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		/****
		@@ -215,7 +218,8 @@ processBoundaryEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0 ),
		gridPointer->getDimensions(),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -238,7 +242,8 @@ processInteriorEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 1, 1 ),
		gridPointer->getDimensions() - CoordinatesType( 1, 1 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -261,7 +266,8 @@ processAllEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0 ),
		gridPointer->getDimensions(),
		userDataPointer );
		userDataPointer,
		0 );
		}

		} // namespace Meshes

src/TNL/Meshes/GridDetails/Traverser_Grid3D_impl.h

+12 −6

Original line number	Diff line number	Diff line
		@@ -38,7 +38,8 @@ processBoundaryEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0, 0 ),
		gridPointer->getDimensions() - CoordinatesType( 1, 1, 1 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -61,7 +62,8 @@ processInteriorEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 1, 1, 1 ),
		gridPointer->getDimensions() - CoordinatesType( 2, 2, 2 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -84,7 +86,8 @@ processAllEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0, 0 ),
		gridPointer->getDimensions() - CoordinatesType( 1, 1, 1 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		/****
		@@ -378,7 +381,8 @@ processBoundaryEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0, 0 ),
		gridPointer->getDimensions(),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -401,7 +405,8 @@ processInteriorEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 1, 1, 1 ),
		gridPointer->getDimensions() - CoordinatesType( 1, 1, 1 ),
		userDataPointer );
		userDataPointer,
		0 );
		}

		template< typename Real,
		@@ -424,7 +429,8 @@ processAllEntities( const GridPointer& gridPointer,
		gridPointer,
		CoordinatesType( 0, 0, 0 ),
		gridPointer->getDimensions(),
		userDataPointer );
		userDataPointer,
		0 );
		}

		} // namespace Meshes