Remove basis from the GridEntity (66648e73) · Commits · TNL / tnl-dev

src/Benchmarks/CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		add_subdirectory( HeatEquation )
		#add_subdirectory( HeatEquation )
		add_subdirectory( HeatEquationGrid )
		add_subdirectory( BLAS )
		add_subdirectory( NDArray )

src/TNL/Meshes/GridDetails/Grid2D_impl.h

+4 −15

Original line number	Diff line number	Diff line
		@@ -438,9 +438,8 @@ void Grid<2, Real, Device, Index>::forAll(Func func, FuncArgs... args) const {
		auto outerOriented = [=] __cuda_callable__(Index i, Index j,
		const Grid<2, Real, Device, Index>&grid,
		const CoordinatesType & orientation,
		const CoordinatesType & basis,
		FuncArgs... args) mutable {
		EntityType<EntityDimension> entity(grid, CoordinatesType(i, j), orientation, basis);
		EntityType<EntityDimension> entity(grid, CoordinatesType(i, j), orientation);

		entity.refresh();

		@@ -452,7 +451,6 @@ void Grid<2, Real, Device, Index>::forAll(Func func, FuncArgs... args) const {
		outerOriented,
		*this,
		CoordinatesType(1, 0),
		CoordinatesType(0, 1),
		args...);

		TNL::Algorithms::ParallelFor2D<Device>::exec(0, 0,
		@@ -460,7 +458,6 @@ void Grid<2, Real, Device, Index>::forAll(Func func, FuncArgs... args) const {
		outerOriented,
		*this,
		CoordinatesType(0, 1),
		CoordinatesType(1, 0),
		args...);
		break;
		}
		@@ -498,9 +495,8 @@ void Grid<2, Real, Device, Index>::forInterior(Func func, FuncArgs... args) cons
		auto outerOriented = [=] __cuda_callable__(Index i, Index j,
		Grid<2, Real, Device, Index>& grid,
		const CoordinatesType& orientation,
		const CoordinatesType& basis,
		FuncArgs... args) mutable {
		EntityType<EntityDimension> entity(grid, CoordinatesType(i, j), orientation, basis);
		EntityType<EntityDimension> entity(grid, CoordinatesType(i, j), orientation);

		entity.refresh();

		@@ -512,7 +508,6 @@ void Grid<2, Real, Device, Index>::forInterior(Func func, FuncArgs... args) cons
		outerOriented,
		*this,
		CoordinatesType(1, 0),
		CoordinatesType(0, 1),
		args...);

		TNL::Algorithms::ParallelFor2D<Device>::exec(0, 1,
		@@ -520,7 +515,6 @@ void Grid<2, Real, Device, Index>::forInterior(Func func, FuncArgs... args) cons
		outerOriented,
		*this,
		CoordinatesType(0, 1),
		CoordinatesType(1, 0),
		args...);
		break;
		}
		@@ -577,7 +571,6 @@ void Grid<2, Real, Device, Index>::forBoundary(Func func, FuncArgs... args) cons
		Index axisIndex,
		const Grid<2, Real, Device, Index>& grid,
		const CoordinatesType& orientation,
		const CoordinatesType & basis,
		FuncArgs... args) mutable {
		CoordinatesType coordinates;

		@@ -593,7 +586,7 @@ void Grid<2, Real, Device, Index>::forBoundary(Func func, FuncArgs... args) cons
		default: TNL_ASSERT_TRUE(false, "Received axis index. Expect in range [0..<1]");
		}

		EntityType<EntityDimension> entity(grid, coordinates, orientation, basis);
		EntityType<EntityDimension> entity(grid, coordinates, orientation);

		entity.refresh();

		@@ -607,7 +600,6 @@ void Grid<2, Real, Device, Index>::forBoundary(Func func, FuncArgs... args) cons
		0, 0,
		*this,
		CoordinatesType(1, 0),
		CoordinatesType(0, 1),
		args...);
		// Upper horizontal
		TNL::Algorithms::ParallelFor<Device>::exec(0,
		@@ -616,7 +608,6 @@ void Grid<2, Real, Device, Index>::forBoundary(Func func, FuncArgs... args) cons
		0, dimensions.y(),
		*this,
		CoordinatesType(1, 0),
		CoordinatesType(0, 1),
		args...);
		// Left vertical
		TNL::Algorithms::ParallelFor<Device>::exec(0,
		@@ -625,7 +616,6 @@ void Grid<2, Real, Device, Index>::forBoundary(Func func, FuncArgs... args) cons
		1, 0,
		*this,
		CoordinatesType(0, 1),
		CoordinatesType(1, 0),
		args...);
		// Right vertical
		TNL::Algorithms::ParallelFor<Device>::exec(0,
		@@ -634,7 +624,6 @@ void Grid<2, Real, Device, Index>::forBoundary(Func func, FuncArgs... args) cons
		1, dimensions.x(),
		*this,
		CoordinatesType(0, 1),
		CoordinatesType(1, 0),
		args...);
		break;
		}

src/TNL/Meshes/GridDetails/GridEntity_impl.h

+5 −68

Original line number	Diff line number	Diff line
		@@ -31,9 +31,7 @@ GridEntity( const Meshes::Grid< Dimension, Real, Device, Index >& grid )
		: grid( grid ),
		entityIndex( -1 ),
		coordinates( 0 ),
		orientation( 0 ),
		basis( 0 )
		{
		orientation( 0 ){
		}

		template< int Dimension,
		@@ -46,14 +44,11 @@ __cuda_callable__ inline
		GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimension, Config >::
		GridEntity( const Meshes::Grid< Dimension, Real, Device, Index >& grid,
		const CoordinatesType& coordinates,
		const EntityOrientationType& orientation,
		const EntityBasisType& basis )
		const EntityOrientationType& orientation )
		: grid( grid ),
		entityIndex( -1 ),
		coordinates( coordinates ),
		orientation( orientation ),
		basis( basis )
		{
		orientation( orientation ){
		}

		template< int Dimension,
		@@ -159,37 +154,8 @@ GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimension, Con
		setOrientation( const EntityOrientationType& orientation )
		{
		this->orientation = orientation;
		this->basis = EntityBasisType( 1 ) - abs( orientation );
		}

		template< int Dimension,
		typename Real,
		typename Device,
		typename Index,
		int EntityDimension,
		typename Config >
		__cuda_callable__ inline
		const typename GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimension, Config >::EntityBasisType&
		GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimension, Config >::
		getBasis() const
		{
		return this->basis;
		}

		template< int Dimension,
		typename Real,
		typename Device,
		typename Index,
		int EntityDimension,
		typename Config >
		__cuda_callable__ inline
		void
		GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimension, Config >::
		setBasis( const EntityBasisType& basis )
		{
		this->basis = basis;
		this->orientation = EntityOrientationType( 1 ) - abs( basis );
		}

		template< int Dimension,
		typename Real,
		@@ -270,8 +236,7 @@ __cuda_callable__ inline
		GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, Dimension, Config >::
		GridEntity( const GridType& grid,
		const CoordinatesType& coordinates,
		const EntityOrientationType& orientation,
		const EntityBasisType& basis )
		const EntityOrientationType& orientation)
		: grid( grid ),
		entityIndex( -1 ),
		coordinates( coordinates )
		@@ -361,19 +326,6 @@ getOrientation() const
		return EntityOrientationType( ( IndexType ) 0 );
		}

		template< int Dimension,
		typename Real,
		typename Device,
		typename Index,
		typename Config >
		__cuda_callable__ inline
		const typename GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, Dimension, Config >::EntityBasisType
		GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, Dimension, Config >::
		getBasis() const
		{
		return EntityBasisType( ( IndexType ) 1 );
		}

		template< int Dimension,
		typename Real,
		typename Device,
		@@ -458,7 +410,6 @@ GridEntity( const GridType& grid )
		{
		}

		// Basis is Discarded
		template< int Dimension,
		typename Real,
		typename Device,
		@@ -468,8 +419,7 @@ __cuda_callable__ inline
		GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, 0, Config >::
		GridEntity( const GridType& grid,
		const CoordinatesType& coordinates,
		const EntityOrientationType& orientation,
		const EntityBasisType& basis )
		const EntityOrientationType& orientation)
		: grid( grid ),
		entityIndex( -1 ),
		coordinates( coordinates )
		@@ -561,19 +511,6 @@ getOrientation() const
		return EntityOrientationType( ( IndexType ) 0 );
		}

		template< int Dimension,
		typename Real,
		typename Device,
		typename Index,
		typename Config >
		__cuda_callable__ inline
		const typename GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, 0, Config >::EntityBasisType
		GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, 0, Config >::
		getBasis() const
		{
		return EntityBasisType( ( IndexType ) 0 );
		}

		template< int Dimension,
		typename Real,
		typename Device,

src/TNL/Meshes/GridEntity.h

+3 −29

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimensio
		constexpr static int getEntityDimension() { return EntityDimension; };

		typedef Containers::StaticVector< getMeshDimension(), IndexType > EntityOrientationType;
		typedef Containers::StaticVector< getMeshDimension(), IndexType > EntityBasisType;
		typedef typename GridType::PointType PointType;

		template< int NeighborEntityDimension = getEntityDimension() >
		@@ -74,8 +73,7 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimensio
		__cuda_callable__ inline
		GridEntity( const GridType& grid,
		const CoordinatesType& coordinates,
		const EntityOrientationType& orientation,
		const EntityBasisType& basis );
		const EntityOrientationType& orientation);

		__cuda_callable__ inline
		const CoordinatesType& getCoordinates() const;
		@@ -104,12 +102,6 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimensio
		__cuda_callable__ inline
		void setOrientation( const EntityOrientationType& orientation );

		__cuda_callable__ inline
		const EntityBasisType& getBasis() const;

		__cuda_callable__ inline
		void setBasis( const EntityBasisType& basis );

		__cuda_callable__ inline
		bool isBoundaryEntity() const;

		@@ -132,8 +124,6 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, EntityDimensio

		EntityOrientationType orientation;

		EntityBasisType basis;

		//__cuda_callable__ inline
		//GridEntity();

		@@ -167,7 +157,6 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, Dimension, Con
		constexpr static int getEntityDimension() { return getMeshDimension(); };

		typedef Containers::StaticVector< getMeshDimension(), IndexType > EntityOrientationType;
		typedef Containers::StaticVector< getMeshDimension(), IndexType > EntityBasisType;

		template< int NeighborEntityDimension = getEntityDimension() >
		using NeighborEntities =
		@@ -184,8 +173,7 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, Dimension, Con
		__cuda_callable__ inline
		GridEntity( const GridType& grid,
		const CoordinatesType& coordinates,
		const EntityOrientationType& orientation = EntityOrientationType( ( Index ) 0 ),
		const EntityBasisType& basis = EntityBasisType( ( Index ) 1 ) );
		const EntityOrientationType& orientation = EntityOrientationType( ( Index ) 0 ) );

		__cuda_callable__ inline
		const CoordinatesType& getCoordinates() const;
		@@ -214,12 +202,6 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, Dimension, Con
		__cuda_callable__ inline
		void setOrientation( const EntityOrientationType& orientation ){};

		__cuda_callable__ inline
		const EntityBasisType getBasis() const;

		__cuda_callable__ inline
		void setBasis( const EntityBasisType& basis ){};

		__cuda_callable__ inline
		bool isBoundaryEntity() const;

		@@ -276,7 +258,6 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, 0, Config >
		constexpr static int getEntityDimension() { return 0; };

		typedef Containers::StaticVector< getMeshDimension(), IndexType > EntityOrientationType;
		typedef Containers::StaticVector< getMeshDimension(), IndexType > EntityBasisType;

		template< int NeighborEntityDimension = getEntityDimension() >
		using NeighborEntities =
		@@ -293,8 +274,7 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, 0, Config >
		__cuda_callable__ inline
		GridEntity( const GridType& grid,
		const CoordinatesType& coordinates,
		const EntityOrientationType& orientation = EntityOrientationType( ( Index ) 0 ),
		const EntityBasisType& basis = EntityOrientationType( ( Index ) 0 ) );
		const EntityOrientationType& orientation = EntityOrientationType( ( Index ) 0 ) );

		__cuda_callable__ inline
		const CoordinatesType& getCoordinates() const;
		@@ -323,12 +303,6 @@ class GridEntity< Meshes::Grid< Dimension, Real, Device, Index >, 0, Config >
		__cuda_callable__ inline
		void setOrientation( const EntityOrientationType& orientation ){};

		__cuda_callable__ inline
		const EntityBasisType getBasis() const;

		__cuda_callable__ inline
		void setBasis( const EntityBasisType& basis ){};

		__cuda_callable__ inline
		bool isBoundaryEntity() const;