Remove methods to get cell measure and entity from grid (c63ee9c6) · Commits · TNL / tnl-dev

src/TNL/Meshes/GridDetails/Grid1D.h

+0 −20

Original line number	Diff line number	Diff line
		@@ -32,21 +32,6 @@ class Grid<1, Real, Device, Index> : public NDimGrid<1, Real, Device, Index> {

		Grid(const Index xSize);

		/**
		* \brief Gets number of entities in this grid.
		* \tparam Entity Type of the entity.
		*/
		// template <typename Entity>
		// __cuda_callable__ Index getEntitiesCount() const;

		/**
		* \brief Gets entity type using entity index.
		* \param entityIndex Index of entity.
		* \tparam Entity Type of the entity.
		*/
		template <typename Entity>
		__cuda_callable__ inline Entity getEntity(const Index &entityIndex) const;

		/**
		* \brief Gets entity index using entity type.
		* \param entity Type of entity.
		@@ -55,11 +40,6 @@ class Grid<1, Real, Device, Index> : public NDimGrid<1, Real, Device, Index> {
		template <typename Entity>
		__cuda_callable__ inline Index getEntityIndex(const Entity &entity) const;

		/**
		* \brief Returns the measure (length) of a cell in this grid.
		*/
		__cuda_callable__ inline const Real &getCellMeasure() const;

		/*
		* @brief Traverses all elements
		*/

+1 −22

Original line number	Diff line number	Diff line
		@@ -32,21 +32,6 @@ class Grid<2, Real, Device, Index>: public NDimGrid<2, Real, Device, Index> {

		Grid(const Index xSize, const Index ySize);

		// TODO: - Fix method
		// /**
		// * \brief Gets number of entities in this grid.
		// * \tparam Entity Type of the entity.
		// */
		// template <typename Entity, std::enable_if_t<(std::is_integral<Entity>::value), bool> = true>
		// __cuda_callable__ inline Index getEntitiesCountA() const;

		/**
		* \brief See Grid1D::getEntity().
		*/
		template <typename Entity>
		__cuda_callable__ inline
		Entity getEntity(const Index& entityIndex) const;

		/**
		* \brief See Grid1D::getEntityIndex().
		*/
		@@ -54,12 +39,6 @@ class Grid<2, Real, Device, Index>: public NDimGrid<2, Real, Device, Index> {
		__cuda_callable__ inline
		Index getEntityIndex(const Entity& entity) const;

		/**
		* \brief Returns the measure (area) of a cell in this grid.
		*/
		__cuda_callable__ inline
		const Real& getCellMeasure() const;

		/*
		* @brief Traverses all elements
		*/

+0 −29

Original line number	Diff line number	Diff line
		@@ -32,29 +32,6 @@ class Grid<3, Real, Device, Index> : public NDimGrid<3, Real, Device, Index> {

		Grid(const Index xSize, const Index ySize, const Index zSize);

		// /**
		// * \brief Gets number of entities in this grid.
		// * \tparam EntityDimension Integer specifying dimension of the entity.
		// */
		// template< int EntityDimension >
		// __cuda_callable__
		// IndexType getEntitiesCount() const;

		/**
		* \brief Gets number of entities in this grid.
		* \tparam Entity Type of the entity.
		// */
		// template< typename Entity >
		// __cuda_callable__
		// IndexType getEntitiesCount() const;

		/**
		* \brief See Grid1D::getEntity().
		*/
		template <typename Entity>
		__cuda_callable__ inline
		Entity getEntity(const Index& entityIndex) const;

		/**
		* \brief See Grid1D::getEntityIndex().
		*/
		@@ -62,12 +39,6 @@ class Grid<3, Real, Device, Index> : public NDimGrid<3, Real, Device, Index> {
		__cuda_callable__ inline
		Index getEntityIndex(const Entity& entity) const;

		/**
		* \breif Returns the measure (volume) of a cell in this grid.
		*/
		__cuda_callable__ inline
		const Real& getCellMeasure() const;

		template <int EntityDimension, typename Func, typename... FuncArgs>
		inline void forAll(Func func, FuncArgs... args) const;

+0 −14

Original line number	Diff line number	Diff line
		@@ -26,20 +26,6 @@ __GRID_1D_PREFIX__::Grid(const Index xSize) {
		this->setDimensions(xSize);
		}

		// template <typename Real, typename Device, typename Index>
		// template <typename Entity>
		// __cuda_callable__ inline Index Grid<1, Real, Device, Index>::getEntitiesCount() const {
		// return getEntitiesCount<Entity::getEntityDimension()>();
		// }

		__GRID_1D_TEMPLATE__
		template <typename Entity>
		__cuda_callable__ inline Entity __GRID_1D_PREFIX__::getEntity(const Index &entityIndex) const {
		static_assert(Templates::isInClosedInterval(0, Entity::entityDimension, 1), "Wrong grid entity dimensions.");

		return GridEntityGetter<Grid, Entity::entityDimension>::getEntity(*this, entityIndex);
		}

		__GRID_1D_TEMPLATE__
		template <typename Entity>
		__cuda_callable__ inline Index __GRID_1D_PREFIX__::getEntityIndex(const Entity &entity) const {

+1 −14

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ namespace Meshes {

		__GRID_2D_TEMPLATE__
		__GRID_2D_PREFIX__::Grid() {
		this->setDimensions(0);
		this->setDimensions(0, 0);
		}

		__GRID_2D_TEMPLATE__
		@@ -26,14 +26,6 @@ __GRID_2D_PREFIX__::Grid(const Index xSize, const Index ySize) {
		this->setDimensions(xSize, ySize);
		}

		__GRID_2D_TEMPLATE__
		template <typename Entity>
		__cuda_callable__ inline Entity __GRID_2D_PREFIX__::getEntity(const Index& entityIndex) const {
		static_assert(Entity::entityDimension <= 2 && Entity::entityDimension >= 0, "Wrong grid entity dimensions.");

		return GridEntityGetter<Grid, Entity::entityDimension>::getEntity(*this, entityIndex);
		}

		__GRID_2D_TEMPLATE__
		template <typename Entity>
		__cuda_callable__ inline Index __GRID_2D_PREFIX__::getEntityIndex(const Entity& entity) const {
		@@ -42,11 +34,6 @@ __cuda_callable__ inline Index __GRID_2D_PREFIX__::getEntityIndex(const Entity&
		return GridEntityGetter<Grid, Entity::entityDimension>::getEntityIndex(*this, entity);
		}

		__GRID_2D_TEMPLATE__
		__cuda_callable__ const Real& __GRID_2D_PREFIX__::getCellMeasure() const {
		return this->template getSpaceStepsProducts<1, 1>();
		}

		__GRID_2D_TEMPLATE__
		template <int EntityDimension, typename Func, typename... FuncArgs>
		inline