Commit 7eb29486 authored by Illia Kolesnik's avatar Illia Kolesnik
Browse files

Renamed some files, cosmetic changes

parent 7b85615b

src/AbsAdaptiveGrid.h→src/AbsOctree.h

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ namespace TNL { 
namespace Meshes {



template< typename Real, typename Device, typename Index >

class AbsAdaptiveGrid

class AbsOctree

{

protected:

   Real m_GridWidth;
@@ -22,11 +22,11 @@ protected: 
   StaticArray< 3, Real > m_Origin;



public:

   AbsAdaptiveGrid( const Real gridWidth, const StaticArray< 3, Real >& proportions, const StaticArray< 3, Real >& origin )

   AbsOctree( const Real gridWidth, const StaticArray< 3, Real >& proportions, const StaticArray< 3, Real >& origin )

   : m_GridWidth( gridWidth ), m_Proportions( proportions ), m_Origin( origin )

   {}



   virtual ~AbsAdaptiveGrid() = default;

   virtual ~AbsOctree() = default;



   [[nodiscard]] virtual Index

   getCellCount() const = 0;

src/Benchmark/Benchmark.cpp

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <TNL/Containers/StaticArray.h>

#include "../LinearOctree/AdaptiveGrid.h"

#include "../Octree/AdaptiveGrid.h"

#include "../AbsAdaptiveGrid.h"

#include "../AbsOctree.h"



using namespace TNL::Benchmarks;

using namespace TNL::Meshes;
@@ -32,7 +32,7 @@ constexpr Index BENCHMARK_VERBOSE = 0; 
using Device = TNL::Devices::Host;

using LinearOcreee = TNL::Meshes::LinearOctree::AdaptiveGrid< Real, TNL::Devices::Host, Index >;

using ClassicOctree = TNL::Meshes::Octree::AdaptiveGrid< Real, TNL::Devices::Host, Index >;

using AbsOctree = TNL::Meshes::AbsAdaptiveGrid< Real, TNL::Devices::Host, Index >;

using AbsOctree = TNL::Meshes::AbsOctree< Real, TNL::Devices::Host, Index >;



string benchDir;

src/Benchmark/BenchmarkMPI.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ using Device = TNL::Devices::Host; 
using Real = double;

using Index = int;

using GridType = LinearOctree::AdaptiveGrid< Real, Device, Index >;

using AbsOctree = TNL::Meshes::AbsAdaptiveGrid< Real, TNL::Devices::Host, Index >;

using AbsOctree = TNL::Meshes::AbsOctree< Real, TNL::Devices::Host, Index >;



constexpr Index TEST_ITERATIONS = 3;
@@ -163,7 +163,7 @@ main( int argc, char const* argv[] ) 
   map.refineCell( 0, distribution );



   AdaptiveParallelGrid< Real, Device, Index, GridType > globalGrid( map, processId );

   TNL::Meshes::AbsAdaptiveGrid< Real, Device, Index >& localGrid = globalGrid.getLocalGrid();

   TNL::Meshes::AbsOctree< Real, Device, Index >& localGrid = globalGrid.getLocalGrid();



   globalGrid.startUsing();

   /* Parallel stuff */

src/LinearOctree/AdaptiveGrid.h

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include "../GridExporter.h"

#include "../ExporterGridEntity.h"

#include "../AbsAdaptiveGrid.h"

#include "../AbsOctree.h"



using namespace TNL::Containers;
@@ -34,7 +34,7 @@ namespace Meshes { 
namespace LinearOctree {



template< typename Real, typename Device, typename Index >

class AdaptiveGrid : public AbsAdaptiveGrid< Real, Device, Index >

class AdaptiveGrid : public AbsOctree< Real, Device, Index >

{

private:

   /* ----------------- Private Typedefs ------------------ */
@@ -234,7 +234,7 @@ public: 
   constexpr AdaptiveGrid( const Real gridWidth = 1.0,

                           const StaticArray< 3, Real >& proportions = { 1.0, 1.0, 1.0 },

                           const StaticArray< 3, Real >& origin = { 0, 0, 0 } )

   : AbsAdaptiveGrid< Real, Device, Index >( gridWidth, proportions, origin )

   : AbsOctree< Real, Device, Index >( gridWidth, proportions, origin )

   {

      /* Insert root */

      Cell< Real, Device, Index > root;

src/Octree/AdaptiveGrid.h

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include "../GridExporter.h"

#include "../ExporterGridEntity.h"

#include "../AbsAdaptiveGrid.h"

#include "../AbsOctree.h"



using namespace TNL::Containers;
@@ -23,7 +23,7 @@ namespace Meshes { 
namespace Octree {



template< typename Real, typename Device, typename Index >

class AdaptiveGrid : public AbsAdaptiveGrid< Real, Device, Index >

class AdaptiveGrid : public AbsOctree< Real, Device, Index >

{

private:

   /* ----------------- Private Typedefs ------------------ */
@@ -51,7 +51,7 @@ public: 
   AdaptiveGrid( const Real gridWidth = 1.0,

                 const StaticArray< 3, Real >& proportions = { 1.0, 1.0, 1.0 },

                 const StaticArray< 3, Real >& origin = { 0, 0, 0 } )

   : AbsAdaptiveGrid< Real, Device, Index >( gridWidth, proportions, origin )

   : AbsOctree< Real, Device, Index >( gridWidth, proportions, origin )

   {

      /* Insert root */

      Cell< Real, Device, Index > root;