From 7eb3496ec6a467a192da245417149d9a1d13a5c4 Mon Sep 17 00:00:00 2001
From: Shikhar Kumar <shikhark@mit.edu>
Date: Mon, 8 Apr 2019 08:44:59 -0400
Subject: [PATCH] Update test suite

---
 .../cmfd_feed/results_true.dat                |  8 ++--
 tests/regression_tests/cmfd_feed/test.py      | 12 ++++--
 .../cmfd_feed_2g/results_true.dat             | 42 +++++++++----------
 tests/regression_tests/cmfd_feed_2g/test.py   |  3 +-
 .../cmfd_feed_ng/results_true.dat             | 34 +++++++--------
 tests/regression_tests/cmfd_feed_ng/test.py   |  3 +-
 tests/regression_tests/cmfd_nofeed/test.py    |  2 +-
 7 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/tests/regression_tests/cmfd_feed/results_true.dat b/tests/regression_tests/cmfd_feed/results_true.dat
index c175dd7db9..03c61b4d80 100644
--- a/tests/regression_tests/cmfd_feed/results_true.dat
+++ b/tests/regression_tests/cmfd_feed/results_true.dat
@@ -378,7 +378,7 @@ tally 5:
 5.253064E+00
 1.396224E+00
 2.996497E+01
-4.508840E+01
+4.508839E+01
 3.818076E+00
 7.509442E-01
 1.574994E+01
@@ -461,11 +461,11 @@ cmfd dominance ratio
 cmfd openmc source comparison
 6.959834E-03
 5.655657E-03
-3.886185E-03
+3.886186E-03
 4.035116E-03
 3.043277E-03
-5.455475E-03
-4.515311E-03
+5.455474E-03
+4.515310E-03
 2.439840E-03
 2.114032E-03
 2.673132E-03
diff --git a/tests/regression_tests/cmfd_feed/test.py b/tests/regression_tests/cmfd_feed/test.py
index 04ac442e0e..d45f316c87 100644
--- a/tests/regression_tests/cmfd_feed/test.py
+++ b/tests/regression_tests/cmfd_feed/test.py
@@ -23,7 +23,8 @@ def test_cmfd_physical_adjoint():
     # Initialize and run CMFDRun object
     cmfd_run = cmfd.CMFDRun()
     cmfd_run.mesh = cmfd_mesh
-    cmfd_run.begin = 5
+    cmfd_run.tally_begin = 5
+    cmfd_run.feedback_begin = 5
     cmfd_run.feedback = True
     cmfd_run.gauss_seidel_tolerance = [1.e-15, 1.e-20]
     cmfd_run.run_adjoint = True
@@ -52,7 +53,8 @@ def test_cmfd_math_adjoint():
     # Initialize and run CMFDRun object
     cmfd_run = cmfd.CMFDRun()
     cmfd_run.mesh = cmfd_mesh
-    cmfd_run.begin = 5
+    cmfd_run.tally_begin = 5
+    cmfd_run.feedback_begin = 5
     cmfd_run.feedback = True
     cmfd_run.gauss_seidel_tolerance = [1.e-15, 1.e-20]
     cmfd_run.run_adjoint = True
@@ -80,7 +82,8 @@ def test_cmfd_write_matrices():
     # Initialize and run CMFDRun object
     cmfd_run = cmfd.CMFDRun()
     cmfd_run.mesh = cmfd_mesh
-    cmfd_run.begin = 5
+    cmfd_run.tally_begin = 5
+    cmfd_run.feedback_begin = 5
     cmfd_run.display = {'dominance': True}
     cmfd_run.feedback = True
     cmfd_run.gauss_seidel_tolerance = [1.e-15, 1.e-20]
@@ -127,7 +130,8 @@ def test_cmfd_feed():
     # Initialize and run CMFDRun object
     cmfd_run = cmfd.CMFDRun()
     cmfd_run.mesh = cmfd_mesh
-    cmfd_run.begin = 5
+    cmfd_run.tally_begin = 5
+    cmfd_run.feedback_begin = 5
     cmfd_run.display = {'dominance': True}
     cmfd_run.feedback = True
     cmfd_run.gauss_seidel_tolerance = [1.e-15, 1.e-20]
diff --git a/tests/regression_tests/cmfd_feed_2g/results_true.dat b/tests/regression_tests/cmfd_feed_2g/results_true.dat
index 2be15c4e88..8a1c5d84b4 100644
--- a/tests/regression_tests/cmfd_feed_2g/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_2g/results_true.dat
@@ -49,7 +49,7 @@ tally 3:
 0.000000E+00
 2.033842E-02
 4.375294E-05
-4.296338E+00
+4.296339E+00
 9.280716E-01
 3.493776E+00
 6.157094E-01
@@ -80,7 +80,7 @@ tally 3:
 0.000000E+00
 0.000000E+00
 1.796382E-02
-3.190854E-05
+3.190855E-05
 4.343238E+00
 9.514039E-01
 3.504683E+00
@@ -106,7 +106,7 @@ tally 3:
 9.885292E+01
 4.888720E+02
 9.509199E-01
-4.670951E-02
+4.670952E-02
 tally 4:
 0.000000E+00
 0.000000E+00
@@ -374,20 +374,20 @@ cmfd entropy
 1.999984E+00
 cmfd balance
 3.993043E-04
-4.168558E-04
-6.384693E-04
-3.928217E-04
-3.789833E-04
+4.168559E-04
+6.384691E-04
+3.928215E-04
+3.789835E-04
 2.684860E-04
-4.849910E-04
+4.849914E-04
 1.084019E-03
 1.091775E-03
 5.459767E-04
-4.455545E-04
+4.455544E-04
 4.011468E-04
-3.710248E-04
+3.710247E-04
 3.577152E-04
-3.845993E-04
+3.845992E-04
 3.900672E-04
 cmfd dominance ratio
  6.239E-03
@@ -408,21 +408,21 @@ cmfd dominance ratio
  5.996E-03
 cmfd openmc source comparison
 1.931386E-05
-2.839162E-05
-1.407962E-05
-6.718148E-06
-9.164193E-06
-1.382539E-05
+2.839161E-05
+1.407963E-05
+6.718156E-06
+9.164199E-06
+1.382540E-05
 2.871606E-05
 4.192300E-05
-5.327516E-05
+5.327515E-05
 6.566500E-05
-6.655541E-05
+6.655540E-05
 6.034977E-05
 6.004677E-05
-5.711623E-05
-6.271264E-05
-6.425363E-05
+5.711622E-05
+6.271263E-05
+6.425362E-05
 cmfd source
 2.510278E-01
 2.480592E-01
diff --git a/tests/regression_tests/cmfd_feed_2g/test.py b/tests/regression_tests/cmfd_feed_2g/test.py
index 22cc7e1602..095dbf53a8 100644
--- a/tests/regression_tests/cmfd_feed_2g/test.py
+++ b/tests/regression_tests/cmfd_feed_2g/test.py
@@ -16,7 +16,8 @@ def test_cmfd_feed_2g():
     # Initialize and run CMFDRun object
     cmfd_run = cmfd.CMFDRun()
     cmfd_run.mesh = cmfd_mesh
-    cmfd_run.begin = 5
+    cmfd_run.tally_begin = 5
+    cmfd_run.feedback_begin = 5
     cmfd_run.display = {'dominance': True}
     cmfd_run.feedback = True
     cmfd_run.downscatter = True
diff --git a/tests/regression_tests/cmfd_feed_ng/results_true.dat b/tests/regression_tests/cmfd_feed_ng/results_true.dat
index fea3d38b8b..ccae5d032c 100644
--- a/tests/regression_tests/cmfd_feed_ng/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_ng/results_true.dat
@@ -573,15 +573,15 @@ cmfd entropy
 cmfd balance
 3.179889E-04
 4.166064E-04
-2.746180E-04
-3.345930E-04
-5.129605E-04
-4.008511E-04
-3.628451E-04
-3.401727E-04
-3.166255E-04
+2.746178E-04
+3.345927E-04
+5.129604E-04
+4.008510E-04
+3.628450E-04
+3.401726E-04
+3.166254E-04
 2.642675E-04
-2.482640E-04
+2.482639E-04
 cmfd dominance ratio
  3.737E-03
  3.786E-03
@@ -597,15 +597,15 @@ cmfd dominance ratio
 cmfd openmc source comparison
 3.559244E-05
 4.429506E-05
-2.739679E-05
-2.715448E-05
-5.105340E-05
-4.069206E-05
-4.033877E-05
-3.669734E-05
-3.540373E-05
-2.907247E-05
-2.734478E-05
+2.739678E-05
+2.715447E-05
+5.105338E-05
+4.069204E-05
+4.033876E-05
+3.669732E-05
+3.540372E-05
+2.907246E-05
+2.734477E-05
 cmfd source
 2.564687E-01
 2.445733E-01
diff --git a/tests/regression_tests/cmfd_feed_ng/test.py b/tests/regression_tests/cmfd_feed_ng/test.py
index db0b44f3e1..266772054f 100644
--- a/tests/regression_tests/cmfd_feed_ng/test.py
+++ b/tests/regression_tests/cmfd_feed_ng/test.py
@@ -17,7 +17,8 @@ def test_cmfd_feed_ng():
     cmfd_run = cmfd.CMFDRun()
     cmfd_run.mesh = cmfd_mesh
     cmfd_run.reset = [5]
-    cmfd_run.begin = 10
+    cmfd_run.tally_begin = 10
+    cmfd_run.feedback_begin = 10
     cmfd_run.display = {'dominance': True}
     cmfd_run.feedback = True
     cmfd_run.downscatter = True
diff --git a/tests/regression_tests/cmfd_nofeed/test.py b/tests/regression_tests/cmfd_nofeed/test.py
index 36f6930268..f99fcb64bc 100644
--- a/tests/regression_tests/cmfd_nofeed/test.py
+++ b/tests/regression_tests/cmfd_nofeed/test.py
@@ -15,7 +15,7 @@ def test_cmfd_nofeed():
     # Initialize and run CMFDRun object
     cmfd_run = cmfd.CMFDRun()
     cmfd_run.mesh = cmfd_mesh
-    cmfd_run.begin = 5
+    cmfd_run.tally_begin = 5
     cmfd_run.display = {'dominance': True}
     cmfd_run.feedback = False
     cmfd_run.gauss_seidel_tolerance = [1.e-15, 1.e-20]