diff --git a/src/geometry.F90 b/src/geometry.F90 index e1e1b1f44e..e922479b1d 100644 --- a/src/geometry.F90 +++ b/src/geometry.F90 @@ -430,7 +430,7 @@ contains call find_cell(p, found) if (.not. found) then call handle_lost_particle(p, "Couldn't find particle after reflecting& - & from surface.") + & from surface " // trim(to_str(surf%id)) // ".") return end if diff --git a/src/surface_header.F90 b/src/surface_header.F90 index a927ce4d40..257cdbc1a1 100644 --- a/src/surface_header.F90 +++ b/src/surface_header.F90 @@ -997,7 +997,7 @@ contains this%E*(v*z + w*y) + this%F*(w*x + u*z) + this%G*u + this%H*v + & this%J*w)) c = this%A*x*x + this%B*y*y + this%C*z*z + this%D*x*y + this%E*y*z + & - this%F*y*z + this%G*x + this%H*y + this%J*z + K + this%F*x*z + this%G*x + this%H*y + this%J*z + this%K quad = k*k - a*c if (quad < ZERO) then diff --git a/tests/test_quadric_surfaces/geometry.xml b/tests/test_quadric_surfaces/geometry.xml new file mode 100644 index 0000000000..98d647a4f6 --- /dev/null +++ b/tests/test_quadric_surfaces/geometry.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/tests/test_reflective_sphere/materials.xml b/tests/test_quadric_surfaces/materials.xml similarity index 56% rename from tests/test_reflective_sphere/materials.xml rename to tests/test_quadric_surfaces/materials.xml index 315c0fa848..0150332b3c 100644 --- a/tests/test_reflective_sphere/materials.xml +++ b/tests/test_quadric_surfaces/materials.xml @@ -3,7 +3,8 @@ - + + diff --git a/tests/test_quadric_surfaces/results_true.dat b/tests/test_quadric_surfaces/results_true.dat new file mode 100644 index 0000000000..b2e02fdbb7 --- /dev/null +++ b/tests/test_quadric_surfaces/results_true.dat @@ -0,0 +1,2 @@ +k-combined: +9.706301E-01 4.351374E-02 diff --git a/tests/test_reflective_cone/settings.xml b/tests/test_quadric_surfaces/settings.xml similarity index 79% rename from tests/test_reflective_cone/settings.xml rename to tests/test_quadric_surfaces/settings.xml index af56f56368..9f0e8ed05f 100644 --- a/tests/test_reflective_cone/settings.xml +++ b/tests/test_quadric_surfaces/settings.xml @@ -8,7 +8,7 @@ - + diff --git a/tests/test_reflective_cone/test_reflective_cone.py b/tests/test_quadric_surfaces/test_quadric_surfaces.py old mode 100644 new mode 100755 similarity index 100% rename from tests/test_reflective_cone/test_reflective_cone.py rename to tests/test_quadric_surfaces/test_quadric_surfaces.py diff --git a/tests/test_reflective_cone/geometry.xml b/tests/test_reflective_cone/geometry.xml deleted file mode 100644 index f5499fbb61..0000000000 --- a/tests/test_reflective_cone/geometry.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tests/test_reflective_cone/materials.xml b/tests/test_reflective_cone/materials.xml deleted file mode 100644 index 315c0fa848..0000000000 --- a/tests/test_reflective_cone/materials.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/test_reflective_cone/results_true.dat b/tests/test_reflective_cone/results_true.dat deleted file mode 100644 index c8b833bff4..0000000000 --- a/tests/test_reflective_cone/results_true.dat +++ /dev/null @@ -1,2 +0,0 @@ -k-combined: -2.269987E+00 4.469683E-03 diff --git a/tests/test_reflective_cylinder/geometry.xml b/tests/test_reflective_cylinder/geometry.xml deleted file mode 100644 index e6aed65daf..0000000000 --- a/tests/test_reflective_cylinder/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_reflective_cylinder/materials.xml b/tests/test_reflective_cylinder/materials.xml deleted file mode 100644 index 315c0fa848..0000000000 --- a/tests/test_reflective_cylinder/materials.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/test_reflective_cylinder/results_true.dat b/tests/test_reflective_cylinder/results_true.dat deleted file mode 100644 index 0a11f3ef31..0000000000 --- a/tests/test_reflective_cylinder/results_true.dat +++ /dev/null @@ -1,2 +0,0 @@ -k-combined: -2.272436E+00 7.831006E-04 diff --git a/tests/test_reflective_cylinder/settings.xml b/tests/test_reflective_cylinder/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_reflective_cylinder/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_reflective_cylinder/test_reflective_cylinder.py b/tests/test_reflective_cylinder/test_reflective_cylinder.py deleted file mode 100644 index 2a595f3e66..0000000000 --- a/tests/test_reflective_cylinder/test_reflective_cylinder.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -import os -import sys -sys.path.insert(0, os.pardir) -from testing_harness import TestHarness - - -if __name__ == '__main__': - harness = TestHarness('statepoint.10.*') - harness.main() diff --git a/tests/test_reflective_sphere/geometry.xml b/tests/test_reflective_sphere/geometry.xml deleted file mode 100644 index 0dc98eba69..0000000000 --- a/tests/test_reflective_sphere/geometry.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/test_reflective_sphere/results_true.dat b/tests/test_reflective_sphere/results_true.dat deleted file mode 100644 index 91dd20fba8..0000000000 --- a/tests/test_reflective_sphere/results_true.dat +++ /dev/null @@ -1,2 +0,0 @@ -k-combined: -2.271012E+00 3.466351E-03 diff --git a/tests/test_reflective_sphere/settings.xml b/tests/test_reflective_sphere/settings.xml deleted file mode 100644 index a6fd5da19e..0000000000 --- a/tests/test_reflective_sphere/settings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 10 - 5 - 1000 - - - - - -4 -4 -4 4 4 4 - - - - diff --git a/tests/test_reflective_sphere/test_reflective_sphere.py b/tests/test_reflective_sphere/test_reflective_sphere.py deleted file mode 100644 index 2a595f3e66..0000000000 --- a/tests/test_reflective_sphere/test_reflective_sphere.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -import os -import sys -sys.path.insert(0, os.pardir) -from testing_harness import TestHarness - - -if __name__ == '__main__': - harness = TestHarness('statepoint.10.*') - harness.main()