diff --git a/eo/src/mpi/eoMpi.h b/eo/src/mpi/eoMpi.h index 7dafe128..8a4e86b6 100644 --- a/eo/src/mpi/eoMpi.h +++ b/eo/src/mpi/eoMpi.h @@ -34,6 +34,7 @@ namespace eo const int Finish = 1; } + const int DEFAULT_MASTER = 0; template< typename JobData, typename Wrapped > struct SharedDataFunction diff --git a/eo/test/mpi/parallelApply.cpp b/eo/test/mpi/parallelApply.cpp index 75b515e9..7ccbf3d9 100644 --- a/eo/test/mpi/parallelApply.cpp +++ b/eo/test/mpi/parallelApply.cpp @@ -111,9 +111,9 @@ int main(int argc, char** argv) for( unsigned int i = 0; i < tests.size(); ++i ) { // ParallelApply job( plusOneInstance, v, *(tests[i].assign), 0, store, 3 ); - ParallelApplyStore< int > store( plusOneInstance, v, 0, 3 ); - // Job< JobData > job( *(tests[i].assign), 0, store ); - ParallelApply< int > job( *(tests[i].assign), 0, store ); + ParallelApplyStore< int > store( plusOneInstance, v, eo::mpi::DEFAULT_MASTER, 3 ); + // Job< JobData > job( *(tests[i].assign), eo::mpi::DEFAULT_MASTER, store ); + ParallelApply< int > job( *(tests[i].assign), eo::mpi::DEFAULT_MASTER, store ); if( job.isMaster() ) { diff --git a/eo/test/mpi/wrapper.cpp b/eo/test/mpi/wrapper.cpp index e2bf25d6..d8b72c98 100644 --- a/eo/test/mpi/wrapper.cpp +++ b/eo/test/mpi/wrapper.cpp @@ -60,10 +60,10 @@ int main(int argc, char** argv) StaticAssignmentAlgorithm assign( v.size() ); - ParallelApplyStore< int > store( plusOneInstance, v, 0, 1 ); + ParallelApplyStore< int > store( plusOneInstance, v, eo::mpi::DEFAULT_MASTER, 1 ); store.wrapIsFinished( new ShowWrappedResult ); - ParallelApply job( assign, 0, store ); + ParallelApply job( assign, eo::mpi::DEFAULT_MASTER, store ); // Equivalent to: // Job< ParallelApplyData > job( assign, 0, store ); job.run();