Commit 79b8be04 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Add refinement information to iteration data copy constructors and MPI broadcasts

parent bd1bba53

src/inclusion/inclusion.cpp

+9 −1
Original line number Diff line number Diff line
@@ -451,6 +451,9 @@ InclusionIterationData::InclusionIterationData(const InclusionIterationData& rhs 
  extr = rhs.extr;

  

  proc_device = rhs.proc_device;

  refinemode = rhs.refinemode;

  maxrefiters = rhs.maxrefiters;

  accuracygoal = rhs.accuracygoal;

}



#ifdef MPI_VERSION
@@ -588,6 +591,9 @@ InclusionIterationData::InclusionIterationData(const mixMPI *mpidata, const int 
#else

  proc_device = 0;

#endif

  MPI_Bcast(&refinemode, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&maxrefiters, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&accuracygoal, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);

}



void InclusionIterationData::mpibcast(const mixMPI *mpidata) {
@@ -651,9 +657,11 @@ void InclusionIterationData::mpibcast(const mixMPI *mpidata) { 
  MPI_Bcast(&vk, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);

  MPI_Bcast(&xiblock, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&number_of_scales, 1, MPI_INT, 0, MPI_COMM_WORLD);



  MPI_Bcast(&nimd, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&extr, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);

  MPI_Bcast(&refinemode, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&maxrefiters, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&accuracygoal, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);

}

#endif

src/libnptm/Commons.cpp

+9 −0
Original line number Diff line number Diff line
@@ -304,6 +304,9 @@ ClusterIterationData::ClusterIterationData(const ClusterIterationData& rhs) { 
  number_of_scales = rhs.number_of_scales;



  proc_device = rhs.proc_device;

  refinemode = rhs.refinemode;

  maxrefiters = rhs.maxrefiters;

  accuracygoal = rhs.accuracygoal;

}



#ifdef MPI_VERSION
@@ -438,6 +441,9 @@ ClusterIterationData::ClusterIterationData(const mixMPI *mpidata, const int devi 
#else

  proc_device = 0;

#endif

  MPI_Bcast(&refinemode, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&maxrefiters, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&accuracygoal, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);

}



void ClusterIterationData::mpibcast(const mixMPI *mpidata) {
@@ -507,6 +513,9 @@ void ClusterIterationData::mpibcast(const mixMPI *mpidata) { 
  MPI_Bcast(&vk, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);

  MPI_Bcast(&xiblock, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&number_of_scales, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&refinemode, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&maxrefiters, 1, MPI_INT, 0, MPI_COMM_WORLD);

  MPI_Bcast(&accuracygoal, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);

}

#endif