Merge branch 'develop' into reduced-absorption-xs

docs/source/pythonapi/data.rst

@@ -61,11 +61,13 @@ Core Functions
 
     atomic_mass
     atomic_weight
+    combine_distributions
     decay_constant
     dose_coefficients
     gnd_name
     half_life
     isotopes
+    kalbach_slope
     linearize
     thin
     water_density

docs/source/pythonapi/deplete.rst

@@ -15,16 +15,18 @@ are:
     1) A transport operator
     2) A time-integration scheme
 
-The former is responsible for executing a transport code, like OpenMC,
-and retaining important information required for depletion. The most common examples
-are reaction rates and power normalization data. The latter is responsible for
-projecting reaction rates and compositions forward in calendar time across
-some step size :math:`\Delta t`, and obtaining new compositions given a power
-or power density. The :class:`Operator` is provided to handle communicating with
-OpenMC. Several classes are provided that implement different time-integration
-algorithms for depletion calculations, which are described in detail in Colin
-Josey's thesis, `Development and analysis of high order neutron
-transport-depletion coupling algorithms <http://hdl.handle.net/1721.1/113721>`_.
+The former is responsible for calculating and retaining important information
+required for depletion. The most common examples are reaction rates and power
+normalization data. The latter is responsible for projecting reaction rates and
+compositions forward in calendar time across some step size :math:`\Delta t`,
+and obtaining new compositions given a power or power density. The
+:class:`CoupledOperator` class is provided to obtain reaction rates via tallies
+through OpenMC's transport solver, and the :class:`IndependentOperator` class is
+provided to obtain reaction rates from cross-section data. Several classes are
+provided that implement different time-integration algorithms for depletion
+calculations, which are described in detail in Colin Josey's thesis,
+`Development and analysis of high order neutron transport-depletion coupling
+algorithms <http://hdl.handle.net/1721.1/113721>`_.
 
 .. autosummary::
     :toctree: generated
@@ -40,18 +42,20 @@ transport-depletion coupling algorithms <http://hdl.handle.net/1721.1/113721>`_.
     SICELIIntegrator
     SILEQIIntegrator
 
-Each of these classes expects a "transport operator" to be passed. An operator
-specific to OpenMC is available using the following class:
+Each of these classes expects a "transport operator" to be passed. OpenMC
+provides The following classes implementing transpor operators:
 
 .. autosummary::
    :toctree: generated
    :nosignatures:
    :template: mycallable.rst
 
-   Operator
+   CoupledOperator
+   IndependentOperator
 
-The :class:`Operator` must also have some knowledge of how nuclides transmute
-and decay. This is handled by the :class:`Chain`.
+The :class:`CoupledOperator` and :class:`IndependentOperator` classes must also
+have some knowledge of how nuclides transmute and decay. This is handled by the 
+:class:`Chain`.
 
 Minimal Example
 ---------------
@@ -64,11 +68,12 @@ A minimal example for performing depletion would be:
     >>> import openmc.deplete
     >>> geometry = openmc.Geometry.from_xml()
     >>> settings = openmc.Settings.from_xml()
+    >>> model = openmc.model.Model(geometry, settings)
 
     # Representation of a depletion chain
     >>> chain_file = "chain_casl.xml"
-    >>> operator = openmc.deplete.Operator(
-    ...     geometry, settings, chain_file)
+    >>> operator = openmc.deplete.CoupledOperator(
+    ...     model, chain_file)
 
     # Set up 5 time steps of one day each
     >>> dt = [24 * 60 * 60] * 5
@@ -131,6 +136,7 @@ data, such as number densities and reaction rates for each material.
    :template: myclass.rst
 
    AtomNumber
+   MicroXS
    OperatorResult
    ReactionRates
    Results
@@ -172,7 +178,7 @@ with :func:`cram.CRAM48` being the default.
    :class:`multiprocessing.pool.Pool` class. If set to ``None`` (default), the
    number returned by :func:`os.cpu_count` is used.
 
-The following classes are used to help the :class:`openmc.deplete.Operator`
+The following classes are used to help the :class:`openmc.deplete.CoupledOperator`
 compute quantities like effective fission yields, reaction rates, and
 total system energy.
 
@@ -189,14 +195,45 @@ total system energy.
    helpers.FissionYieldCutoffHelper
    helpers.FluxCollapseHelper
 
+The :class:`openmc.deplete.IndependentOperator` uses inner classes subclassed 
+from those listed above to perform similar calculations.
+
+Intermediate Classes
+--------------------
+
+Specific implementations of abstract base classes may utilize some of
+the same methods and data structures. These methods and data are stored 
+in intermediate classes.
+
+Methods common to tally-based implementation of :class:`FissionYieldHelper`
+are stored in :class:`helpers.TalliedFissionYieldHelper`
+
+.. autosummary::
+   :toctree: generated
+   :nosignatures:
+   :template: myclass.rst
+
+   helpers.TalliedFissionYieldHelper
+
+Methods common to OpenMC-specific implementations of :class:`TransportOperator`
+are stored in :class:`openmc_operator.OpenMCOperator`
+
+.. autosummary::
+   :toctree: generated
+   :nosignatures:
+   :template: mycallable.rst
+
+   openmc_operator.OpenMCOperator
+
+
 Abstract Base Classes
 ---------------------
 
 A good starting point for extending capabilities in :mod:`openmc.deplete` is
 to examine the following abstract base classes. Custom classes can
 inherit from :class:`abc.TransportOperator` to implement alternative
-schemes for collecting reaction rates and other data from a transport code
-prior to depleting materials
+schemes for collecting reaction rates and other data prior to depleting
+materials
 
 .. autosummary::
    :toctree: generated
@@ -206,7 +243,9 @@ prior to depleting materials
    abc.TransportOperator
 
 The following classes are abstract classes used to pass information from
-OpenMC simulations back on to the :class:`abc.TransportOperator`
+transport simulations (in the case of transport-coupled depletion) or to
+simply calculate these quantities directly (in the case of
+transport-independent depletion) back on to the :class:`abc.TransportOperator`
 
 .. autosummary::
    :toctree: generated
@@ -216,7 +255,6 @@ OpenMC simulations back on to the :class:`abc.TransportOperator`
    abc.NormalizationHelper
    abc.FissionYieldHelper
    abc.ReactionRateHelper
-   abc.TalliedFissionYieldHelper
 
 Custom integrators or depletion solvers can be developed by subclassing from
 the following abstract base classes: