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

Merge branch 'mhfem' into revisions 

Conflicts:
	src/core/arrays/tnlStaticArray.h
	src/core/arrays/tnlStaticArray1D_impl.h
	src/core/arrays/tnlStaticArray2D_impl.h
	src/core/arrays/tnlStaticArray3D_impl.h
	src/core/arrays/tnlStaticArray_impl.h
	src/core/vectors/tnlSharedVector.h
	src/core/vectors/tnlStaticVector.h
	src/functions/tnlFunctionEnumerator_impl.h
	src/functions/tnlTestFunction.h
	src/solvers/linear/krylov/tnlGMRESSolver_impl.h
	src/solvers/linear/krylov/tnlTFQMRSolver_impl.h
	src/solvers/tnlSolverConfig_impl.h
	tools/src/tnl-cuda-arch.cu
parents b10b293b 48aade10

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ if( CMAKE_BUILD_TYPE STREQUAL "Debug") 
    set( LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/lib )

    set( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/Debug/bin )

    set( debugExt -dbg )

    set( CXX_FLAGS "${CXXFLAGS} -g ")

    set( CMAKE_CXX_FLAGS "${CXXFLAGS} -g ")

    #AddCompilerFlag( "-g" )

else()

    set( PROJECT_BUILD_PATH ${PROJECT_SOURCE_DIR}/Release/src )

src/config/tnlParameterContainer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
#include <ctype.h>

#include <cstring>

#include <stdio.h>



#include "tnlParameterContainer.h"

#include <core/tnlObject.h>



bool matob( const char* value, bool& ret_val )

{

src/core/arrays/tnlSharedArray.h

+8 −0
Original line number Diff line number Diff line
@@ -44,13 +44,17 @@ class tnlSharedArray : public tnlObject 
   typedef tnlSharedArray< Element, tnlHost, Index > HostType;

   typedef tnlSharedArray< Element, tnlCuda, Index > CudaType;



   __cuda_callable__

   tnlSharedArray();



   __cuda_callable__

   tnlSharedArray( Element* _data,

                   const Index _size );



   __cuda_callable__

   tnlSharedArray( tnlArray< Element, Device, Index >& array );



   __cuda_callable__

   tnlSharedArray( tnlSharedArray< Element, Device, Index >& array );



   static tnlString getType();
@@ -61,17 +65,21 @@ class tnlSharedArray : public tnlObject 


   virtual tnlString getSerializationTypeVirtual() const;



   __cuda_callable__

   void bind( Element* _data,

              const Index _size );



   template< typename Array >

   __cuda_callable__

   void bind( Array& array,

              IndexType index = 0,

              IndexType size = 0 );



   template< int Size >

   __cuda_callable__

   void bind( tnlStaticArray< Size, Element >& array );



   __cuda_callable__

   void bind( tnlSharedArray< Element, Device, Index >& array );



   void swap( tnlSharedArray< Element, Device, Index >& array );

src/core/arrays/tnlSharedArray_impl.h

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ using namespace std; 
template< typename Element,

          typename Device,

          typename Index >

__cuda_callable__

tnlSharedArray< Element, Device, Index >::tnlSharedArray()

: size( 0 ), data( 0 )

{
@@ -39,6 +40,7 @@ tnlSharedArray< Element, Device, Index >::tnlSharedArray() 
template< typename Element,

          typename Device,

          typename Index >

__cuda_callable__

tnlSharedArray< Element, Device, Index >::tnlSharedArray( Element* _data,

                                                          const Index _size )

{
@@ -48,6 +50,7 @@ tnlSharedArray< Element, Device, Index >::tnlSharedArray( Element* _data, 
template< typename Element,

          typename Device,

          typename Index >

__cuda_callable__

tnlSharedArray< Element, Device, Index >::tnlSharedArray( tnlArray< Element, Device, Index >& array )

{

   this->bind( array );
@@ -56,6 +59,7 @@ tnlSharedArray< Element, Device, Index >::tnlSharedArray( tnlArray< Element, Dev 
template< typename Element,

          typename Device,

          typename Index >

__cuda_callable__

tnlSharedArray< Element, Device, Index >::tnlSharedArray( tnlSharedArray< Element, Device, Index >& array )

{

   this->bind( array );
@@ -99,6 +103,7 @@ tnlString tnlSharedArray< Element, Device, Index > :: getSerializationTypeVirtua 
template< typename Element,

          typename Device,

          typename Index >

__cuda_callable__

void tnlSharedArray< Element, Device, Index > :: bind( Element* data,

                                                       const Index size )

{
@@ -116,6 +121,7 @@ template< typename Element, 
          typename Device,

          typename Index >

   template< typename Array >

__cuda_callable__

void tnlSharedArray< Element, Device, Index > :: bind( Array& array,

                                                       IndexType index,

                                                       IndexType size )
@@ -135,6 +141,7 @@ template< typename Element, 
          typename Device,

          typename Index >

   template< int Size >

__cuda_callable__

void tnlSharedArray< Element, Device, Index >::bind( tnlStaticArray< Size, Element >& array )

{

   this->size = Size;
@@ -144,6 +151,7 @@ void tnlSharedArray< Element, Device, Index >::bind( tnlStaticArray< Size, Eleme 
template< typename Element,

          typename Device,

          typename Index >

__cuda_callable__

void tnlSharedArray< Element, Device, Index > :: bind( tnlSharedArray< Element, Device, Index >& array )

{

   this -> size = array. getSize();

src/core/arrays/tnlStaticArray3D_impl.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ tnlString tnlStaticArray< 3, Element >::getType() 
}



template< typename Element >

__cuda_callable__

inline int tnlStaticArray< 3, Element >::getSize() const

{

   return size;