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

docs/source/io_formats/mgxs_library.rst

@@ -30,7 +30,7 @@ MGXS Library Specification
 
 :Attributes: - **groups** (*int*) -- Number of energy groups
              - **group structure** (*double[]*) -- Monotonically increasing
-               list of group boundaries, in units of MeV.  The length of this
+               list of group boundaries, in units of eV.  The length of this
                array should be the number of groups plus 1.
 
 **/<library name>/**
@@ -77,8 +77,8 @@ data for the nuclide or material that it represents.
 
 **/<library name>/kTs/**
 
-:Datasets: 
-           - **<TTT>K** (*double*) -- kT values (in MeV) for each Temperature
+:Datasets:
+           - **<TTT>K** (*double*) -- kT values (in eV) for each temperature
              TTT (in Kelvin), rounded to the nearest integer
 
 **/<library name>/<TTT>K/**
@@ -161,4 +161,4 @@ Data specific to neutron scattering for the temperature <TTT>K
              1.0) will be assumed.
              The pre-flattened array is shapes consistent with `scatter_matrix`
              except the "[Order]" dimension in `scatter_shape` is ignored since
-             this data is assumed isotropic.
+             this data is assumed isotropic.

docs/source/io_formats/nuclear_data.rst

@@ -8,6 +8,10 @@ Nuclear Data File Format
 Incident Neutron Data
 ---------------------
 
+**/**
+
+:Attributes:
+             - **version** (*int[2]*) -- Major and minor version of the data
 
 **/<nuclide name>/**
 
@@ -27,14 +31,14 @@ temperature-dependent data set.  For example, the data set corresponding to
 300 Kelvin would be located at `300K`.
 
 :Datasets:
-           - **<TTT>K** (*double*) -- kT values (in MeV) for each Temperature
+           - **<TTT>K** (*double*) -- kT values (in eV) for each temperature
              TTT (in Kelvin)
 
 **/<nuclide name>/reactions/reaction_<mt>/**
 
 :Attributes: - **mt** (*int*) -- ENDF MT reaction number
              - **label** (*char[]*) -- Name of the reaction
-             - **Q_value** (*double*) -- Q value in MeV
+             - **Q_value** (*double*) -- Q value in eV
              - **center_of_mass** (*int*) -- Whether the reference frame for
                scattering is center-of-mass (1) or laboratory (0)
              - **n_product** (*int*) -- Number of reaction products
@@ -113,6 +117,11 @@ temperature-dependent data set.  For example, the data set corresponding to
 Thermal Neutron Scattering Data
 -------------------------------
 
+**/**
+
+:Attributes:
+             - **version** (*int[2]*) -- Major and minor version of the data
+
 **/<thermal name>/**
 
 :Attributes: - **atomic_weight_ratio** (*double*) -- Mass in units of neutron masses
@@ -129,7 +138,7 @@ temperature-dependent data set.  For example, the data set corresponding to
 300 Kelvin would be located at `300K`.
 
 :Datasets:
-           - **<TTT>K** (*double*) -- kT values (in MeV) for each Temperature
+           - **<TTT>K** (*double*) -- kT values (in eV) for each temperature
              TTT (in Kelvin)
 
 **/<thermal name>/elastic/<TTT>K/**
@@ -333,7 +342,7 @@ N-Body Phase Space
              - **n_particles** (*int*) -- Number of product particles
              - **atomic_weight_ratio** (*double*) -- Atomic weight ratio of the
                target nuclide in neutron masses
-             - **q_value** (*double*) -- Q value for the reaction in MeV
+             - **q_value** (*double*) -- Q value for the reaction in eV
 
 .. _energy_distribution:
 
@@ -346,7 +355,7 @@ Maxwell
 
 :Object type: Group
 :Attributes: - **type** (*char[]*) -- 'maxwell'
-             - **u** (*double*) -- Restriction energy in MeV
+             - **u** (*double*) -- Restriction energy in eV
 :Datasets:
            - **theta** (:ref:`tabulated <1d_tabulated>`) -- Maxwellian
              temperature as a function of energy
@@ -356,7 +365,7 @@ Evaporation
 
 :Object type: Group
 :Attributes: - **type** (*char[]*) -- 'evaporation'
-             - **u** (*double*) -- Restriction energy in MeV
+             - **u** (*double*) -- Restriction energy in eV
 :Datasets:
            - **theta** (:ref:`tabulated <1d_tabulated>`) -- Evaporation
              temperature as a function of energy
@@ -366,7 +375,7 @@ Watt Fission Spectrum
 
 :Object type: Group
 :Attributes: - **type** (*char[]*) -- 'watt'
-             - **u** (*double*) -- Restriction energy in MeV
+             - **u** (*double*) -- Restriction energy in eV
 :Datasets: - **a** (:ref:`tabulated <1d_tabulated>`) -- Watt parameter :math:`a`
              as a function of incident energy
            - **b** (:ref:`tabulated <1d_tabulated>`) -- Watt parameter :math:`b`
@@ -386,7 +395,7 @@ Discrete Photon
 :Object type: Group
 :Attributes: - **type** (*char[]*) -- 'discrete_photon'
              - **primary_flag** (*int*) -- Whether photon is a primary
-             - **energy** (*double*) -- Photon energy in MeV
+             - **energy** (*double*) -- Photon energy in eV
              - **atomic_weight_ratio** (*double*) -- Atomic weight ratio of
                target nuclide in neutron masses
 
@@ -396,7 +405,7 @@ Level Inelastic
 :Object type: Group
 :Attributes: - **type** (*char[]*) -- 'level'
              - **threshold** (*double*) -- Energy threshold in the laboratory
-               system in MeV
+               system in eV
              - **mass_ratio** (*double*) -- :math:`(A/(A + 1))^2`
 
 Continuous Tabular

docs/source/io_formats/particle_restart.rst

@@ -46,7 +46,7 @@ The current revision of the particle restart file format is 1.
 
 **/energy** (*double*)
 
-    Energy of the particle in MeV for continuous-energy mode, or the energy
+    Energy of the particle in eV for continuous-energy mode, or the energy
     group of the particle for multi-group mode.
 
 **/xyz** (*double[3]*)