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

Merge branch 'revision' into 'develop' 

Revision

See merge request !29
parents 16b4091d 5c331975

Documentation/Doxyfile

+2 −1
Original line number Diff line number Diff line
@@ -2107,7 +2107,8 @@ INCLUDE_FILE_PATTERNS = 
# recursively expanded use the := operator instead of the = operator.

# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.



PREDEFINED             =

PREDEFINED             = HAVE_MPI=1

                         HAVE_CUDA=1



# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

# tag can be used to specify a list of macro names that should be expanded. The

src/Benchmarks/BLAS/array-operations.h

+2 −2
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ benchmarkArrayOperations( Benchmark & benchmark, 




   auto compareHost = [&]() {

      resultHost = (int) hostArray == hostArray2;

      resultHost = (int) ( hostArray == hostArray2 );

   };

   auto compareCuda = [&]() {

      resultDevice = (int) deviceArray == deviceArray2;

      resultDevice = (int) ( deviceArray == deviceArray2 );

   };

   benchmark.setOperation( "comparison (operator==)", 2 * datasetSize );

   benchmark.time< Devices::Host >( reset1, "CPU", compareHost );

src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h

+2 −3
Original line number Diff line number Diff line
@@ -163,9 +163,8 @@ struct SpmvBenchmark 
   {

      MatrixType matrix;

      VectorType vector;

      if( ! matrix.load( parameters.getParameter< String >( "input-matrix" ) ) ||

          ! vector.load( parameters.getParameter< String >( "input-vector" ) ) )

          return false;

      matrix.load( parameters.getParameter< String >( "input-matrix" ) );

      vector.load( parameters.getParameter< String >( "input-vector" ) );



      typename MatrixType::CompressedRowLengthsVector rowLengths;

      matrix.getCompressedRowLengths( rowLengths );

src/Benchmarks/HeatEquation/HeatEquationBenchmarkProblem_impl.h

+6 −3
Original line number Diff line number Diff line
@@ -144,7 +144,11 @@ setInitialCondition( const Config::ParameterContainer& parameters, 
{

   const String& initialConditionFile = parameters.getParameter< String >( "initial-condition" );

   Functions::MeshFunction< Mesh > u( this->getMesh(), dofsPointer );

   if( ! u.boundLoad( initialConditionFile ) )

   try

   {

      u.boundLoad( initialConditionFile );

   }

   catch(...)

   {

      std::cerr << "I am not able to load the initial condition from the file " << initialConditionFile << "." << std::endl;

      return false;
@@ -200,8 +204,7 @@ makeSnapshot( const RealType& time, 
   fileName.setIndex( step );



   //FileNameBaseNumberEnding( "u-", step, 5, ".tnl", fileName );

   if( ! u.save( fileName.getFileName() ) )

      return false;

   u.save( fileName.getFileName() );

   return true;

}

src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h

+3 −4
Original line number Diff line number Diff line
@@ -332,10 +332,9 @@ struct LinearSolversBenchmark 
   {

      SharedPointer< MatrixType > matrixPointer;

      VectorType x0, b;

      if( ! matrixPointer->load( parameters.getParameter< String >( "input-matrix" ) ) ||

          ! x0.load( parameters.getParameter< String >( "input-dof" ) ) ||

          ! b.load( parameters.getParameter< String >( "input-rhs" ) ) )

          return false;

      matrixPointer->load( parameters.getParameter< String >( "input-matrix" ) );

      x0.load( parameters.getParameter< String >( "input-dof" ) );

      b.load( parameters.getParameter< String >( "input-rhs" ) );



      typename MatrixType::CompressedRowLengthsVector rowLengths;

      matrixPointer->getCompressedRowLengths( rowLengths );