Changeset ac6d04 for src/base/command_list.cpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

• src/base/command_list.cpp (modified) (4 diffs)

src/base/command_list.cpp

@@ -13 +13 @@
 #ifdef HAVE_MPI
 #include <mpi.h>
+#ifdef HAVE_MARMOT
+#include <enhancempicalls.h>
+#include <sourceinfompicalls.h>
+#endif
 #endif
 #endif
@@ -31 +35 @@
   Request request;
   Request final_request = (commands.size() == 0 ? StopCycleNow : Continue);
+  Comm* comm = MG::GetComm();
 
   for (CommandList::iterator iter=commands.begin(); iter!=commands.end(); ++iter) {
@@ -43 +48 @@
     MPI_Barrier(MPI_COMM_WORLD);
 #endif
-    if (MG::GetComm()->GlobalRank() == 0)
-      std::printf("Command \"%s\"...", iter->first.c_str());
+    comm->PrintString("Command \"%s\" start", iter->first.c_str());
 #endif
 
@@ -55 +59 @@
     MPI_Barrier(MPI_COMM_WORLD);
 #endif
-    if (MG::GetComm()->GlobalRank() == 0)
-      std::printf(" done\n");
+    comm->PrintString("Command \"%s\" done", iter->first.c_str());
 #endif