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

Merge branch 'revisions' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into revisions

parents 270c2277 1a7b7b81

examples/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
add_subdirectory( heat-equation )

add_subdirectory( navier-stokes )

#add_subdirectory( mean-curvature-flow )
 
add_subdirectory( mean-curvature-flow )

src/core/vectors/tnlSharedVector.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <core/arrays/tnlSharedArray.h>

#include <core/vectors/tnlVector.h>

#include <functions/tnlFunction.h>

#include <functions/tnlDomain.h>



class tnlHost;

src/core/vectors/tnlVector.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define TNLVECTOR_H_



#include <core/arrays/tnlArray.h>

#include <functions/tnlFunction.h>

#include <functions/tnlDomain.h>



class tnlHost;

src/functions/CMakeLists.txt

+2 −4
Original line number Diff line number Diff line 
ADD_SUBDIRECTORY( initial_conditions )



SET( headers tnlFunctionDiscretizer.h

             tnlFunctionDiscretizer_impl.h

             tnlFunctionEvaluator.h

SET( headers tnlFunctionEvaluator.h

             tnlFunctionEvaluator_impl.h

             tnlFunctionAdapter.h

             tnlConstantFunction.h
@@ -14,7 +12,7 @@ SET( headers tnlFunctionDiscretizer.h 
             tnlSinWaveFunction.h

             tnlSinWaveFunction_impl.h

             tnlTestFunction.h

             tnlFunction.h

             tnlDomain.h

             tnlTestFunction_impl.h )



SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/functions )

src/functions/initial_conditions/level_set_functions/tnlBlobFunction.h

+27 −20
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 


#include <config/tnlParameterContainer.h>

#include <core/vectors/tnlStaticVector.h>

#include <functions/tnlFunction.h>

#include <functions/tnlDomain.h>

#include <core/tnlCuda.h>



template< typename Real,

          int Dimensions >

class tnlBlobFunctionBase : public tnlFunction< Dimensions, AnalyticFunction >

class tnlBlobFunctionBase : public tnlDomain< Dimensions, SpaceDomain >

{

   public:
@@ -61,16 +61,18 @@ class tnlBlobFunction< 1, Real > : public tnlBlobFunctionBase< Real, 1 > 
#ifdef HAVE_NOT_CXX11

      template< int XDiffOrder,

                int YDiffOrder,

                int ZDiffOrder,

                typename Vertex >

                int ZDiffOrder >

#else

      template< int XDiffOrder = 0,

                int YDiffOrder = 0,

                int ZDiffOrder = 0,

                typename Vertex = VertexType >

                int ZDiffOrder = 0 >

#endif   

      __cuda_callable__

      RealType getValue( const Vertex& v,

      RealType getPartialDerivative( const VertexType& v,

                                     const Real& time = 0.0 ) const;

      

      __cuda_callable__

      RealType operator()( const VertexType& v,

                           const Real& time = 0.0 ) const;      

};
@@ -90,17 +92,20 @@ class tnlBlobFunction< 2, Real > : public tnlBlobFunctionBase< Real, 2 > 
#ifdef HAVE_NOT_CXX11

      template< int XDiffOrder,

                int YDiffOrder,

                int ZDiffOrder,

                typename Vertex >

                int ZDiffOrder >

#else

      template< int XDiffOrder = 0,

                int YDiffOrder = 0,

                int ZDiffOrder = 0,

                typename Vertex = VertexType >

                int ZDiffOrder = 0 >

#endif

      __cuda_callable__

      RealType getValue( const Vertex& v,

      RealType getPartialDerivative( const VertexType& v,

                                     const Real& time = 0.0 ) const;



      __cuda_callable__

      RealType operator()( const VertexType& v,

                           const Real& time = 0.0 ) const;

      

};



template< typename Real >
@@ -119,16 +124,18 @@ class tnlBlobFunction< 3, Real > : public tnlBlobFunctionBase< Real, 3 > 
#ifdef HAVE_NOT_CXX11

      template< int XDiffOrder,

                int YDiffOrder,

                int ZDiffOrder,

                typename Vertex >

                int ZDiffOrder >

#else

      template< int XDiffOrder = 0,

                int YDiffOrder = 0,

                int ZDiffOrder = 0,

                typename Vertex = VertexType >

                int ZDiffOrder = 0 >

#endif   

      __cuda_callable__

      RealType getValue( const Vertex& v,

      RealType getPartialDerivative( const VertexType& v,

                                     const Real& time = 0.0 ) const;

      

      __cuda_callable__

      RealType operator()( const VertexType& v,

                           const Real& time = 0.0 ) const;      

};