Commit 5461f6c0 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber Committed by Tomáš Oberhuber
Browse files

Changed Object load and save from bool to void.

parent 453f554c
Loading
Loading
Loading
Loading
+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 );
+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;
}

+3 −3
Original line number Diff line number Diff line
@@ -332,9 +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" ) ) )
      matrixPointer->load( parameters.getParameter< String >( "input-matrix" ) );
      x0.load( parameters.getParameter< String >( "input-dof" ) );
      b.load( parameters.getParameter< String >( "input-rhs" ) );
          return false;

      typename MatrixType::CompressedRowLengthsVector rowLengths;
+3 −6
Original line number Diff line number Diff line
@@ -193,16 +193,13 @@ makeSnapshot( const RealType& time,
   fileName.setExtension( "tnl" );
   fileName.setIndex( step );
   fileName.setFileNameBase( "density-" );
   if( ! this->conservativeVariables->getDensity()->save( fileName.getFileName() ) )
      return false;
   this->conservativeVariables->getDensity()->save( fileName.getFileName() );
   
   fileName.setFileNameBase( "velocity-" );
   if( ! this->velocity->save( fileName.getFileName() ) )
      return false;
   this->velocity->save( fileName.getFileName() );

   fileName.setFileNameBase( "pressure-" );
   if( ! this->pressure->save( fileName.getFileName() ) )
      return false;
   this->pressure->save( fileName.getFileName() );

   /*fileName.setFileNameBase( "energy-" );
   if( ! this->conservativeVariables->getEnergy()->save( fileName.getFileName() ) )
+3 −6
Original line number Diff line number Diff line
@@ -193,16 +193,13 @@ makeSnapshot( const RealType& time,
   fileName.setExtension( "tnl" );
   fileName.setIndex( step );
   fileName.setFileNameBase( "density-" );
   if( ! this->conservativeVariables->getDensity()->save( fileName.getFileName() ) )
      return false;
   this->conservativeVariables->getDensity()->save( fileName.getFileName() );
   
   fileName.setFileNameBase( "velocity-" );
   if( ! this->velocity->save( fileName.getFileName() ) )
      return false;
   this->velocity->save( fileName.getFileName() );

   fileName.setFileNameBase( "pressure-" );
   if( ! this->pressure->save( fileName.getFileName() ) )
      return false;
   this->pressure->save( fileName.getFileName() );

   /*fileName.setFileNameBase( "energy-" );
   if( ! this->conservativeVariables->getEnergy()->save( fileName.getFileName() ) )
Loading