Merge pull request #2049 from TomFischer/ChangePetscOutput

[MPI/PETSc] Enable rank output.

Applications/CLI/ogs.cpp

@@ -32,6 +32,7 @@
 #include "BaseLib/DateTools.h"
 #include "BaseLib/FileTools.h"
 #include "BaseLib/RunTime.h"
+#include "BaseLib/TemplateLogogFormatterSuppressedGCC.h"
 
 #include "Applications/ApplicationsLib/LinearSolverLibrarySetup.h"
 #include "Applications/ApplicationsLib/LogogSetup.h"
@@ -144,6 +145,11 @@ int main(int argc, char *argv[])
                 vtkSmartPointer<vtkMPIController>::New();
             controller->Initialize(&argc, &argv, 1);
             vtkMPIController::SetGlobalController(controller);
+
+            logog_setup.setFormatter(
+                std::make_unique<BaseLib::TemplateLogogFormatterSuppressedGCC<
+                    TOPIC_LEVEL_FLAG | TOPIC_FILE_NAME_FLAG |
+                    TOPIC_LINE_NUMBER_FLAG>>());
 #endif
             run_time.start();
 

BaseLib/TemplateLogogFormatterSuppressedGCC-impl.h

@@ -16,10 +16,7 @@ TemplateLogogFormatterSuppressedGCC<T_SUPPPRESS_TOPIC_FLAG>
 {
     int rank = 0;
     MPI_Comm_rank(mpi_comm, &rank);
-    int size = 0;
-    MPI_Comm_size(mpi_comm, &size);
-    int digits = size/10 + 1;
-    _str_mpi_rank = "rank " + padLeft(std::to_string(rank), digits) + "| ";
+    _str_mpi_rank = "[" + std::to_string(rank) + "] ";
 }
 #endif