From c5df6ce146abeee0d83447aa7a1deccf354b9ade Mon Sep 17 00:00:00 2001
From: Sterling Harper <smharper@mit.edu>
Date: Fri, 12 Aug 2016 16:40:13 -0500
Subject: [PATCH] Fix mesh filter max iterator check

---
 src/tally_filter.F90 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/tally_filter.F90 b/src/tally_filter.F90
index c0e1c88534..67d0452847 100644
--- a/src/tally_filter.F90
+++ b/src/tally_filter.F90
@@ -295,8 +295,12 @@ contains
           search_iter = 0
           do while (any(ijk0(:m % n_dimension) < 1) &
                .or. any(ijk0(:m % n_dimension) > m % dimension))
-            if (search_iter == MAX_SEARCH_ITER) call fatal_error("Failed to &
-                 &find a mesh intersection on a tally mesh filter.")
+            if (search_iter == MAX_SEARCH_ITER) then
+              call warning("Failed to find a mesh intersection on a tally mesh &
+                   &filter.")
+              next_bin = NO_BIN_FOUND
+              return
+            end if
 
             do j = 1, m % n_dimension
               if (abs(uvw(j)) < FP_PRECISION) then
@@ -315,6 +319,8 @@ contains
             else
               ijk0(j) = ijk0(j) - 1
             end if
+
+            search_iter = search_iter + 1
           end do
           distance = d(j)
           xyz0 = xyz0 + distance * uvw