From 48b8055ae84ee58a6f5434717dec024f738ba206 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 15 Jan 2020 23:03:20 +0000
Subject: [PATCH] made similar line changes to MG physics as @paulromano made
 to regular physics file.

---
 examples/xml/pincell/settings.xml |  4 ++--
 src/physics.cpp                   | 17 ++++++-----------
 src/physics_mg.cpp                | 29 ++++++++++-------------------
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/examples/xml/pincell/settings.xml b/examples/xml/pincell/settings.xml
index 5845898c8..6ee0ffde5 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>
+  <batches>20</batches>
   <inactive>10</inactive>
-  <particles>1000</particles>
+  <particles>100000</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/physics.cpp b/src/physics.cpp
index aedb6c1df..0679bd11d 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -176,9 +176,7 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx)
 
   // Determine whether to place fission sites into the shared fission bank
   // or the secondary particle bank.
-  bool use_fission_bank = false;
-  if (settings::run_mode == RUN_MODE_EIGENVALUE)
-    use_fission_bank = true;
+  bool use_fission_bank = (settings::run_mode == RUN_MODE_EIGENVALUE)
 
   for (int i = 0; i < nu; ++i) {
     Particle::Bank* site;
@@ -197,9 +195,7 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx)
         break;
       }
       site = simulation::fission_bank + idx;
-    }
-    else
-    {
+    } else {
       // Create new bank site and get reference to last element
       auto& bank = p->secondary_bank_;
       bank.emplace_back();
@@ -224,12 +220,11 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx)
     // Write fission particles to nuBank
     if(use_fission_bank)
     {
-      Particle::NuBank* nu_bank_entry;
       p->nu_bank_.emplace_back();
-      nu_bank_entry = &p->nu_bank_.back();
-      nu_bank_entry->wgt             = site->wgt;
-      nu_bank_entry->E               = site->E;
-      nu_bank_entry->delayed_group   = site->delayed_group;
+      Particle::NuBank* nu_bank_entry = &p->nu_bank_.back();
+      nu_bank_entry->wgt              = site->wgt;
+      nu_bank_entry->E                = site->E;
+      nu_bank_entry->delayed_group    = site->delayed_group;
     }
   }
   
diff --git a/src/physics_mg.cpp b/src/physics_mg.cpp
index 390ee41e7..937255e8a 100644
--- a/src/physics_mg.cpp
+++ b/src/physics_mg.cpp
@@ -122,19 +122,15 @@ create_fission_sites(Particle* p)
   
   // Determine whether to place fission sites into the shared fission bank
   // or the secondary particle bank.
-  bool use_fission_bank = false;
-  if (settings::run_mode == RUN_MODE_EIGENVALUE)
-    use_fission_bank = true;
+  bool use_fission_bank = (settings::run_mode == RUN_MODE_EIGENVALUE)
 
   for (int i = 0; i < nu; ++i) {
     Particle::Bank* site;
-    if(use_fission_bank)
-    {
+    if (use_fission_bank) {
       int64_t idx;
       #pragma omp atomic capture
       idx = simulation::fission_bank_length++;
-      if( idx >= simulation::fission_bank_max )
-      {
+      if (idx >= simulation::fission_bank_max) {
         warning("The shared fission bank is full. Additional fission sites created "
             "in this generation will not be banked.");
         #pragma omp atomic write
@@ -143,9 +139,7 @@ create_fission_sites(Particle* p)
         break;
       }
       site = simulation::fission_bank + idx;
-    }
-    else
-    {
+    } else {
       // Create new bank site and get reference to last element
       auto& bank = p->secondary_bank_;
       bank.emplace_back();
@@ -188,21 +182,18 @@ create_fission_sites(Particle* p)
     }
     
     // Write fission particles to nuBank
-    if(use_fission_bank)
-    {
-      Particle::NuBank* nu_bank_entry;
+    if (use_fission_bank) {
       p->nu_bank_.emplace_back();
-      nu_bank_entry = &p->nu_bank_.back();
-      nu_bank_entry->wgt             = site->wgt;
-      nu_bank_entry->E               = site->E;
-      nu_bank_entry->delayed_group   = site->delayed_group;
+      Particle::NuBank* nu_bank_entry = &p->nu_bank_.back();
+      nu_bank_entry->wgt              = site->wgt;
+      nu_bank_entry->E                = site->E;
+      nu_bank_entry->delayed_group    = site->delayed_group;
     }
   }
   
   // If shared fission bank was full, and no fissions could be added,
   // set the particle fission flag to false.
-  if( nu == skipped )
-  {
+  if (nu == skipped) {
     p->fission_ = false;
     return;
   }