Fixed merge conflict with develop

tests/test_filter_delayedgroup/inputs_true.dat

@@ -0,0 +1 @@
+e771470681d3b4af57a70d148f5eb728df57f1fd7bdb5d6f76ac556b69f10bf0cdd5645fe488f1e17f07cbb72e9fb34af2fd7ede95c8e39c5ffa6ea9b6c5810e

tests/test_filter_delayedgroup/results_true.dat

@@ -0,0 +1,15 @@
+k-combined:
+9.903196E-01 4.279617E-02
+tally 1:
+8.141852E-04
+1.337187E-07
+4.849156E-03
+4.744020E-06
+4.460252E-03
+4.015453E-06
+1.028479E-02
+2.136252E-05
+5.002274E-03
+5.056965E-06
+1.974747E-03
+7.882970E-07

tests/test_filter_delayedgroup/test_filter_delayedgroup.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+
+import os
+import sys
+sys.path.insert(0, os.pardir)
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+
+
+class FilterDelayedgroupTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='delayedgroup',
+                             bins=(1, 2, 3, 4, 5, 6))
+        tally = openmc.Tally(tally_id=1)
+        tally.add_filter(filt)
+        tally.add_score('delayed-nu-fission')
+        self._input_set.tallies = openmc.TalliesFile()
+        self._input_set.tallies.add_tally(tally)
+
+        super(FilterDelayedgroupTestHarness, self)._build_inputs()
+
+    def _cleanup(self):
+        super(FilterDelayedgroupTestHarness, self)._cleanup()
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
+
+
+if __name__ == '__main__':
+    harness = FilterDelayedgroupTestHarness('statepoint.10.*', True)
+    harness.main()

tests/test_many_scores/results_true.dat

@@ -109,3 +109,5 @@ tally 1:
 7.673412E-04
 1.014000E+01
 3.427342E+01
+7.652723E-03
+3.578992E-05

tests/test_many_scores/tallies.xml

@@ -6,7 +6,7 @@
     <scores>
       flux total scatter nu-scatter scatter-2 scatter-p2 nu-scatter-2
       nu-scatter-p2 transport n1n absorption nu-fission kappa-fission
-      flux-y2 total-y2 scatter-y2 nu-scatter-y2 events
+      flux-y2 total-y2 scatter-y2 nu-scatter-y2 events delayed-nu-fission
     </scores>
   </tally>
 

tests/test_score_delayed_nufission/inputs_true.dat

@@ -0,0 +1 @@
+f3c246a1c83b1283163b22069f78231e3f6623fa3c2eb664ce400d0fff07105b6106d0fa8c6dfd49512a7eb676c80e4ee602e19063a9fc453394fe07a94a1bdd

tests/test_score_delayed_nufission/results_true.dat

@@ -0,0 +1,29 @@
+k-combined:
+9.903196E-01 4.279617E-02
+tally 1:
+1.711611E-02
+5.967549E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.026930E-02
+2.198717E-05
+tally 2:
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.976462E-02
+1.953328E-04
+tally 3:
+1.687894E-02
+5.776176E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.061803E-02
+2.308636E-05

tests/test_score_delayed_nufission/test_score_delayed_nufission.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+import os
+import sys
+sys.path.insert(0, os.pardir)
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+
+
+class ScoreDelayedNuFissionTestHarness(PyAPITestHarness):
+    def _build_inputs(self):
+        filt = openmc.Filter(type='cell', bins=(21, 22, 23, 27))
+        tallies = [openmc.Tally(tally_id=i) for i in range(1, 4)]
+        [t.add_filter(filt) for t in tallies]
+        [t.add_score('delayed-nu-fission') for t in tallies]
+        tallies[0].estimator = 'tracklength'
+        tallies[1].estimator = 'analog'
+        tallies[2].estimator = 'collision'
+        self._input_set.tallies = openmc.TalliesFile()
+        [self._input_set.tallies.add_tally(t) for t in tallies]
+
+        super(ScoreDelayedNuFissionTestHarness, self)._build_inputs()
+
+    def _cleanup(self):
+        super(ScoreDelayedNuFissionTestHarness, self)._cleanup()
+        f = os.path.join(os.getcwd(), 'tallies.xml')
+        if os.path.exists(f): os.remove(f)
+
+
+if __name__ == '__main__':
+    harness = ScoreDelayedNuFissionTestHarness('statepoint.10.*', True)
+    harness.main()