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

Merge branch 'diffusion'

parents 008b4cb0 b247882c

install

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


TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=yes

WITH_CUDA=no

TEMPLATE_EXPLICIT_INSTANTIATION=yes

#VERBOSE="VERBOSE=1"

src/functions/tnlConstantFunction.h

+2 −4
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ class tnlConstantFunction 
             int ZDiffOrder,

             typename Vertex >

#else

   template< int XDiffOrder = 0,

   template< int XDiffOrder,

             int YDiffOrder = 0,

             int ZDiffOrder = 0,

             typename Vertex = VertexType >

#endif

   RealType getValue( const Vertex& v,

                      const Real& time = 0.0 ) const;

#ifdef HAVE_NOT_CXX11



   template< typename Vertex >

   RealType getValue( const Vertex& v,

                      const Real& time = 0.0 ) const
@@ -63,8 +63,6 @@ class tnlConstantFunction 
      return getValue< 0, 0, 0, Vertex >( v, time );

   }



#endif



   protected:



   RealType value;

src/implementation/core/arrays/tnlMultiArray1D_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ template< typename Element, typename Device, typename Index > 
Index tnlMultiArray< 1, Element, Device, Index > :: getElementIndex( const Index i ) const

{

   tnlAssert( i >= 0 && i < this -> dimensions[ 0 ],

              printf( "i = %d this -> dimensions[ 0 ] = %d \n", ( int ) i, ( int ) this -> dimensions[ 0 ] ) );

              cerr << "i = " << i << " this -> dimensions[ 0 ] = " <<  this -> dimensions[ 0 ] );

   return i;

}

src/implementation/core/arrays/tnlMultiArray2D_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ template< typename Element, typename Device, typename Index > 
Index tnlMultiArray< 2, Element, Device, Index > :: getElementIndex( const Index j, const Index i ) const

{

   tnlAssert( i >= 0 && i < this -> dimensions[ 0 ] && j >= 0 && j < this -> dimensions[ 1 ],

              printf( "i = %d j = %d this -> dimensions[ 0 ] = %d this -> dimensions[ 1 ] = %d \n",

               i, j, this -> dimensions[ 0 ], this -> dimensions[ 1 ] ) );

              cerr << "i = " << i << " j = " << j << " this -> dimensions[ 0 ] = " <<  this -> dimensions[ 0 ]

                   << " this -> dimensions[ 1 ] = " << this -> dimensions[ 1 ] );

   return j * this -> dimensions[ 0 ] + i;

}

src/implementation/functions/tnlConstantFunction_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ tnlConstantFunction< Dimensions, Real >:: 
setup( const tnlParameterContainer& parameters,

      const tnlString& prefix )

{

   this->setValue( parameters.GetParameter< double >( prefix + "-value") );

   this->setValue( parameters.GetParameter< double >( prefix + "value") );

   return true;

}