Commit e60499c2 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Cleaned up DistributedGrid

parent 625fdd4d
Loading
Loading
Loading
Loading
+10 −16
Original line number Diff line number Diff line
/***************************************************************************
                          DistributedGrid_Base.h  -  part common for all Dimensionensions
                          DistributedGrid.h  -  description
                             -------------------
    begin                : July 07, 2018
    copyright            : (C) 2018 by Tomas Oberhuber
@@ -16,13 +16,10 @@
#include <TNL/Meshes/DistributedMeshes/Directions.h>
#include <TNL/Meshes/DistributedMeshes/DistributedMesh.h>


namespace TNL {
namespace Meshes {
namespace DistributedMeshes {



template< int Dimension,
          typename Real,
          typename Device,
@@ -30,14 +27,13 @@ template< int Dimension,
class DistributedMesh< Grid< Dimension, Real, Device, Index > >
{
   public:

      typedef Real RealType;
      typedef Device DeviceType;
      typedef Index IndexType;
      typedef Grid< Dimension, Real, Device, IndexType > GridType;
      typedef typename GridType::PointType PointType;
      typedef Containers::StaticVector< Dimension, IndexType > CoordinatesType;
      typedef Containers::StaticVector< Dimension, IndexType > SubdomainOverlapsType;
      using RealType = Real;
      using DeviceType = Device;
      using IndexType = Index;
      using GridType = Grid< Dimension, Real, Device, IndexType >;
      using PointType = typename GridType::PointType;
      using CoordinatesType = Containers::StaticVector< Dimension, IndexType >;
      using SubdomainOverlapsType = Containers::StaticVector< Dimension, IndexType >;

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

@@ -138,11 +134,10 @@ class DistributedMesh< Grid< Dimension, Real, Device, Index > >
      CoordinatesType localSize;
      CoordinatesType localGridSize;
      CoordinatesType overlap;
      //CoordinatesType globalDimensions;
      CoordinatesType globalBegin;
      PointType spaceSteps;

      SubdomainOverlapsType lowerOverlap, upperOverlap, globalLowerOverlap, globalUpperOverlap;
      SubdomainOverlapsType lowerOverlap, upperOverlap;

      CoordinatesType domainDecomposition;
      CoordinatesType subdomainCoordinates;
@@ -161,7 +156,6 @@ class DistributedMesh< Grid< Dimension, Real, Device, Index > >

      //aka MPI-communicator
      MPI_Comm group;

};

} // namespace DistributedMeshes
+5 −5
Original line number Diff line number Diff line
/***************************************************************************
                          DistributedGrid_Base.hpp  -  description
                          DistributedGrid.hpp  -  description
                             -------------------
    begin                : July 07, 2018
    copyright            : (C) 2018 by Tomas Oberhuber
+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ class DistributedGridTest_1D : public ::testing::Test
         globalGrid.setDimensions(size);
         globalGrid.setDomain(globalOrigin,globalProportions);

         typename DistributedGridType::CoordinatesType overlap;
         overlap.setValue(1);
         distributedGrid=new DistributedGridType();

         typename DistributedGridType::SubdomainOverlapsType lowerOverlap, upperOverlap;