Commit 69e3cfa4 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Code refactoring.

parent d185f204

src/TNL/Functions/MeshFunction_impl.h

+10 −10
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ MeshFunction< Mesh, MeshEntityDimension, Real >:: 
MeshFunction( const MeshPointer& meshPointer )

{



    SetupSynchronizer(meshPointer->GetDistMesh());

    SetupSynchronizer(meshPointer->getDistributedMesh());



   this->meshPointer=meshPointer;

   this->data.setSize( getMesh().template getEntitiesCount< typename Mesh::template EntityType< MeshEntityDimension > >() );
@@ -52,7 +52,7 @@ MeshFunction< Mesh, MeshEntityDimension, Real >:: 
MeshFunction( const ThisType& meshFunction )

{



    SetupSynchronizer(meshFunction.meshPointer->GetDistMesh());

    SetupSynchronizer(meshFunction.meshPointer->getDistributedMesh());



   this->meshPointer=meshFunction.meshPointer;

   this->data.bind( meshFunction.getData() );
@@ -70,7 +70,7 @@ MeshFunction( const MeshPointer& meshPointer, 
{

   TNL_ASSERT_GE( data.getSize(), meshPointer->template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(),

                  "The input vector is not large enough for binding to the mesh function." );      

    SetupSynchronizer(meshPointer->GetDistMesh());

    SetupSynchronizer(meshPointer->getDistributedMesh());



   this->meshPointer=meshPointer;

   this->data.bind( data, offset, getMesh().template getEntitiesCount< typename Mesh::template EntityType< MeshEntityDimension > >() );
@@ -90,7 +90,7 @@ MeshFunction( const MeshPointer& meshPointer, 
   TNL_ASSERT_GE( data->getSize(), offset + meshPointer->template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(),

                  "The input vector is not large enough for binding to the mesh function." );      



    SetupSynchronizer(meshPointer->GetDistMesh());

    SetupSynchronizer(meshPointer->getDistributedMesh());



   this->meshPointer=meshPointer;

   this->data.bind( *data, offset, getMesh().template getEntitiesCount< typename Mesh::template EntityType< MeshEntityDimension > >() );
@@ -188,7 +188,7 @@ MeshFunction< Mesh, MeshEntityDimension, Real >:: 
bind( ThisType& meshFunction )

{



    SetupSynchronizer(meshFunction.meshPointer->GetDistMesh());

    SetupSynchronizer(meshFunction.meshPointer->getDistributedMesh());



   this->meshPointer=meshFunction.meshPointer;

   this->data.bind( meshFunction.getData() );
@@ -207,7 +207,7 @@ bind( const MeshPointer& meshPointer, 
   TNL_ASSERT_GE( data.getSize(), offset + meshPointer->template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(), 

                  "The input vector is not large enough for binding to the mesh function." );    

   

   SetupSynchronizer(meshPointer->GetDistMesh());

   SetupSynchronizer(meshPointer->getDistributedMesh());

  

   this->meshPointer = meshPointer;
@@ -230,7 +230,7 @@ bind( const MeshPointer& meshPointer, 
   TNL_ASSERT_GE( data->getSize(), offset + meshPointer->template getEntitiesCount< typename MeshType::template EntityType< MeshEntityDimension > >(), 

                   "The input vector is not large enough for binding to the mesh function." );      



   SetupSynchronizer(meshPointer->GetDistMesh());

   SetupSynchronizer(meshPointer->getDistributedMesh());



   this->meshPointer = meshPointer;
@@ -247,7 +247,7 @@ MeshFunction< Mesh, MeshEntityDimension, Real >:: 
setMesh( const MeshPointer& meshPointer )

{



   SetupSynchronizer(meshPointer->GetDistMesh());

   SetupSynchronizer(meshPointer->getDistributedMesh());



   this->meshPointer=meshPointer;

   this->data.setSize( getMesh().template getEntitiesCount< typename Mesh::template EntityType< MeshEntityDimension > >() );
@@ -546,7 +546,7 @@ void 
MeshFunction< Mesh, MeshEntityDimension, Real >:: 

synchronize()

{

    auto distrMesh = this->getMesh().GetDistMesh();

    auto distrMesh = this->getMesh().getDistributedMesh();

    if(distrMesh != NULL && distrMesh->isDistributed())

    {

        this->synchronizer.template Synchronize<CommunicatorType>(*this);
@@ -562,7 +562,7 @@ SetupSynchronizer(DistributedMeshType *distrMesh ) 
{

    if(distrMesh)//pokud síť kterou se snaží uživatel nastavit je distruibuovaná

    {

        if(this->getMesh().GetDistMesh()!=distrMesh)//pokud má nová síť jinou distribuovanou síť než předchozí

        if(this->getMesh().getDistributedMesh()!=distrMesh)//pokud má nová síť jinou distribuovanou síť než předchozí

        {

            this->synchronizer.SetDistributedGrid(distrMesh);

        }

src/TNL/Meshes/DistributedMeshes/DistributedGridIO.h

+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 




#include <iostream>

#include <mpi.h>



#ifdef MPIIO

#include <TNL/Communicators/MpiCommunicator.h>
@@ -67,7 +68,7 @@ class DistributedGridIO<MeshFunctionType,LocalCopy> 
    

    static bool save(const String& fileName, MeshFunctionType &meshFunction)

    {

        auto *distrGrid=meshFunction.getMesh().GetDistMesh();

        auto *distrGrid=meshFunction.getMesh().getDistributedMesh();

        

        if(distrGrid==NULL) //not distributed

        {
@@ -113,7 +114,7 @@ class DistributedGridIO<MeshFunctionType,LocalCopy> 
            

    static bool load(const String& fileName,MeshFunctionType &meshFunction) 

    {

        auto *distrGrid=meshFunction.getMesh().GetDistMesh();

        auto *distrGrid=meshFunction.getMesh().getDistributedMesh();

        if(distrGrid==NULL) //not distributed

        {

            return meshFunction.boundLoad(fileName);
@@ -171,7 +172,7 @@ class DistributedGridIO<MeshFunctionType,MpiIO> 
    

    static bool save(const String& fileName, MeshFunctionType &meshFunction)

    {

        auto *distrGrid=meshFunction.getMesh().GetDistMesh();

        auto *distrGrid=meshFunction.getMesh().getDistributedMesh();

        

        if(distrGrid==NULL) //not distributed

        {
@@ -320,7 +321,7 @@ class DistributedGridIO<MeshFunctionType,MpiIO> 
    /* Funky bomb - no checks - only dirty load */

    static bool load(const String& fileName,MeshFunctionType &meshFunction) 

    {

        auto *distrGrid=meshFunction.getMesh().GetDistMesh();

        auto *distrGrid=meshFunction.getMesh().getDistributedMesh();

        if(distrGrid==NULL) //not distributed

        {

            return meshFunction.boundLoad(fileName);

src/TNL/Meshes/GridDetails/Grid1D.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class Grid< 1, Real, Device, Index > : public Object 
   

   void SetDistMesh(DistributedMeshType * distMesh);

   

   DistributedMeshType * GetDistMesh(void) const;

   DistributedMeshType * getDistributedMesh() const;



   /****

    *  Method for saving the object to a file as a binary data

src/TNL/Meshes/GridDetails/Grid1D_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ template< typename Real, 
          typename Device,

          typename Index >

DistributedMeshes::DistributedMesh <Grid< 1, Real, Device, Index >> * 

Grid< 1, Real, Device, Index >:: GetDistMesh(void) const

Grid< 1, Real, Device, Index >:: getDistributedMesh(void) const

{

    return this->distGrid;

}

src/TNL/Meshes/GridDetails/Grid2D.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ class Grid< 2, Real, Device, Index > : public Object 
   

   void SetDistMesh(DistributedMeshType * distGrid);

   

   DistributedMeshType * GetDistMesh(void) const;

   DistributedMeshType * getDistributedMesh(void) const;



   //! Method for saving the object to a file as a binary data

   bool save( File& file ) const;