From 81fa3b45a35595f4913845d5cc1a4580e173d0d7 Mon Sep 17 00:00:00 2001
From: Erik B Knudsen <erik.knudsen@copenhagenatomics.com>
Date: Thu, 13 Oct 2022 23:09:12 +0200
Subject: [PATCH] mcpl-file output simimlar to regular source output file

---
 include/openmc/settings.h |  1 +
 src/settings.cpp          |  1 +
 src/simulation.cpp        | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/include/openmc/settings.h b/include/openmc/settings.h
index 66825867d..5b755784e 100644
--- a/include/openmc/settings.h
+++ b/include/openmc/settings.h
@@ -47,6 +47,7 @@ extern "C" bool run_CE;            //!< run with continuous-energy data?
 extern bool source_latest;         //!< write latest source at each batch?
 extern bool source_separate;       //!< write source to separate file?
 extern bool source_write;          //!< write source in HDF5 files?
+extern bool source_mcpl_write;     //!< write source in mcpl files?
 extern bool surf_source_write;     //!< write surface source file?
 extern bool surf_mcpl_write;       //!< write surface mcpl file?
 extern bool surf_source_read;      //!< read surface source file?
diff --git a/src/settings.cpp b/src/settings.cpp
index d1762596c..7aed383da 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -60,6 +60,7 @@ bool run_CE {true};
 bool source_latest {false};
 bool source_separate {false};
 bool source_write {true};
+bool source_mcpl_write {true};
 bool surf_source_write {false};
 bool surf_mcpl_write {false};
 bool surf_source_read {false};
diff --git a/src/simulation.cpp b/src/simulation.cpp
index d90c33ffd..70053a9a8 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -399,6 +399,20 @@ void finalize_batch()
       auto filename = settings::path_output + "source.h5";
       write_source_point(filename.c_str());
     }
+
+#ifdef OPENMC_MCPL
+    if (contains(settings::sourcepoint_batch, simulation::current_batch) &&
+        settings::source_mcpl_write && settings::source_separate) {
+      write_mcpl_source_point(nullptr);
+    }
+
+    // Write a continously-overwritten source point if requested.
+    if (settings::source_latest && setting::source_mcpl_write) {
+      auto filename = settings::path_output + "source.mcpl";
+      write_mcpl_source_point(filename.c_str());
+    }
+#endif
+
   }
 
   // Write out surface source if requested.