From ebce493914da524cba6dbcbf4e9fb2608aaa0a4e Mon Sep 17 00:00:00 2001
From: Rupert Nash <r.nash@epcc.ed.ac.uk>
Date: Thu, 16 May 2024 12:43:28 +0100
Subject: [PATCH] Tidy some of the start up logging

---
 Code/geometry/GeometryReader.cc |  6 +-----
 Code/main.cc                    | 12 +++++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Code/geometry/GeometryReader.cc b/Code/geometry/GeometryReader.cc
index 46f7df2a6..6732a9dad 100644
--- a/Code/geometry/GeometryReader.cc
+++ b/Code/geometry/GeometryReader.cc
@@ -88,10 +88,6 @@ namespace hemelb::geometry
             );
         }
 
-        log::Logger::Log<log::Info, log::Singleton>("Opened geometry file %s", dataFilePath.c_str());
-        // TODO: Why is there this fflush?
-        fflush(nullptr);
-
         log::Logger::Log<log::Debug, log::OnePerCore>("Reading file preamble");
         GmyReadResult geometry = ReadPreamble();
 
@@ -320,7 +316,7 @@ namespace hemelb::geometry
         constexpr auto MiB = std::size_t(1) << 20;
         constexpr std::size_t MAX_GMY_BUFFER_SIZE = 64U * MiB;
 
-        log::Logger::Log<log::Info, log::Singleton>("Buffering compressed site data onto owning processes.");
+        log::Logger::Log<log::Info, log::Singleton>("Streaming geometry data and caching required blocks.");
         log::Logger::Log<log::Debug, log::Singleton>("Maximum buffer size %lu B", MAX_GMY_BUFFER_SIZE);
 
         block_cache ans;
diff --git a/Code/main.cc b/Code/main.cc
index 4150276e7..8db3f66ba 100644
--- a/Code/main.cc
+++ b/Code/main.cc
@@ -23,10 +23,16 @@ int main(int argc, char *argv[])
     net::MpiCommunicator commWorld = net::MpiCommunicator::World();
 
     net::IOCommunicator hemelbCommunicator(commWorld);
-    try
-    {
+    log::Logger::Log<log::Info, log::Singleton>(
+      "Initialised MPI: %d nodes x %d processes per node = %d total",
+      hemelbCommunicator.GetLeadersComm().Size(),
+      hemelbCommunicator.GetNodeComm().Size(),
+      hemelbCommunicator.Size()
+    );
+
+    try {
       // Parse command line
-      configuration::CommandLine options = configuration::CommandLine(argc, argv);
+      auto options = configuration::CommandLine(argc, argv);
 
       // Start the debugger (if requested)
       debug::Init(options.GetDebug(), argv[0], commWorld);