Finish de-templating sim master, make RBC cope and move path manager into config where it belongs

Author: rupertnash

Code/CMakeLists.txt

@@ -123,7 +123,9 @@ if (HEMELB_USE_DEBUGGER)
   set(CMAKE_BUILD_TYPE Debug)
 endif()
 
-add_executable(${HEMELB_EXECUTABLE} SimulationMaster.cc main.cc)
+add_library(hemelb_sim OBJECT SimulationMaster.cc)
+list(APPEND heme_libraries hemelb_sim)
+add_executable(${HEMELB_EXECUTABLE} main.cc)
 codesign(${HEMELB_EXECUTABLE})
 
 include_directories(${PROJECT_SOURCE_DIR})

Code/SimulationMaster.cc

@@ -37,23 +37,9 @@ namespace hemelb
      * Initialises member variables including the network topology
      * object.
      */
-    SimulationMaster::SimulationMaster(configuration::CommandLine & options,
-                                               const net::IOCommunicator& ioComm) :
+    SimulationMaster::SimulationMaster(const net::IOCommunicator& ioComm) :
             build_info(), ioComms(ioComm.Duplicate()), communicationNet(ioComms)
     {
-        // Start the main timer!
-        timings.total().Start();
-
-        fileManager = std::make_shared<io::PathManager>(options,
-                                                                IsCurrentProcTheIOProc(),
-                                                                GetProcessorCount());
-        log::Logger::Log<log::Info, log::Singleton>("Reading configuration from %s", fileManager->GetInputFile().c_str());
-        // Convert XML to configuration
-        simConfig = configuration::SimConfig::New(fileManager->GetInputFile());
-        // Use it to initialise self
-        auto builder = configuration::SimBuilder(simConfig);
-        log::Logger::Log<log::Info, log::Singleton>("Beginning Initialisation.");
-        builder.build<>(*this);
     }
 
   /// Destructor for the SimulationMaster class.

Code/SimulationMaster.h

@@ -16,7 +16,7 @@
 #include "util/UnitConverter.h"
 #include "configuration/SimConfig.h"
 #include "configuration/CommandLine.h"
-#include "io/PathManager.h"
+#include "configuration/PathManager.h"
 #include "reporting/Reporter.h"
 #include "reporting/Timers.h"
 #include "reporting/BuildInfo.h"
@@ -53,7 +53,7 @@ namespace hemelb
         std::shared_ptr<lb::LBMBase> latticeBoltzmannModel;
         std::shared_ptr<geometry::neighbouring::NeighbouringDataManager> neighbouringDataManager;
 
-        std::shared_ptr<io::PathManager> fileManager;
+        std::shared_ptr<configuration::PathManager> fileManager;
         std::shared_ptr<reporting::Reporter> reporter;
 
         std::shared_ptr<lb::SimulationState> simulationState;
@@ -77,9 +77,8 @@ namespace hemelb
         std::shared_ptr<net::phased::StepManager> stepManager;
         std::shared_ptr<net::phased::NetConcern> netConcern;
 
+        SimulationMaster(const net::IOCommunicator& ioComm);
     public:
-      SimulationMaster(configuration::CommandLine &options,
-                       const net::IOCommunicator& ioComms);
       virtual ~SimulationMaster();
 
       void Abort();

Code/configuration/CMakeLists.txt

@@ -5,6 +5,7 @@
 
 add_library(hemelb_configuration OBJECT
         CommandLine.cc
+        PathManager.cc
         SimConfig.cc
         SimBuilder.cc
         SimConfigReader.cc

Code/io/PathManager.cc renamed to Code/configuration/PathManager.cc

@@ -3,13 +3,13 @@
 // file AUTHORS. This software is provided under the terms of the
 // license in the file LICENSE.
 
-#include "io/PathManager.h"
+#include "configuration/PathManager.h"
 
 #include "Exception.h"
 #include "configuration/CommandLine.h"
 
 namespace fs = std::filesystem;
-namespace hemelb::io
+namespace hemelb::configuration
 {
 
     PathManager::PathManager(const configuration::CommandLine & commandLine, const bool & io,

Code/io/PathManager.h renamed to Code/configuration/PathManager.h

@@ -3,8 +3,8 @@
 // file AUTHORS. This software is provided under the terms of the
 // license in the file LICENSE.
 
-#ifndef HEMELB_IO_PATHMANAGER_H
-#define HEMELB_IO_PATHMANAGER_H
+#ifndef HEMELB_CONFIGURATION_PATHMANAGER_H
+#define HEMELB_CONFIGURATION_PATHMANAGER_H
 
 #include <filesystem>
 #include <string>
@@ -14,12 +14,6 @@ namespace hemelb::configuration
 {
     class CommandLine;
     class SimConfig;
-}
-
-namespace hemelb::io
-{
-    // Forward declare the Writer
-    namespace writers { class Writer; }
 
     /**
      * Manage the input and output file system locations for HemeLB reports, extracted data, and input xml.
@@ -82,4 +76,4 @@ namespace hemelb::io
 
 }
 
-#endif //HEMELB_IO_PATHMANAGER_H
+#endif //HEMELB_CONFIGURATION_PATHMANAGER_H

Code/configuration/SimBuilder.cc

@@ -291,7 +291,7 @@ namespace hemelb::configuration {
     }
 
     std::shared_ptr<reporting::Reporter> SimBuilder::BuildReporter(
-            io::PathManager const& fileManager,
+            PathManager const& fileManager,
             std::vector<reporting::Reportable*>const& reps
     ) const {
         auto reporter = std::make_shared<reporting::Reporter>(fileManager.GetReportPath(),

Code/configuration/SimBuilder.h

@@ -54,6 +54,31 @@ namespace hemelb::configuration {
         std::shared_ptr<util::UnitConverter> unit_converter;
 
     public:
+        template <typename TraitsT>
+        static std::unique_ptr<SimulationMaster> CreateSim(
+                CommandLine const& options,
+                net::IOCommunicator const& ioComms
+        ) {
+            auto ans = std::unique_ptr<SimulationMaster>(new SimulationMaster(ioComms));
+            // Start the main timer!
+            ans->timings.total().Start();
+
+            ans->fileManager = std::make_shared<configuration::PathManager>(
+                    options,
+                    ioComms.OnIORank(),
+                    ioComms.Size()
+            );
+            auto&& infile = ans->fileManager->GetInputFile();
+            log::Logger::Log<log::Info, log::Singleton>("Reading configuration from %s", infile.c_str());
+            // Convert XML to configuration
+            ans->simConfig = configuration::SimConfig::New(infile);
+            // Use it to initialise self
+            auto builder = configuration::SimBuilder(ans->simConfig);
+            log::Logger::Log<log::Info, log::Singleton>("Beginning Initialisation.");
+            builder.build<TraitsT>(*ans);
+            return ans;
+        }
+
         explicit SimBuilder(SimConfig const& conf, bool construct_unit_converter = true);
         virtual ~SimBuilder() = default;
 
@@ -111,7 +136,7 @@ namespace hemelb::configuration {
         ) const;
 
         [[nodiscard]] std::shared_ptr<reporting::Reporter> BuildReporter(
-                io::PathManager const& fileManager,
+                PathManager const& fileManager,
                 std::vector<reporting::Reportable*> const & reps
         ) const;
     };
@@ -299,8 +324,6 @@ namespace hemelb::configuration {
     [[nodiscard]] std::shared_ptr<net::IteratedAction> SimBuilder::BuildCellController(SimulationMaster const& control, reporting::Timers& timings) const {
         if (config.HasRBCSection()) {
 #ifdef HEMELB_BUILD_RBC
-            using traitsType = typename T::Traits;
-
             auto ccb = redblood::CellControllerBuilder(unit_converter);
 
             auto& ioComms = control.ioComms;
@@ -324,4 +347,4 @@ namespace hemelb::configuration {
         return {};
     }
 }
-#endif
+#endif

Code/extraction/PropertyActor.h

@@ -7,7 +7,6 @@
 #define HEMELB_EXTRACTION_PROPERTYACTOR_H
 
 #include "extraction/PropertyWriter.h"
-#include "io/PathManager.h"
 #include "lb/MacroscopicPropertyCache.h"
 #include "lb/SimulationState.h"
 #include "net/IteratedAction.h"

Code/io/CMakeLists.txt

@@ -12,7 +12,6 @@ endif()
 
 add_library(hemelb_io OBJECT
   FILE.cc
-  PathManager.cc 
   writers/AsciiFileWriter.cc writers/AsciiStreamWriter.cc
   readers/XdrFileReader.cc
   readers/XdrMemReader.cc