Set proc_time argument in Results.save to default to None

Adjust final calls to integrator routines accordingly.

Minor documentation changes

openmc/deplete/integrator/cecm.py

@@ -69,8 +69,6 @@ def cecm(operator, timesteps, power=None, power_density=None, print_out=True):
 
         chain = operator.chain
 
-        proc_time = None
-
         for i, (dt, p) in enumerate(zip(timesteps, power)):
             # Get beginning-of-timestep concentrations and reaction rates
             # Avoid doing first transport run if already done in previous
@@ -122,4 +120,4 @@ def cecm(operator, timesteps, power=None, power_density=None, print_out=True):
         op_results = [operator(x[0], power[-1])]
 
         # Create results, write to disk
-        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps), None)
+        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps))

openmc/deplete/integrator/celi.py

@@ -88,7 +88,7 @@ def celi(operator, timesteps, power=None, power_density=None,
         op_results = [operator(x[0], power[-1])]
 
         # Create results, write to disk
-        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps), None)
+        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps))
 
 
 def celi_inner(operator, vec, p, i, i_res, t, dt, print_out):

openmc/deplete/integrator/cf4.py

@@ -150,7 +150,7 @@ def cf4(operator, timesteps, power=None, power_density=None, print_out=True):
             # Create results, write to disk
             Results.save(
                 operator, x, op_results, [t, t + dt], p, i_res + i,
-                sum((time_1, time_2, time_3, time_4, time_5)))
+                time_1 + time_2 + time_3 + time_4 + time_5)
 
             # Advance time, update vector
             t += dt
@@ -161,4 +161,4 @@ def cf4(operator, timesteps, power=None, power_density=None, print_out=True):
         op_results = [operator(x[0], power[-1])]
 
         # Create results, write to disk
-        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps), None)
+        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps))

openmc/deplete/integrator/epc_rk4.py

@@ -145,4 +145,4 @@ def epc_rk4(operator, timesteps, power=None, power_density=None, print_out=True)
 
         # Create results, write to disk
         Results.save(
-            operator, x, op_results, [t, t], p, i_res + len(timesteps), None)
+            operator, x, op_results, [t, t], p, i_res + len(timesteps))

openmc/deplete/integrator/leqi.py

@@ -167,4 +167,4 @@ def leqi(operator, timesteps, power=None, power_density=None, print_out=True):
 
         # Create results, write to disk
         Results.save(
-            operator, x, op_results, [t, t], p, i_res + len(timesteps), None)
+            operator, x, op_results, [t, t], p, i_res + len(timesteps))

openmc/deplete/integrator/predictor.py

@@ -103,4 +103,4 @@ def predictor(operator, timesteps, power=None, power_density=None,
         op_results = [operator(x[0], power[-1])]
 
         # Create results, write to disk
-        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps), None)
+        Results.save(operator, x, op_results, [t, t], p, i_res + len(timesteps))

openmc/deplete/integrator/si_celi.py

@@ -95,7 +95,7 @@ def si_celi(operator, timesteps, power=None, power_density=None,
 
         # Create results for last point, write to disk
         Results.save(
-            operator, x, op_results, [t, t], p, i_res + len(timesteps), None)
+            operator, x, op_results, [t, t], p, i_res + len(timesteps))
 
 
 def si_celi_inner(operator, x, op_results, p, i, i_res, t, dt, print_out, m=10):

openmc/deplete/integrator/si_leqi.py

@@ -154,4 +154,4 @@ def si_leqi(operator, timesteps, power=None, power_density=None,
 
         # Create results for last point, write to disk
         Results.save(
-                operator, x, op_results, [t, t], p, i_res+len(timesteps), None)
+                operator, x, op_results, [t, t], p, i_res+len(timesteps))

openmc/deplete/results.py

@@ -47,6 +47,8 @@ class Results(object):
         Number of stages in simulation.
     data : numpy.ndarray
         Atom quantity, stored by stage, mat, then by nuclide.
+    proc_time: int
+        Amount of process time spent depleting materials
 
     """
     def __init__(self):
@@ -247,7 +249,7 @@ class Results(object):
                               dtype='float64')
 
         handle.create_dataset(
-            "depletion time", (1, 1), maxshape=(None, 1),
+            "depletion time", (1,), maxshape=(None,),
             dtype="float64")
 
     def _to_hdf5(self, handle, index):
@@ -396,7 +398,7 @@ class Results(object):
         return results
 
     @staticmethod
-    def save(op, x, op_results, t, power, step_ind, proc_time):
+    def save(op, x, op_results, t, power, step_ind, proc_time=None):
         """Creates and writes depletion results to disk
 
         Parameters
@@ -413,7 +415,7 @@ class Results(object):
             Power during time step
         step_ind : int
             Step index.
-        proc_time: float or None
+        proc_time : float or None
             time spent depleting materials.
 
         """