Commit 3c0cedcc authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Distributed Grid refactorization - FIX cuda build problem.

parent 6047d9bc

src/TNL/Meshes/DistributedMeshes/DistributedGrid_1D.h

+7 −2
Original line number Diff line number Diff line
@@ -23,10 +23,15 @@ class DistributedMesh< Grid< 1, RealType, Device, Index > > : public Distributed 
{



    public:

      using typename DistributedGrid_Base<1, RealType, Device, Index >::IndexType;

 /*     using typename DistributedGrid_Base<1, RealType, Device, Index >::IndexType;

      using typename DistributedGrid_Base<1, RealType, Device, Index >::GridType;

      using typename DistributedGrid_Base<1, RealType, Device, Index >::PointType;

      using typename DistributedGrid_Base<1, RealType, Device, Index >::CoordinatesType;

      using typename DistributedGrid_Base<1, RealType, Device, Index >::CoordinatesType;*/



      typedef typename DistributedGrid_Base<1, RealType, Device, Index >::CoordinatesType CoordinatesType;

      typedef typename DistributedGrid_Base<1, RealType, Device, Index >::IndexType IndexType;

      typedef typename DistributedGrid_Base<1, RealType, Device, Index >::GridType GridType;

      typedef typename DistributedGrid_Base<1, RealType, Device, Index >::PointType PointType;



      bool setup( const Config::ParameterContainer& parameters,

                  const String& prefix );

src/TNL/Meshes/DistributedMeshes/DistributedGrid_2D.h

+7 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#pragma once



#include <TNL/Meshes/Grid.h>

#include <TNL/Meshes/DistributedMeshes/DistributedGrid_Base.h>



namespace TNL {

namespace Meshes {
@@ -23,10 +24,14 @@ class DistributedMesh< Grid< 2, RealType, Device, Index > >: public DistributedG 
{

   public:



      using typename DistributedGrid_Base<2, RealType, Device, Index >::IndexType;

/*    using typename DistributedGrid_Base<2, RealType, Device, Index >::IndexType;

      using typename DistributedGrid_Base<2, RealType, Device, Index >::GridType;

      using typename DistributedGrid_Base<2, RealType, Device, Index >::PointType;

      using typename DistributedGrid_Base<2, RealType, Device, Index >::CoordinatesType;

      using typename DistributedGrid_Base<2, RealType, Device, Index >::CoordinatesType;*/

      typedef typename DistributedGrid_Base<2, RealType, Device, Index >::CoordinatesType CoordinatesType;

      typedef typename DistributedGrid_Base<2, RealType, Device, Index >::IndexType IndexType;

      typedef typename DistributedGrid_Base<2, RealType, Device, Index >::GridType GridType;

      typedef typename DistributedGrid_Base<2, RealType, Device, Index >::PointType PointType;



/*      template< int EntityDimension >

      IndexType getEntitiesCount() const;

src/TNL/Meshes/DistributedMeshes/DistributedGrid_2D.hpp

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 


#pragma once



#include <TNL/Meshes/DistributedMeshes/DistributedGrid_2D.h>



namespace TNL {

   namespace Meshes { 

      namespace DistributedMeshes {

src/TNL/Meshes/DistributedMeshes/DistributedGrid_3D.h

+9 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <TNL/Config/ConfigDescription.h>

#include <TNL/Meshes/Grid.h>

#include <TNL/Meshes/DistributedMeshes/DistributedGrid_Base.h>



namespace TNL {

namespace Meshes {
@@ -32,10 +33,14 @@ class DistributedMesh<Grid< 3, RealType, Device, Index >> : public DistributedGr 


    public:



      using typename DistributedGrid_Base<3, RealType, Device, Index >::IndexType;

      using typename DistributedGrid_Base<3, RealType, Device, Index >::GridType;

      using typename DistributedGrid_Base<3, RealType, Device, Index >::PointType;

      using typename DistributedGrid_Base<3, RealType, Device, Index >::CoordinatesType;

      //using typename DistributedGrid_Base<3, RealType, Device, Index >::IndexType;

      //using typename DistributedGrid_Base<3, RealType, Device, Index >::GridType;

      //using typename DistributedGrid_Base<3, RealType, Device, Index >::PointType;

      //using typename DistributedGrid_Base<3, RealType, Device, Index >::CoordinatesType;

      typedef typename DistributedGrid_Base<3, RealType, Device, Index >::CoordinatesType CoordinatesType;

      typedef typename DistributedGrid_Base<3, RealType, Device, Index >::IndexType IndexType;

      typedef typename DistributedGrid_Base<3, RealType, Device, Index >::GridType GridType;

      typedef typename DistributedGrid_Base<3, RealType, Device, Index >::PointType PointType;



      static constexpr int getMeshDimension() { return 3; };

src/TNL/Meshes/DistributedMeshes/DistributedGrid_3D.hpp

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#pragma once



#include <TNL/Meshes/DistributedMeshes/DistributedGrid_3D.h>



namespace TNL {

   namespace Meshes {