Changeset 2a5451 for src/base/timer.cpp

Timestamp:

May 11, 2012, 8:36:18 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

2d4211

Parents:

36d56c

Message:

vmg now succeeds on test_comm.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1816 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/base/timer.cpp (modified) (3 diffs)

src/base/timer.cpp

@@ -185 +185 @@
   Comm& comm = *MG::GetComm();
   char name[80];
-  int rank, size;
-
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &size);
+
+  int rank = comm.GlobalRank();
+  int size = comm.GlobalSize();
 
   vmg_float times[size];
@@ -196 +195 @@
 
   int timer_size = Timer::td.size();
-  MPI_Bcast(timer_size, 1, MPI_INT, 0, MPI_COMM_WORLD);
+  comm.GlobalBroadcast(timer_size);
 
   if (rank == 0) {
       for (iter=Timer::td.begin(); iter!=Timer::td.end(); ++iter) {
         std::strcpy(name, iter->first.c_str());
-        MPI_Bcast(name, 80, MPI_CHAR, 0, MPI_COMM_WORLD);
-        MPI_Gather(&Timer::td[name].duration, 1, MPI_DOUBLE, times, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
-        MPI_Gather(&Timer::td[name].total, 1, MPI_INT, calls, 1, MPI_INT, 0, MPI_COMM_WORLD);
+        comm.GlobalBroadcast(name);
+        comm.GlobalGather(Timer::td[name].duration, times);
+        comm.GlobalGather(Timer::td[name].total, calls);
 
         int min_calls, max_calls;
@@ -227 +226 @@
   }else {
     for (int i=0; i<timer_size; ++i) {
-      MPI_Bcast(name, 80, MPI_CHAR, 0, MPI_COMM_WORLD);
-      MPI_Gather(&Timer::td[name].duration, 1, MPI_DOUBLE, times, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
-      MPI_Gather(&Timer::td[name].total, 1, MPI_INT, calls, 1, MPI_INT, 0, MPI_COMM_WORLD);
+      comm.GlobalBroadcast(name);
+      comm.GlobalGather(Timer::td[name].duration, times);
+      comm.GlobalGather(Timer::td[name].total, calls);
     }
   }