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

Implementing multi-diagonal matrix format. 

Fixing operator == in tnlString.
parent 929898a4

.cproject

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.configuration.build.1902170740." name="/" resourcePath="">

<toolChain id="org.eclipse.linuxtools.cdt.autotools.toolChain.1288116166" name="GNU Autotools Toolchain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.linuxtools.cdt.autotools.toolChain">

<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform.1947158758" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform"/>

<builder buildPath="${workspace_loc:/tnl/build}" command="make" enableAutoBuild="true" enableCleanBuild="false" id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.212780712" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Autotools Makefile Generator.Build (GNU)" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.212780712"/>

<builder buildPath="/home/oberhuber/workspace" command="make" enableAutoBuild="true" enableCleanBuild="false" id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.212780712" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Autotools Makefile Generator.Build (GNU)"/>

<tool id="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure.141790725" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure">

<option id="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir.269985246" name="Build directory" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.builddir" value="build" valueType="string"/>

<option id="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix.180395393" name="Arch-independent install directory (--prefix)" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix" value="/home/oberhuber/local" valueType="string"/>

buildAll

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ then 
fi



cd Debug

cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} -DCUDA_ARCHITECTURE=2.0 -DWITH_CUDA=yes

cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${HOME}/local -DCUDA_ARCHITECTURE=1.2 -DWITH_CUDA=no

make -j${CPUS} #VERBOSE=1

make -j${CPUS} test

make -j${CPUS} install



cd ../Release

cmake .. -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} -DCUDA_ARCHITECTURE=2.0 -DWITH_CUDA=yes

cmake .. -DCMAKE_INSTALL_PREFIX=${HOME}/local -DCUDA_ARCHITECTURE=1.2 -DWITH_CUDA=no

make -j${CPUS} #VERBOSE=1

make -j${CPUS} test

make -j${CPUS} install

src/core/tnlString.cpp

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ tnlString tnlString :: operator + ( const char* str ) 
bool tnlString :: operator == ( const tnlString& str ) const

{

   assert( string && str. string );

   if( str. length != length )

      return false;

   if( strcmp( string, str. string ) == 0 )

      return true;

   return false;

src/matrix/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ SET( headers tnlAdaptiveRgCSRMatrix.h 
	         tnlFastRgCSRMatrix.h

	         tnlFullMatrix.h

	         tnlMatrix.h

	         tnlMultiDiagonalMatrix.h

	         tnlPETSCMatrix.h

	         tnlRgCSRMatrix.h

	)

src/matrix/tnlCSRMatrix.h

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ bool tnlCSRMatrix< Real, Device, Index > :: shiftElements( Index position, 
         cls[ i ] = -1;

      }

   }

   else // if( shift > 0 ) - note shift mus be < 0 now

   else // if( shift > 0 ) - note shift must be < 0 now

   {

      for( Index i = position; i < last_nonzero_element; i ++ )

      {