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

Merge branch 'master' into develop 

Conflicts:
	src/solvers/tnlBuildConfigTags.h
parents 487fa28b e15bb428

examples/inviscid-flow/2d/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line 
set( tnl_heat_equation_SOURCES     

     euler.cpp

     euler.cu )

     euler-cuda.cu )

               

IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE(tnl-euler-2d${debugExt} euler.cu)
@@ -15,7 +15,7 @@ INSTALL( TARGETS tnl-euler-2d${debugExt} 
         RUNTIME DESTINATION bin

         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

        

INSTALL( FILES tnl-run-euler-2d

INSTALL( FILES run-euler

               ${tnl_heat_equation_SOURCES}

         DESTINATION share/tnl-${tnlVersion}/examples/inviscid-flow-2d )

src/matrices/tnlDenseMatrix.h

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ class tnlDenseMatrix : public tnlMatrix< Real, Device, Index > 
                const RealType& thisRowMultiplicator = 1.0 );



   __cuda_callable__

   Real getElementFast( const IndexType row,

   const Real& getElementFast( const IndexType row,

                               const IndexType column ) const;



   Real getElement( const IndexType row,

src/matrices/tnlDenseMatrix_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ template< typename Real, 
          typename Device,

          typename Index >

__cuda_callable__

Real tnlDenseMatrix< Real, Device, Index >::getElementFast( const IndexType row,

const Real& tnlDenseMatrix< Real, Device, Index >::getElementFast( const IndexType row,

                                                            const IndexType column ) const

{

   tnlAssert( row >= 0 && row < this->getRows() &&