Commit dfcbf832 authored by Vít Hanousek's avatar Vít Hanousek Committed by Jakub Klinkovský
Browse files

Issue #15 - new DistributedGridSynchronizer pass all tests 

	- added compatibility code for periodic-BC
	- this part of code needs discusion if work corectly
parent 094ffa0e

src/TNL/Meshes/DistributedMeshes/DistributedGridSynchronizer.h

+25 −11
Original line number Diff line number Diff line
@@ -72,14 +72,16 @@ class DistributedMeshSynchronizer< Functions::MeshFunction< Grid< MeshDimension, 
         const CoordinatesType& localSize = this->distributedGrid->getLocalSize(); 

         const CoordinatesType& localGridSize = this->distributedGrid->getLocalGridSize();



         const int *neighbors = distributedGrid->getNeighbors();



         for( int i=0; i<this->getNeighborCount(); i++ )

         {

            Index sendSize=1;//sended and recieve areas has same size



           // bool isBoundary=( neighbor[ i ] == -1 );

            auto directions=Directions::template getXYZ<this->getMeshDimension()>(i);

            auto directions=Directions::template getXYZ<getMeshDimension()>(i);



            sendDimensions[i]=localSize;//sended and recieve areas has same dimensions

            sendDimensions[i]=localSize;//send and recieve areas has same dimensions

            sendBegin[i]=localBegin;

            recieveBegin[i]=localBegin;
@@ -104,9 +106,26 @@ class DistributedMeshSynchronizer< Functions::MeshFunction< Grid< MeshDimension, 
            sendSizes[ i ] = sendSize;

            sendBuffers[ i ].setSize( sendSize );

            recieveBuffers[ i ].setSize( sendSize);



            //Periodic-BC copy from overlap into domain

            //if Im on boundary, and i is direction of the boundary i will swap source and destination

            //i do this only for basic 6 directions, 

            //because this swap at conners and edges produces writing multiple values at sam place in localsubdomain

            {

               if(  (  i==ZzYzXm || i==ZzYzXp 

                     ||i==ZzYmXz || i==ZzYpXz 

                     ||i==ZmYzXz || i==ZpYzXz ) 

                  && neighbors[ i ] == -1) 

               {

                  //swap begins

                  CoordinatesType tmp = sendBegin[i];

                  sendBegin[i]=recieveBegin[i];

                  recieveBegin[i]=tmp;

               }

            }



         }

     }

        

      template< typename CommunicatorType,

                typename MeshFunctionType,
@@ -123,11 +142,6 @@ class DistributedMeshSynchronizer< Functions::MeshFunction< Grid< MeshDimension, 
         const int *neighbors = distributedGrid->getNeighbors();

         const int *periodicNeighbors = distributedGrid->getPeriodicNeighbors();

        

        if( periodicBoundaries )

         {

            std::cerr<<"TOTALY DEMAGED by refactorization" << std::endl;

         }         

        

         //fill send buffers

         copyBuffers( meshFunction, 

            sendBuffers, sendBegin,sendDimensions,
@@ -181,7 +195,7 @@ class DistributedMeshSynchronizer< Functions::MeshFunction< Grid< MeshDimension, 
         bool periodicBoundaries,

         const PeriodicBoundariesMaskPointer& mask )

      {

         using Helper = BufferEntitiesHelper< MeshFunctionType, PeriodicBoundariesMaskPointer, this->getMeshDimension(), Real_, Device >;

         using Helper = BufferEntitiesHelper< MeshFunctionType, PeriodicBoundariesMaskPointer, getMeshDimension(), Real_, Device >;

       

         for(int i=0;i<this->getNeighborCount();i++)

         {

src/UnitTests/Meshes/DistributedMeshes/DistributedGridTest_1D.cpp

+4 −6
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ TEST_F(DistributedGridTest_1D, EvaluateLinearFunction ) 
}





/*TEST_F(DistributedGridTest_1D, SynchronizePeriodicNeighborsWithoutMask )

TEST_F(DistributedGridTest_1D, SynchronizePeriodicNeighborsWithoutMask )

{

   // Setup periodic boundaries

   // TODO: I do not know how to do it better with GTEST
@@ -258,15 +258,13 @@ TEST_F(DistributedGridTest_1D, EvaluateLinearFunction ) 
   constFunctionEvaluator.evaluateAllEntities( meshFunctionPtr, constFunctionPtr );

   meshFunctionPtr->template synchronize<CommunicatorType>( true );



   std::cout << rank << ": " << dof << std::endl;



   if( rank == 0 )

      EXPECT_EQ( dof[ 1 ], -nproc ) << "Left Overlap was filled by wrong process.";

   if( rank == nproc-1 )

      EXPECT_EQ( dof[ dof.getSize() - 2 ], -1 )<< "Right Overlap was filled by wrong process.";

}*/

}





/*

TEST_F(DistributedGridTest_1D, SynchronizePeriodicNeighborsWithActiveMask )

{

   // Setup periodic boundaries
@@ -377,7 +375,7 @@ TEST_F(DistributedGridTest_1D, SynchronizePeriodicBoundariesLinearTest ) 
   if( rank == nproc - 1 )

      EXPECT_EQ( meshFunctionPtr->getValue(entity2), -1 ) << "Linear function Overlap error on right Edge.";

}

*/







#else

src/UnitTests/Meshes/DistributedMeshes/DistributedGridTest_2D.cpp

+2 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ TEST_F(DistributedGridTest_2D, SynchronizerNeighborTest ) 
    }   

}



/*TEST_F(DistributedGridTest_2D, SynchronizerNeighborPeriodicBoundariesWithoutMask )

TEST_F(DistributedGridTest_2D, SynchronizerNeighborPeriodicBoundariesWithoutMask )

{

   // Setup periodic boundaries

   // TODO: I do not know how to do it better with GTEST - additional setup
@@ -1004,7 +1004,7 @@ TEST_F(DistributedGridTest_2D, SynchronizerNeighborPeriodicBoundariesWithInActiv 
      checkDownBoundary(  *gridPtr, *dof, true, false, 8 );

      checkRightBoundary( *gridPtr, *dof, true, false, -7 );

   }

}*/

}

 

#else

TEST(NoMPI, NoTest)