Commit d0081ae9 authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge branch 'mpi-explosive' of jlk.fjfi.cvut.cz:mmg/tnl-dev into mpi-explosive 

Conflicts:
	src/TNL/Communicators/MpiCommunicator.h
parents 7bcf885b b4921c85

src/TNL/Communicators/MpiCommunicator.h

+5 −4
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ class MpiCommunicator 
#else

      static int NullRequest;

#endif



      static std::streambuf *psbuf;

      static std::streambuf *backup;

      static std::ofstream filestr;

tests/mpi/GPUmeshFunctionEvaluateTest.cu

+4 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ int main ( int argc, char *argv[]) 
  typedef typename MeshType::Cell Cell;

  typedef typename MeshType::IndexType IndexType; 

  typedef typename MeshType::PointType PointType; 

  using CoordinatesType = MeshType::CoordinatesType;

  

  typedef DistributedMesh<MeshType> DistributedMeshType;
@@ -80,7 +81,7 @@ int main ( int argc, char *argv[]) 
 globalGrid.setDomain(globalOrigin,globalProportions);



 

 int distr[DIMENSION];

 CoordinatesType distr;

 for(int i=0;i<DIMENSION;i++) 

    distr[i]=1;
@@ -99,7 +100,8 @@ int main ( int argc, char *argv[]) 
 typename MeshType::CoordinatesType overlap;

 overlap.setValue(1);

 DistributedMeshType distrgrid;

 distrgrid.template setGlobalGrid<CommunicatorType>(globalGrid,overlap, distr); 

 distrgrid.setDomainDecomposition( distr );

 distrgrid.template setGlobalGrid<CommunicatorType>(globalGrid,overlap); 

   

 SharedPointer<MeshType> gridptr;

 SharedPointer<MeshFunctionType> meshFunctionptr;