From 80e62611c13fc4a231d4ce78475374eaf787ae91 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Thu, 4 Jun 2020 14:48:52 -0500
Subject: [PATCH] Corrections after rebase.

---
 include/openmc/mesh.h | 9 +++------
 src/mesh.cpp          | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index 0be9f6538..208399c51 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -344,14 +344,11 @@ public:
                     std::vector<int>& bins,
                     std::vector<double>& lengths) const override;
 
-  std::pair<std::vector<double>, std::vector<double>>
-  plot(Position plot_ll, Position plot_ur) const override;
-
   //! Determine which surface bins were crossed by a particle.
   //
   //! \param[in] p Particle to check
   //! \param[out] bins Surface bins that were crossed
-  void surface_bins_crossed(const Particle* p, std::vector<int>& bins) const;
+  void surface_bins_crossed(const Particle& p, std::vector<int>& bins) const;
 
   int get_bin(Position r) const;
 
@@ -503,11 +500,11 @@ public:
   LibMesh(const std::string& filename);
 
   // Methods
-  void bins_crossed(const Particle* p,
+  void bins_crossed(const Particle& p,
                     std::vector<int>& bins,
                     std::vector<double>& lengths) const override;
 
-  void surface_bins_crossed(const Particle* p, std::vector<int>& bins) const override;
+  void surface_bins_crossed(const Particle& p, std::vector<int>& bins) const override;
 
   int get_bin(Position r) const override;
 
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 9593f0b94..7d7ecb629 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -1743,7 +1743,7 @@ MOABUnstructuredMesh::intersect_track(const moab::CartVect& start,
 }
 
 void
-MOABUnstructuredMesh::bins_crossed(const Particle* p,
+MOABUnstructuredMesh::bins_crossed(const Particle& p,
                                std::vector<int>& bins,
                                std::vector<double>& lengths) const
 {
@@ -1869,7 +1869,7 @@ double MOABUnstructuredMesh::tet_volume(moab::EntityHandle tet) const {
  return 1.0 / 6.0 * (((p[1] - p[0]) * (p[2] - p[0])) % (p[3] - p[0]));
 }
 
-void MOABUnstructuredMesh::surface_bins_crossed(const Particle* p, std::vector<int>& bins) const {
+void MOABUnstructuredMesh::surface_bins_crossed(const Particle& p, std::vector<int>& bins) const {
   // TODO: Implement triangle crossings here
   throw std::runtime_error{"Unstructured mesh surface tallies are not implemented."};
 }
@@ -2237,7 +2237,7 @@ int LibMesh::n_surface_bins() const {
 }
 
 void
-LibMesh::surface_bins_crossed(const Particle* p,
+LibMesh::surface_bins_crossed(const Particle& p,
                                std::vector<int>& bins) const
 {
   // TODO: Implement triangle crossings here
@@ -2308,7 +2308,7 @@ void LibMesh::write(std::string filename) const {
 }
 
 void
-LibMesh::bins_crossed(const Particle* p,
+LibMesh::bins_crossed(const Particle& p,
                       std::vector<int>& bins,
                       std::vector<double>& lengths) const
 {