From 5066bfa42de5d1ea36d8d9856c90edec2a415fd9 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 15 Jan 2020 17:02:37 -0600
Subject: [PATCH] Apply suggestions from code review

Co-Authored-By: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/particle.h |  2 +-
 src/bank.cpp              |  2 +-
 src/physics.cpp           | 12 ++++--------
 src/simulation.cpp        |  7 ++++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/include/openmc/particle.h b/include/openmc/particle.h
index c75cac8f0..bb0d59579 100644
--- a/include/openmc/particle.h
+++ b/include/openmc/particle.h
@@ -171,7 +171,7 @@ public:
     int delayed_group;
     Type particle;
     int64_t parent_id;
-    bool operator < (const Bank & bank) const{ return (parent_id < bank.parent_id); }
+    bool operator<(const Bank& bank) const { return (parent_id < bank.parent_id); }
   };
   
   //! Saved ("banked") state of a particle, for nu-fission tallying
diff --git a/src/bank.cpp b/src/bank.cpp
index 2bf3ebf0a..ad4dd5958 100644
--- a/src/bank.cpp
+++ b/src/bank.cpp
@@ -28,7 +28,7 @@ int64_t fission_bank_max;
 void free_memory_bank()
 {
   simulation::source_bank.clear();
-  if( simulation::fission_bank != nullptr )
+  if (simulation::fission_bank)
     delete[] simulation::fission_bank;
   simulation::fission_bank = nullptr;
   simulation::fission_bank_length = 0;
diff --git a/src/physics.cpp b/src/physics.cpp
index aedb6c1df..30db87130 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -182,13 +182,11 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx)
 
   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
@@ -222,8 +220,7 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx)
     }
     
     // Write fission particles to nuBank
-    if(use_fission_bank)
-    {
+    if (use_fission_bank) {
       Particle::NuBank* nu_bank_entry;
       p->nu_bank_.emplace_back();
       nu_bank_entry = &p->nu_bank_.back();
@@ -235,8 +232,7 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx)
   
   // 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;
   }
diff --git a/src/simulation.cpp b/src/simulation.cpp
index a3b586a63..43201d046 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -563,12 +563,13 @@ void transport_history_based_single_particle(Particle& p)
   while (true) {
     p.event_calculate_xs();
     p.event_advance();
-    if( p.collision_distance_ > p.boundary_.distance ) 
+    if (p.collision_distance_ > p.boundary_.distance) {
       p.event_cross_surface();
-    else
+    } else {
       p.event_collide();
+    }
     p.event_revive_from_secondary();
-    if(!p.alive_)
+    if (!p.alive_)
       break;
   }
   p.event_death();