From b740032aaffee41cb9f63c0025c3dd9abaa04a1c Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 27 Nov 2019 17:46:58 +0000
Subject: [PATCH] added some print statements

---
 examples/xml/pincell/settings.xml |  6 +++---
 src/simulation.cpp                | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/examples/xml/pincell/settings.xml b/examples/xml/pincell/settings.xml
index 5845898c8..48da5cc79 100644
--- a/examples/xml/pincell/settings.xml
+++ b/examples/xml/pincell/settings.xml
@@ -3,9 +3,9 @@
 
   <!-- Define how many particles to run and for how many batches -->
   <run_mode>eigenvalue</run_mode>
-  <batches>100</batches>
-  <inactive>10</inactive>
-  <particles>1000</particles>
+  <batches>2</batches>
+  <inactive>1</inactive>
+  <particles>10</particles>
 
   <!-- The starting source is a uniform distribution over the entire pin
        cell. Note that since this is effectively a 2D model, the z coordinates
diff --git a/src/simulation.cpp b/src/simulation.cpp
index b775768e4..fd7c05df5 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -1087,9 +1087,22 @@ void finalize_generation()
 	  for( int i = 0; i < shared_fission_bank_length; i++ )
 		  simulation::fission_bank.push_back(shared_fission_bank[i]);
 	  shared_fission_bank_length = 0;
+<<<<<<< HEAD
 
     //Sorts the fission bank so as to allow for reproducibility
     std::stable_sort(simulation::fission_bank.begin(), simulation::fission_bank.end());
+=======
+#endif
+      // Sorts the fission bank so as to allow for reproducibility
+      //std::sort(simulation::fission_bank.begin(), simulation::fission_bank.end(), bank_site_comparator());
+      //std::sort(simulation::fission_bank.begin(), simulation::fission_bank.end());
+      std::stable_sort(simulation::fission_bank.begin(), simulation::fission_bank.end());
+	  std::cout << "Fission bank on rank " << mpi::rank << " is of length " << simulation::fission_bank.size() << std::endl;
+	  for (Particle::Bank p : simulation::fission_bank )
+	  {
+	   std::cout <<  "E = " << p.E << std::endl;
+	  }
+>>>>>>> added some print statements
 
     // Distribute fission bank across processors evenly
     synchronize_bank();