Changeset d13e27 for src/comm/comm_mpi.cpp

Timestamp:

Mar 29, 2013, 5:03:13 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

f57182

Parents:

5ba22b

Message:

vmg: Work on output verbosity.

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

File:

• src/comm/comm_mpi.cpp (modified) (2 diffs)

src/comm/comm_mpi.cpp

@@ -344 +344 @@
 }
 
-void CommMPI::PrintString(const char* format, ...)
-{
-  va_list args;
-  va_start(args, format);
-  vsprintf(print_buffer, format, args);
-  printf("VMG: Rank %d: %s\n", GlobalRank(), print_buffer);
-  va_end(args);
-}
-
-void CommMPI::PrintStringOnce(const char* format, ...)
-{
-  if (GlobalRank() == 0) {
+void CommMPI::Print(const OutputLevel level, const char* format, ...)
+{
+  bool print = (level == Output);
+
+#ifdef OUTPUT_INFO
+  print |= (level == Info);
+#endif
+#ifdef OUTPUT_DEBUG
+  print |= (level == Debug);
+#endif
+#ifdef OUTPUT_TIMING
+  print |= (level == Timing);
+#endif
+
+  if (print) {
+    va_list args;
+    va_start(args, format);
+    vsprintf(print_buffer, format, args);
+    printf("VMG: Rank %d: %s\n", GlobalRank(), print_buffer);
+    va_end(args);
+  }
+}
+
+void CommMPI::PrintOnce(const OutputLevel level, const char* format, ...)
+{
+  bool print = (level == Output);
+
+#ifdef OUTPUT_INFO
+  print |= (level == Info);
+#endif
+#ifdef OUTPUT_DEBUG
+  print |= (level == Debug);
+#endif
+#ifdef OUTPUT_TIMING
+  print |= (level == Timing);
+#endif
+
+  if (GlobalRank() == 0 && print) {
     va_list args;
     va_start(args, format);
@@ -900 +926 @@
     }
 
-#ifdef DEBUG_OUTPUT
+#ifdef OUTPUT_DEBUG
     if (rank == 0)
-      std::printf("Dims: %d %d %d\n", dims[0], dims[1], dims[2]);
+      std::printf("Process grid: %d %d %d\n", dims[0], dims[1], dims[2]);
 #endif