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

Fixes after merge.

parent 9def75c2

install

+3 −28
Original line number Diff line number Diff line 
#!/bin/bash



TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=no

TEMPLATE_EXPLICIT_INSTANTIATION=yes

INSTALL_PREFIX=${HOME}/.local

BUILD_RELEASE=yes

BUILD_DEBUG=yes

#VERBOSE="VERBOSE=1"



CMAKE="cmake"

CPUS=`grep -c processor /proc/cpuinfo`

#CPUS="1"





for option in "$@"

do

    case $option in
@@ -48,16 +42,6 @@ then 
    cd ..

fi





PREFIX=${HOME}/.local

for option in "$@"

do

    case $option in

        --prefix=*                     ) PREFIX="${option#*=}" ;;

    esac

done





TNL_TEST=`which tnl-bindir`



if test x${TNL_TEST} = x;
@@ -86,13 +70,4 @@ then 
    echo "export LD_LIBRARY_PATH"

fi



if test ${BUILD_RELEASE} = "yes";

then

    BUILD_PREFIX="Release"

fi

if test ${BUILD_DEBUG} = "yes";

then

    BUILD_PREFIX="Debug"

fi



exit 0

src/TNL/Matrices/Ellpack.h

+0 −19
Original line number Diff line number Diff line
@@ -131,25 +131,6 @@ public: 
   RealType getElement( const IndexType row,

                        const IndexType column ) const;



   RealType getElementInRow( const IndexType row,

						const IndexType indexInRow ) const

   {

		typedef tnlEllpackMatrixDeviceDependentCode< DeviceType > DDCType;

		IndexType elementPtr = DDCType::getRowBegin( *this, row );

		const IndexType step = DDCType::getElementStep( *this );

		elementPtr += indexInRow * step;

		return this->values.getElement( elementPtr );

   }

	RealType getColumnInRow( const IndexType row,

						 const IndexType indexInRow ) const

	{

		typedef tnlEllpackMatrixDeviceDependentCode< DeviceType > DDCType;

		IndexType elementPtr = DDCType::getRowBegin( *this, row );

		const IndexType step = DDCType::getElementStep( *this );

		elementPtr += indexInRow * step;

		return this->columnIndexes.getElement( elementPtr );

	}



   __cuda_callable__

   void getRowFast( const IndexType row,

                    IndexType* columns,

src/TNL/Matrices/Ellpack_impl.h

+12 −12
Original line number Diff line number Diff line
@@ -580,16 +580,16 @@ template< typename Real, 
          typename Device,

          typename Index >

   template< typename Vector >

bool tnlEllpackMatrix< Real, Device, Index > :: performJacobiIteration( const Vector& b,

bool

Ellpack< Real, Device, Index >::

performJacobiIteration( const Vector& b,

                        const IndexType row,

                        const Vector& old_x,

                        Vector& x,

                        const RealType& omega ) const

{

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

			  cerr << "row = " << row

				   << " this->getRows() = " << this->getRows()

				   << " this->getName() = " << this->getName() << endl );

   TNL_ASSERT( row >=0 && row < this->getRows(),

               std::cerr << "row = " << row << " this->getRows() = " << this->getRows() << std::endl );



   RealType diagonalValue( 0.0 );

   RealType sum( 0.0 );
@@ -609,7 +609,7 @@ bool tnlEllpackMatrix< Real, Device, Index > :: performJacobiIteration( const Ve 
   }

   if( diagonalValue == ( Real ) 0.0 )

   {

	  cerr << "There is zero on the diagonal in " << row << "-th row of thge matrix " << this->getName() << ". I cannot perform SOR iteration." << endl;

	  std::cerr << "There is zero on the diagonal in " << row << "-th row of the matrix. I cannot perform the Jacobi iteration." << std::endl;

	  return false;

   }

   x[ row ] = ( 1.0 - omega ) * old_x[ row ] + omega / diagonalValue * ( b[ row ] - sum );

src/TNL/Matrices/SparseRow.h

+3 −3
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ class SparseRow 
 

      void print( std::ostream& str ) const;



  // protected:

   protected:



	  const Real* values;

	   Real* values;



	  const Index* columns;

	   Index* columns;



      Index length, step;

};

src/TNL/Matrices/BiEllpack_impl.h

+1 −1

File changed.

Contains only whitespace changes.