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

Revert "Smart pointers: renamed modifyData method to getData"

This reverts commit 40379dcf.
parent 5a054685
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ class DevicePointer< Object, Devices::Host > : public SmartPointer

      template< typename Device = Devices::Host >
      __cuda_callable__
      Object& getData()
      Object& modifyData()
      {
         return *( this->pointer );
      }
@@ -308,7 +308,7 @@ class DevicePointer< Object, Devices::Cuda > : public SmartPointer

      template< typename Device = Devices::Host >
      __cuda_callable__
      Object& getData()
      Object& modifyData()
      {
         static_assert( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Cuda >::value, "Only Devices::Host or Devices::Cuda devices are accepted here." );
         Assert( this->pointer, );
+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ evaluateEntities( OutMeshFunctionPointer& meshFunction,
   SharedPointer< TraverserUserData, DeviceType >
      userData( &function.template getData< DeviceType >(),
                time,
                &meshFunction.template getData< DeviceType >(),
                &meshFunction.template modifyData< DeviceType >(),
                outFunctionMultiplicator,
                inFunctionMultiplicator );
   Meshes::Traverser< MeshType, MeshEntityType > meshTraverser;
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ getCompressedRowsLengths( const MeshPointer& meshPointer,
      SharedPointer< TraversalUserData, DeviceType >
         userData( &differentialOperatorPointer.template getData< DeviceType >(),
                   &boundaryConditionsPointer.template getData< DeviceType >(),
                   &rowLengthsPointer.template getData< DeviceType >() );
                   &rowLengthsPointer.template modifyData< DeviceType >() );
      Meshes::Traverser< MeshType, EntityType > meshTraversal;
      meshTraversal.template processBoundaryEntities< TraversalUserData,
                                                      TraversalBoundaryEntitiesProcessor >
+4 −4
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ processEntities(
      GridBoundaryTraverser1D< Real, Index, GridEntity, UserData, EntitiesProcessor >
            <<< cudaBlocks, cudaBlockSize >>>
            ( &gridPointer.template getData< Devices::Cuda >(),
              &userDataPointer.template getData< Devices::Cuda >(),
              &userDataPointer.template modifyData< Devices::Cuda >(),
              &kernelData.template getData< Devices::Cuda >() );
   }
   else
@@ -187,7 +187,7 @@ processEntities(
         GridTraverser1D< Real, Index, GridEntity, UserData, EntitiesProcessor >
            <<< cudaBlocks, cudaBlockSize >>>
            ( &gridPointer.template getData< Devices::Cuda >(),
              &userDataPointer.template getData< Devices::Cuda >(),
              &userDataPointer.template modifyData< Devices::Cuda >(),
              &kernelData.template getData< Devices::Cuda >(),
              gridXIdx );
   }
@@ -343,7 +343,7 @@ processEntities(
         GridTraverser2D< Real, Index, GridEntity, UserData, EntitiesProcessor, processOnlyBoundaryEntities >
            <<< cudaBlocks, cudaBlockSize >>>
            ( &gridPointer.template getData< Devices::Cuda >(),
              &userDataPointer.template getData< Devices::Cuda >(),
              &userDataPointer.template modifyData< Devices::Cuda >(),
              &kernelData.template getData< Devices::Cuda >(),
              gridXIdx,
              gridYIdx );
@@ -530,7 +530,7 @@ processEntities(
            GridTraverser3D< Real, Index, GridEntity, UserData, EntitiesProcessor, processOnlyBoundaryEntities >
               <<< cudaBlocks, cudaBlockSize >>>
               ( &gridPointer.template getData< Devices::Cuda >(),
                 &userDataPointer.template getData< Devices::Cuda >(),
                 &userDataPointer.template modifyData< Devices::Cuda >(),
                 &kernelData.template getData< Devices::Cuda >(),
                 gridXIdx,
                 gridYIdx,
+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ class SharedPointer< Object, Devices::Host, lazy > : public SmartPointer

      template< typename Device = Devices::Host >
      __cuda_callable__
      Object& getData()
      Object& modifyData()
      {
         return *( this->pointer );
      }
@@ -430,7 +430,7 @@ class SharedPointer< Object, Devices::Cuda, lazy > : public SmartPointer

      template< typename Device = Devices::Host >
      __cuda_callable__
      Object& getData()
      Object& modifyData()
      {
         static_assert( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Cuda >::value, "Only Devices::Host or Devices::Cuda devices are accepted here." );
         Assert( this->pointer, );
Loading