From 15bbffc6781b14acaf686939a9ceaf4819382c4e Mon Sep 17 00:00:00 2001
From: guillaume <g_giud@mit.edu>
Date: Thu, 6 Jul 2017 20:27:58 -0400
Subject: [PATCH] Added surface_filter, standalone and with cell_from in
 test_surface_tally

---
 tests/test_surface_tally/geometry.xml     | 16 +++----
 tests/test_surface_tally/results_true.dat | 51 +++++++++++++++++++++++
 tests/test_surface_tally/tallies.xml      | 30 ++++++++++---
 3 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/tests/test_surface_tally/geometry.xml b/tests/test_surface_tally/geometry.xml
index 26f4175c68..19eae6333b 100644
--- a/tests/test_surface_tally/geometry.xml
+++ b/tests/test_surface_tally/geometry.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" name="fuel" region="-10000" universe="10000" />
-    <cell id="10001" material="10001" name="water" region="10000 -10002 10003 -10004" universe="10000" />
-    <cell fill="10000" id="10002" name="root cell" region="10001 -10002 10003 -10004" universe="0" />
-    <surface coeffs="0 0 0.4" id="10000" name="Fuel OR" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-0.62992" id="10001" name="left" type="x-plane" />
-    <surface boundary="reflective" coeffs="0.62992" id="10002" name="right" type="x-plane" />
-    <surface boundary="reflective" coeffs="-0.62992" id="10003" name="bottom" type="y-plane" />
-    <surface boundary="reflective" coeffs="0.62992" id="10004" name="top" type="y-plane" />
+    <cell id="10000" material="10000" name="fuel" region="-1" universe="10000" />
+    <cell id="10001" material="10001" name="water" region="1 -10001 10002 -10003" universe="10000" />
+    <cell fill="10000" id="10002" name="root cell" region="10000 -10001 10002 -10003" universe="0" />
+    <surface coeffs="0 0 0.4" id="1" name="Fuel OR" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-0.62992" id="10000" name="left" type="x-plane" />
+    <surface boundary="reflective" coeffs="0.62992" id="10001" name="right" type="x-plane" />
+    <surface boundary="reflective" coeffs="-0.62992" id="10002" name="bottom" type="y-plane" />
+    <surface boundary="reflective" coeffs="0.62992" id="10003" name="top" type="y-plane" />
 </geometry>
diff --git a/tests/test_surface_tally/results_true.dat b/tests/test_surface_tally/results_true.dat
index 2566194529..f9f473b19c 100644
--- a/tests/test_surface_tally/results_true.dat
+++ b/tests/test_surface_tally/results_true.dat
@@ -18,6 +18,23 @@ tally 1:
 1.089000E+00
 2.432570E-01
 tally 2:
+9.400000E-01
+1.778300E-01
+2.561000E+00
+1.315759E+00
+8.618000E+00
+1.487929E+01
+2.559600E+01
+1.311144E+02
+4.700000E-02
+4.870000E-04
+1.010000E-01
+2.207000E-03
+3.780000E-01
+2.889000E-02
+1.089000E+00
+2.432570E-01
+tally 3:
 9.070000E-01
 1.648450E-01
 2.495000E+00
@@ -34,3 +51,37 @@ tally 2:
 2.528400E-02
 9.770000E-01
 1.957910E-01
+tally 4:
+9.070000E-01
+1.648450E-01
+2.495000E+00
+1.247251E+00
+8.515000E+00
+1.452994E+01
+2.539500E+01
+1.290580E+02
+3.800000E-02
+3.220000E-04
+8.400000E-02
+1.480000E-03
+3.540000E-01
+2.528400E-02
+9.770000E-01
+1.957910E-01
+tally 5:
+1.847000E+00
+6.843910E-01
+5.056000E+00
+5.124718E+00
+1.713300E+01
+5.881492E+01
+5.099100E+01
+5.203348E+02
+8.500000E-02
+1.595000E-03
+1.850000E-01
+7.259000E-03
+7.320000E-01
+1.080440E-01
+2.066000E+00
+8.753660E-01
diff --git a/tests/test_surface_tally/tallies.xml b/tests/test_surface_tally/tallies.xml
index 1b69016348..fd76a84d22 100644
--- a/tests/test_surface_tally/tallies.xml
+++ b/tests/test_surface_tally/tallies.xml
@@ -15,20 +15,38 @@
     <filter id="10002" type="azimuthal">
         <bins>0.0 0.785398163397 3.14159265359</bins>
     </filter>
-    <filter id="10005" type="cellfrom">
+    <filter id="10005" type="surface">
+        <bins>1</bins>
+    </filter>
+    <filter id="10006" type="cellfrom">
         <bins>10001</bins>
     </filter>
-    <filter id="10006" type="cell">
+    <filter id="10007" type="cell">
         <bins>10000</bins>
     </filter>
     <tally id="0" name="10000-10001">
         <filters>10003 10004 10000 10001 10002</filters>
-        <scores>partial_current</scores>
+        <scores>total-current</scores>
         <estimator>analog</estimator>
     </tally>
-    <tally id="1" name="10001-10000">
-        <filters>10005 10006 10000 10001 10002</filters>
-        <scores>partial_current</scores>
+    <tally id="1" name="10000-surface1">
+        <filters>10003 10005 10000 10001 10002</filters>
+        <scores>total-current</scores>
+        <estimator>analog</estimator>
+    </tally>
+    <tally id="2" name="10001-10000">
+        <filters>10006 10007 10000 10001 10002</filters>
+        <scores>total-current</scores>
+        <estimator>analog</estimator>
+    </tally>
+    <tally id="3" name="10001-surface1">
+        <filters>10006 10005 10000 10001 10002</filters>
+        <scores>total-current</scores>
+        <estimator>analog</estimator>
+    </tally>
+    <tally id="4" name="surface1">
+        <filters>10005 10000 10001 10002</filters>
+        <scores>total-current</scores>
         <estimator>analog</estimator>
     </tally>
 </tallies>