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

Merge branch 'periodic-bc' into develop

parents 551e5878 b57c4fd0

src/TNL/Pointers/SharedPointerCuda.h

+4 −2
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ class SharedPointer< Object, Devices::Cuda > : public SmartPointer 
      {

         this->free();

         this->pd = (PointerData*) ptr.pd;

         if( this->pd != nullptr ) 

            this->pd->counter += 1;

         return *this;

      }
@@ -202,6 +203,7 @@ class SharedPointer< Object, Devices::Cuda > : public SmartPointer 
      {

         this->free();

         this->pd = (PointerData*) ptr.pd;

         if( this->pd != nullptr ) 

            this->pd->counter += 1;

         return *this;

      }

src/TNL/Pointers/SharedPointerHost.h

+4 −2
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ class SharedPointer< Object, Devices::Host > : public SmartPointer 
      {

         this->free();

         this->pd = (PointerData*) ptr.pd;

         if( this->pd != nullptr )

            this->pd->counter += 1;

         return *this;

      }
@@ -178,6 +179,7 @@ class SharedPointer< Object, Devices::Host > : public SmartPointer 
      {

         this->free();

         this->pd = (PointerData*) ptr.pd;

         if( this->pd != nullptr )

            this->pd->counter += 1;

         return *this;

      }

src/TNL/Pointers/SharedPointerMic.h

+4 −2
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ class SharedPointer< Object, Devices::MIC > : public SmartPointer 
         this->free();

         this->pd = (PointerData*) ptr.pd;

         this->mic_pointer = ptr.mic_pointer;

         if( this->pd != nullptr )

            this->pd->counter += 1;

#ifdef TNL_DEBUG_SHARED_POINTERS

         std::cerr << "Copy-assigned shared pointer: counter = " << this->pd->counter << ", type: " << demangle(typeid(ObjectType).name()) << std::endl;
@@ -203,6 +204,7 @@ class SharedPointer< Object, Devices::MIC > : public SmartPointer 
         this->free();

         this->pd = (PointerData*) ptr.pd;

         this->mic_pointer = ptr.mic_pointer;

         if( this->pd != nullptr )

            this->pd->counter += 1;

#ifdef TNL_DEBUG_SHARED_POINTERS

         std::cerr << "Copy-assigned shared pointer: counter = " << this->pd->counter << ", type: " << demangle(typeid(ObjectType).name()) << std::endl;

src/TNL/Solvers/ODE/Euler.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class Euler : public ExplicitSolver< Problem > 


   Euler();



   String getType() const;

   static String getType();



   static void configSetup( Config::ConfigDescription& config,

                            const String& prefix = "" );

src/TNL/Solvers/ODE/Euler_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ Euler< Problem > :: Euler() 
};



template< typename Problem >

String Euler< Problem > :: getType() const

String Euler< Problem > :: getType()

{

   return String( "Euler< " ) +

          Problem :: getType() +