Commit 4c1e8ae0 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Merge branch 'JK/mesh' into 'develop' 

New mesh readers/writers, Grid and DistributedGrid refactoring

See merge request !97
parents 5e5f0d88 0fac26c7

src/Benchmarks/HeatEquation/HeatEquationBenchmarkProblem_impl.h

+62 −66
Original line number Diff line number Diff line
@@ -133,11 +133,7 @@ setInitialCondition( const Config::ParameterContainer& parameters, 
   const String& initialConditionFile = parameters.getParameter< String >( "initial-condition" );

   MeshFunctionViewType u;

   u.bind( this->getMesh(), *dofsPointer );

   try

   {

      u.boundLoad( initialConditionFile );

   }

   catch(...)

   if( ! Functions::readMeshFunction( u, "u", initialConditionFile ) )

   {

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

      return false;
@@ -189,11 +185,11 @@ makeSnapshot( const RealType& time, 


   FileName fileName;

   fileName.setFileNameBase( "u-" );

   fileName.setExtension( "tnl" );

   fileName.setExtension( "vti" );

   fileName.setIndex( step );



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

   u.save( fileName.getFileName() );

   u.write( "u", fileName.getFileName() );

   return true;

}

src/Benchmarks/HeatEquation/run-HeatEquationBenchmark

+1 −3
Original line number Diff line number Diff line
@@ -9,11 +9,9 @@ tnl-grid-setup --dimensions 2 \ 
               --size-y 100



tnl-init --test-function sin-wave \

         --output-file init.tnl

         --output-file init.vti

./HeatEquationBenchmark --time-discretisation explicit \

              --boundary-conditions-constant 0 \

              --discrete-solver merson \

              --snapshot-period 0.01 \

              --final-time 1.0
 


tnl-view --mesh mesh.tnl --input-files *tnl

src/Benchmarks/HeatEquation/tnl-benchmark-simple-heat-equation.h

+3 −3
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ bool solveHeatEquationCuda( const Config::ParameterContainer& parameters, 
   vecU.bind( cuda_u, gridXSize * gridYSize );

   Functions::MeshFunctionView< GridType > meshFunction;

   meshFunction.bind( gridPointer, vecU );

   meshFunction.save( "simple-heat-equation-initial.tnl" );

   meshFunction.write( "u", "simple-heat-equation-initial.vti" );



   Containers::VectorView< Real, Devices::Cuda, Index > vecAux;

   vecAux.bind( cuda_aux, gridXSize * gridYSize );
@@ -416,7 +416,7 @@ bool solveHeatEquationCuda( const Config::ParameterContainer& parameters, 
   if( verbose )

     std::cout << "Saving result..." << std::endl;



   meshFunction.save( "simple-heat-equation-result.tnl" );

   meshFunction.write( "u", "simple-heat-equation-result.vti" );



   /***

    * Freeing allocated memory
@@ -556,7 +556,7 @@ bool solveHeatEquationHost( const Config::ParameterContainer& parameters, 
   vecU.bind( u, gridXSize * gridYSize );

   Functions::MeshFunctionView< GridType > meshFunction;

   meshFunction.bind( gridPointer, vecU );

   meshFunction.save( "simple-heat-equation-result.tnl" );

   meshFunction.write( "u", "simple-heat-equation-result.vti" );



   /***

    * Freeing allocated memory

src/Examples/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem_impl.h

+4 −5
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ setInitialCondition( const Config::ParameterContainer& parameters, 
{

  this->bindDofs( mesh, dofs );

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

  if( ! this->solution.boundLoad( initialConditionFile ) )

  if( ! Functions::readMeshFunction( this->solution, "u", initialConditionFile ) )

  {

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

    return false;
@@ -147,8 +147,7 @@ makeSnapshot( const RealType& time, 


   String fileName;

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

   if( ! this->solution.save( fileName ) )

	   return false;

   this->solution.write( "u", fileName );



   return true;

}

src/Examples/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnl-direct-eikonal-solver.h

+1 −4
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ class DirectEikonalSolverConfig 
      {

         config.addDelimiter( "Direct eikonal equation solver settings:" );

         config.addRequiredEntry< String >( "input-file", "Input file." );

         config.addEntry< String >( "distributed-grid-io-type", "Choose Distributed Grid IO Type", "MpiIO");

            config.addEntryEnum< String >( "LocalCopy" );

            config.addEntryEnum< String >( "MpiIO" );

      };

};