From 10d3327bc4a4efb608834754f713e12d1a7f4909 Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Thu, 18 Apr 2013 07:27:31 -0700 Subject: [PATCH] Revert "check for absolute precision issues when neutron distances to lattice surface and global surface are very small and close" This reverts commit d51d3f72de942f47e1730e0ad7a27ffe2769b9b8. --- src/geometry.F90 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/geometry.F90 b/src/geometry.F90 index ecf1698ff9..6859712886 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -1114,7 +1114,7 @@ contains ! Check is calculated distance is new minimum if (d < dist) then - if (abs(d - dist)/dist >= FP_REL_PRECISION) then + if (abs(d - dist)/dist >= FP_PRECISION) then dist = d surface_crossed = -cl % surfaces(i) lattice_crossed = NONE @@ -1156,8 +1156,7 @@ contains ! point precision. if (d < dist) then - if (abs(d - dist)/dist >= FP_REL_PRECISION & - .and. abs(d - dist) >= FP_PRECISION) then + if (abs(d - dist)/dist >= FP_REL_PRECISION) then dist = d if (u > 0) then lattice_crossed = LATTICE_RIGHT @@ -1178,8 +1177,7 @@ contains end if if (d < dist) then - if (abs(d - dist)/dist >= FP_REL_PRECISION & - .and. abs(d - dist) >= FP_PRECISION) then + if (abs(d - dist)/dist >= FP_REL_PRECISION) then dist = d if (v > 0) then lattice_crossed = LATTICE_FRONT @@ -1203,8 +1201,7 @@ contains end if if (d < dist) then - if (abs(d - dist)/dist >= FP_REL_PRECISION & - .and. abs(d - dist) >= FP_PRECISION) then + if (abs(d - dist)/dist >= FP_REL_PRECISION) then dist = d if (w > 0) then lattice_crossed = LATTICE_TOP