Commit 1386431a authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed access to protected member (grid)

parent 3d79a12f

src/TNL/Meshes/GridDetails/BoundaryGridEntityChecker.h

+17 −17
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 1, Real, Device, Inde 
      static bool isBoundaryEntity( const GridEntityType& entity )

      {

         return( entity.getCoordinates().x() == 0 ||

                 entity.getCoordinates().x() == entity.grid.getDimensions().x() - 1 );

                 entity.getCoordinates().x() == entity.getMesh().getDimensions().x() - 1 );

      }

};
@@ -56,7 +56,7 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 1, Real, Device, Inde 
      static bool isBoundaryEntity( const GridEntityType& entity )

      {

         return( entity.getCoordinates().x() == 0 ||

                 entity.getCoordinates().x() == entity.grid.getDimensions().x() );

                 entity.getCoordinates().x() == entity.getMesh().getDimensions().x() );

      }

};
@@ -79,8 +79,8 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 2, Real, Device, Inde 
      {

         return( entity.getCoordinates().x() == 0 ||

                 entity.getCoordinates().y() == 0 ||

                 entity.getCoordinates().x() == entity.grid.getDimensions().x() - 1 ||

                 entity.getCoordinates().y() == entity.grid.getDimensions().y() - 1 );

                 entity.getCoordinates().x() == entity.getMesh().getDimensions().x() - 1 ||

                 entity.getCoordinates().y() == entity.getMesh().getDimensions().y() - 1 );

      }

};
@@ -101,9 +101,9 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 2, Real, Device, Inde 
         return( entity.getCoordinates().x() == 0 ||

                 entity.getCoordinates().y() == 0 ||

                 entity.getCoordinates().x() ==

                    entity.grid.getDimensions().x() - entity.getBasis().x() ||

                    entity.getMesh().getDimensions().x() - entity.getBasis().x() ||

                 entity.getCoordinates().y() ==

                    entity.grid.getDimensions().y() - entity.getBasis().y() );

                    entity.getMesh().getDimensions().y() - entity.getBasis().y() );

 

      }

};
@@ -125,8 +125,8 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 2, Real, Device, Inde 
      {

         return( entity.getCoordinates().x() == 0 ||

                 entity.getCoordinates().y() == 0 ||

                 entity.getCoordinates().x() == entity.grid.getDimensions().x() ||

                 entity.getCoordinates().y() == entity.grid.getDimensions().y() );

                 entity.getCoordinates().x() == entity.getMesh().getDimensions().x() ||

                 entity.getCoordinates().y() == entity.getMesh().getDimensions().y() );

 

      }

};
@@ -154,11 +154,11 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 3, Real, Device, Inde 
                 entity.getCoordinates().y() == 0 ||

                 entity.getCoordinates().z() == 0 ||

                 entity.getCoordinates().x() ==

                    entity.grid.getDimensions().x() - entity.getBasis().x() ||

                    entity.getMesh().getDimensions().x() - entity.getBasis().x() ||

                 entity.getCoordinates().y() ==

                    entity.grid.getDimensions().y() - entity.getBasis().y() ||

                    entity.getMesh().getDimensions().y() - entity.getBasis().y() ||

                 entity.getCoordinates().z() ==

                    entity.grid.getDimensions().z() - entity.getBasis().z() );

                    entity.getMesh().getDimensions().z() - entity.getBasis().z() );

 

      }

};
@@ -180,9 +180,9 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 3, Real, Device, Inde 
         return( entity.getCoordinates().x() == 0 ||

                 entity.getCoordinates().y() == 0 ||

                 entity.getCoordinates().z() == 0 ||

                 entity.getCoordinates().x() == entity.grid.getDimensions().x() - 1 ||

                 entity.getCoordinates().y() == entity.grid.getDimensions().y() - 1 ||

                 entity.getCoordinates().z() == entity.grid.getDimensions().z() - 1 );

                 entity.getCoordinates().x() == entity.getMesh().getDimensions().x() - 1 ||

                 entity.getCoordinates().y() == entity.getMesh().getDimensions().y() - 1 ||

                 entity.getCoordinates().z() == entity.getMesh().getDimensions().z() - 1 );

      }

};
@@ -203,9 +203,9 @@ class BoundaryGridEntityChecker< GridEntity< Meshes::Grid< 3, Real, Device, Inde 
         return( entity.getCoordinates().x() == 0 ||

                 entity.getCoordinates().y() == 0 ||

                 entity.getCoordinates().z() == 0 ||

                 entity.getCoordinates().x() == entity.grid.getDimensions().x() ||

                 entity.getCoordinates().y() == entity.grid.getDimensions().y() ||

                 entity.getCoordinates().z() == entity.grid.getDimensions().z() );

                 entity.getCoordinates().x() == entity.getMesh().getDimensions().x() ||

                 entity.getCoordinates().y() == entity.getMesh().getDimensions().y() ||

                 entity.getCoordinates().z() == entity.getMesh().getDimensions().z() );

      }

};

src/TNL/Meshes/GridDetails/GridEntityCenterGetter.h

+8 −8
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 1, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() + ( entity.getCoordinates().x() + 0.5 ) * grid.getSpaceSteps().x() );

      }
@@ -58,7 +58,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 1, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() + ( entity.getCoordinates().x() ) * grid.getSpaceSteps().x() );

      }
@@ -82,7 +82,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 2, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() + ( entity.getCoordinates().x() + 0.5 ) * grid.getSpaceSteps().x(),

            grid.getOrigin().y() + ( entity.getCoordinates().y() + 0.5 ) * grid.getSpaceSteps().y() );
@@ -104,7 +104,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 2, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() +

               ( entity.getCoordinates().x() + 0.5 * entity.getBasis().x() ) * grid.getSpaceSteps().x(),
@@ -129,7 +129,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 2, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() + entity.getCoordinates().x() * grid.getSpaceSteps().x(),

            grid.getOrigin().y() + entity.getCoordinates().y() * grid.getSpaceSteps().y() );
@@ -156,7 +156,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 3, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() +

               ( entity.getCoordinates().x() + 0.5 * entity.getBasis().x() ) * grid.getSpaceSteps().x(),
@@ -182,7 +182,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 3, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() + ( entity.getCoordinates().x() + 0.5 ) * grid.getSpaceSteps().x(),

            grid.getOrigin().y() + ( entity.getCoordinates().y() + 0.5 ) * grid.getSpaceSteps().y(),
@@ -205,7 +205,7 @@ class GridEntityCenterGetter< GridEntity< Meshes::Grid< 3, Real, Device, Index > 
      __cuda_callable__ inline

      static VertexType getEntityCenter( const GridEntityType& entity )

      {

         const GridType& grid = entity.grid;

         const GridType& grid = entity.getMesh();

         return VertexType(

            grid.getOrigin().x() + ( entity.getCoordinates().x() ) * grid.getSpaceSteps().x(),

            grid.getOrigin().y() + ( entity.getCoordinates().y() ) * grid.getSpaceSteps().y(),