diff --git a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem.h b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem.h
index 7f1bd4193960ba3e6bbc8f2cb1fb12f7c4e84cdf..a4144200028fccf124aad1730b2415fa1cd9e5ff 100644
--- a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem.h
+++ b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem.h
@@ -25,8 +25,6 @@
 #include <solvers/pde/tnlLinearSystemAssembler.h>
 #include <functions/tnlMeshFunction.h>
 
-#include <TNL/Meshes/DistributedMeshes/DistributedGridIO.h>
-
 template< typename Mesh,
 		    typename DifferentialOperator,
 		    typename BoundaryCondition,
diff --git a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem_impl.h b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem_impl.h
index 9244b18332e40887c131fbb68cabbffe417bfef2..3cc6388497c062865a812cca629c57d45d715d09 100644
--- a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem_impl.h
+++ b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/HamiltonJacobiProblem_impl.h
@@ -123,24 +123,12 @@ setInitialCondition( const Config::ParameterContainer& parameters,
 {
   this->bindDofs( mesh, dofs );
   const String& initialConditionFile = parameters.getParameter< String >( "initial-condition" );
-  if(CommunicatorType::isDistributed())
+  if( ! this->solution.boundLoad( initialConditionFile ) )
   {
-    std::cout<<"Nodes Distribution: " << uPointer->getMesh().getDistributedMesh()->printProcessDistr() << std::endl;
-    if(distributedIOType==Meshes::DistributedMeshes::MpiIO)
-      Meshes::DistributedMeshes::DistributedGridIO<MeshFunctionType,Meshes::DistributedMeshes::MpiIO> ::load(initialConditionFile, *uPointer );
-    if(distributedIOType==Meshes::DistributedMeshes::LocalCopy)
-      Meshes::DistributedMeshes::DistributedGridIO<MeshFunctionType,Meshes::DistributedMeshes::LocalCopy> ::load(initialConditionFile, *uPointer );
-    uPointer->template synchronize<CommunicatorType>();
+    std::cerr << "I am not able to load the initial condition from the file " << initialConditionFile << "." <<std::endl;
+    return false;
   }
-  else
-  {
-    if( ! this->solution.boundLoad( initialConditionFile ) )
-    {
-      std::cerr << "I am not able to load the initial condition from the file " << initialConditionFile << "." <<std::endl;
-      return false;
-    }
-  }
-   return true;
+  return true;
 }
 
 template< typename Mesh,
diff --git a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h
index e142152ef7dc85807a27198e31c98520c5f205be..786c6a48862d6107904107d9b75ab4802d05557f 100644
--- a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h
+++ b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlDirectEikonalMethodsBase_impl.h
@@ -99,7 +99,7 @@ tnlDirectEikonalMethodsBase< Meshes::Grid< 2, Real, Device, Index > >::
 updateBlocks( InterfaceMapType interfaceMap,
         MeshFunctionType aux,
         MeshFunctionType helpFunc,
-        ArrayContainer BlockIterHost, IndexType numThreadsPerBlock/*, Real **sArray*/ )
+        ArrayContainer BlockIterHost, int numThreadsPerBlock/*, Real **sArray*/ )
 {
 #pragma omp parallel for schedule( dynamic )
   for( IndexType i = 0; i < BlockIterHost.getSize(); i++ )
@@ -267,13 +267,13 @@ updateBlocks( InterfaceMapType interfaceMap,
 template< typename Real,
         typename Device,
         typename Index >
-template< IndexType sizeSArray >
+template< int sizeSArray >
 void
 tnlDirectEikonalMethodsBase< Meshes::Grid< 3, Real, Device, Index > >::
 updateBlocks( const InterfaceMapType interfaceMap,
         const MeshFunctionType aux,
         MeshFunctionType& helpFunc,
-        ArrayContainer BlockIterHost, IndexType numThreadsPerBlock/*, Real **sArray*/ )
+        ArrayContainer BlockIterHost, int numThreadsPerBlock/*, Real **sArray*/ )
 {  
 //#pragma omp parallel for schedule( dynamic )
   for( IndexType i = 0; i < BlockIterHost.getSize(); i++ )
diff --git a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h
index 27d2663416d2090eb1dc5956711686a2cca17985..001f4c69a45e98b245b8e470f489db65c84956bf 100644
--- a/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h
+++ b/src/TNL/Experimental/Hamilton-Jacobi/Solvers/hamilton-jacobi/tnlFastSweepingMethod2D_impl.h
@@ -85,25 +85,25 @@ solve( const MeshPointer& mesh,
   
 #ifdef HAVE_MPI
   int i = Communicators::MpiCommunicator::GetRank( Communicators::MpiCommunicator::AllGroup );
-  printf( "Hello world from rank: %d ", i );
+  //printf( "Hello world from rank: %d ", i );
   //Communicators::MpiCommunicator::Request r = Communicators::MpiCommunicator::ISend( auxPtr, 0, 0, Communicators::MpiCommunicator::AllGroup );
-  /*if( i == 1 )
-    for( int k = 0; k < 16*16; k++ )
-      aux[ k ] = 10;
+  if( i == 1 )
+    /*for( int k = 0; k < 16*16; k++ )
+      aux[ k ] = 10;*/
     printf( "1: mesh x: %d\n", mesh->getDimensions().x() );
     printf( "1: mesh y: %d\n", mesh->getDimensions().y() );
-    aux.save("aux_proc1.tnl");*/
+    //aux.save("aux_proc1.tnl");
   if( i == 0 )
     printf( "0: mesh x: %d\n", mesh->getDimensions().x() );
     printf( "0: mesh y: %d\n", mesh->getDimensions().y() );
-    aux.save("aux_proc0.tnl");
-    for( int k = 0; k < 16*16; k++ )
+    //aux.save("aux_proc0.tnl");
+    /*for( int k = 0; k < mesh->getDimensions().x()*mesh->getDimensions().y(); k++ )
       aux[ k ] = 10;
-    for( int k = 0; k < 16; k++ ){
-      for( int l = 0; l < 16; l++ )
+    for( int k = 0; k < mesh->getDimensions().x(); k++ ){
+      for( int l = 0; l < mesh->getDimensions().y(); l++ )
         printf("%f.2\t",aux[ k * 16 + l ] );
     printf("\n");
-    }
+    }*/
     
   /*bool a = Communicators::MpiCommunicator::IsInitialized();
   if( a )