Merge remote-tracking branch 'upstream/develop' into multipole

docs/source/usersguide/output/statepoint.rst

@@ -248,7 +248,7 @@ if run_mode == 'k-eigenvalue':
     Accumulated sum and sum-of-squares for each global tally. The compound type
     has fields named ``sum`` and ``sum_sq``.
 
-**tallies_present** (*int*)
+**/tallies_present** (*int*)
 
     Flag indicated if tallies are present in the file.
 
@@ -260,3 +260,69 @@ if (run_mode == 'k-eigenvalue' and source_present > 0)
         ``wgt``, ``xyz``, ``uvw``, ``E``, ``g``, and ``delayed_group``, which
         represent the weight, position, direction, energy, energy group, and
         delayed_group of the source particle, respectively.
+
+**/runtime/total initialization** (*double*)
+
+    Time (in seconds on the master process) spent reading inputs, allocating
+    arrays, etc.
+
+**/runtime/reading cross sections** (*double*)
+
+    Time (in seconds on the master process) spent loading cross section
+    libraries (this is a subset of initialization).
+
+**/runtime/simulation** (*double*)
+
+    Time (in seconds on the master process) spent between initialization and
+    finalization.
+
+**/runtime/transport** (*double*)
+
+    Time (in seconds on the master process) spent transporting particles.
+
+**/runtime/inactive batches** (*double*)
+
+    Time (in seconds on the master process) spent in the inactive batches
+    (including non-transport activities like communcating sites).
+
+**/runtime/active batches** (*double*)
+
+    Time (in seconds on the master process) spent in the active batches
+    (including non-transport activities like communicating sites).
+
+**/runtime/synchronizing fission bank** (*double*)
+
+    Time (in seconds on the master process) spent sampling source particles
+    from fission sites and communicating them to other processes for load
+    balancing.
+
+**/runtime/sampling source sites** (*double*)
+
+    Time (in seconds on the master process) spent sampling source particles
+    from fission sites.
+
+**/runtime/SEND-RECV source sites** (*double*)
+
+    Time (in seconds on the master process) spent communicating source sites
+    between processes for load balancing.
+
+**/runtime/accumulating tallies** (*double*)
+
+    Time (in seconds on the master process) spent communicating tally results
+    and evaluating their statistics.
+
+**/runtime/CMFD** (*double*)
+
+    Time (in seconds on the master process) spent evaluating CMFD.
+
+**/runtime/CMFD building matrices** (*double*)
+
+    Time (in seconds on the master process) spent buliding CMFD matrices.
+
+**/runtime/CMFD solving matrices** (*double*)
+
+    Time (in seconds on the master process) spent solving CMFD matrices.
+
+**/runtime/total** (*double*)
+
+    Total time spent (in seconds on the master process) in the program.

docs/source/usersguide/output/summary.rst

@@ -297,6 +297,13 @@ The current revision of the summary file format is 1.
 
     Filter offset (used for distribcell filter).
 
+**/tallies/tally <uid>/filter <j>/paths** (*char[][]*)
+
+    The paths traversed through the CSG tree to reach each distribcell
+    instance (for 'distribcell' filters only). This consists of the integer
+    IDs for each universe, cell and lattice delimited by '->'. Each lattice
+    cell is specified by its (x,y) or (x,y,z) indices.
+
 **/tallies/tally <uid>/filter <j>/n_bins** (*int*)
 
     Number of bins for the j-th filter.