Commit 624e709f authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed copy-assignment operator in DistributedArrayView according to DistributedVectorView

parent 19e9b4e5

src/TNL/Containers/DistributedArrayView.hpp

+14 −8
Original line number Diff line number Diff line
@@ -375,10 +375,13 @@ operator=( const DistributedArrayView& view ) 
   TNL_ASSERT_EQ( getLocalRange(), view.getLocalRange(), "The local ranges must be equal, views are not resizable." );

   TNL_ASSERT_EQ( getGhosts(), view.getGhosts(), "Ghosts must be equal, views are not resizable." );

   TNL_ASSERT_EQ( getCommunicationGroup(), view.getCommunicationGroup(), "The communication groups of the array views must be equal." );

   localData = view.getConstLocalViewWithGhosts();

   // set, but do not unset, the synchronizer

   if( view.getSynchronizer() )

      setSynchronizer( view.getSynchronizer(), view.getValuesPerElement() );



   if( this->getCommunicationGroup() != MPI::NullGroup() ) {

      // TODO: it might be better to split the local and ghost parts and synchronize in the middle

      this->waitForSynchronization();

      view.waitForSynchronization();

      getLocalViewWithGhosts() = view.getConstLocalViewWithGhosts();

   }

   return *this;

}
@@ -394,10 +397,13 @@ operator=( const Array& array ) 
   TNL_ASSERT_EQ( getLocalRange(), array.getLocalRange(), "The local ranges must be equal, views are not resizable." );

   TNL_ASSERT_EQ( getGhosts(), array.getGhosts(), "Ghosts must be equal, views are not resizable." );

   TNL_ASSERT_EQ( getCommunicationGroup(), array.getCommunicationGroup(), "The communication groups must be equal." );

   localData = array.getConstLocalViewWithGhosts();

   // set, but do not unset, the synchronizer

   if( array.getSynchronizer() )

      setSynchronizer( array.getSynchronizer(), array.getValuesPerElement() );



   if( this->getCommunicationGroup() != MPI::NullGroup() ) {

      // TODO: it might be better to split the local and ghost parts and synchronize in the middle

      this->waitForSynchronization();

      array.waitForSynchronization();

      getLocalViewWithGhosts() = array.getConstLocalViewWithGhosts();

   }

   return *this;

}