From 5da08f6b0e1aa687b242bab32facdd5f29cf0d9d Mon Sep 17 00:00:00 2001
From: Erik B Knudsen <erik.knudsen@copenhagenatomics.com>
Date: Fri, 14 Oct 2022 01:40:52 +0200
Subject: [PATCH] fix logic to avoid writing both kinds of source file

---
 src/settings.cpp   |  3 +++
 src/simulation.cpp | 43 +++++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/settings.cpp b/src/settings.cpp
index 7aed383da..9098eb620 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -654,6 +654,9 @@ void read_settings_xml()
     if (check_for_node(node_sp, "write")) {
       source_write = get_node_value_bool(node_sp, "write");
     }
+    if (check_for_node(node_sp, "mcpl")) {
+      source_write = get_node_value_bool(node_sp, "mcpl");
+    }
     if (check_for_node(node_sp, "overwrite_latest")) {
       source_latest = get_node_value_bool(node_sp, "overwrite_latest");
       source_separate = source_latest;
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 70053a9a8..d7cc2237d 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -389,30 +389,33 @@ void finalize_batch()
 
   if (settings::run_mode == RunMode::EIGENVALUE) {
     // Write out a separate source point if it's been specified for this batch
-    if (contains(settings::sourcepoint_batch, simulation::current_batch) &&
-        settings::source_write && settings::source_separate) {
-      write_source_point(nullptr);
-    }
-
-    // Write a continously-overwritten source point if requested.
-    if (settings::source_latest) {
-      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);
-    }
+    if(! settings::source_mcpl_write) {
+#endif
+      if (contains(settings::sourcepoint_batch, simulation::current_batch) &&
+          settings::source_write && settings::source_separate) {
+        write_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());
+      // Write a continously-overwritten source point if requested.
+      if (settings::source_latest) {
+        auto filename = settings::path_output + "source.h5";
+        write_source_point(filename.c_str());
+      }
+#ifdef OPENMC_MCPL
+    } else {
+      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 && settings::source_mcpl_write) {
+        auto filename = settings::path_output + "source.mcpl";
+        write_mcpl_source_point(filename.c_str());
+      }
     }
 #endif
-
   }
 
   // Write out surface source if requested.