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

docs/source/usersguide/input.rst

@@ -292,8 +292,8 @@ OpenMC can use it for on-the-fly Doppler-broadening of resolved resonance range
 cross sections. If this element is absent from the settings.xml file, the
 :envvar:`OPENMC_MULTIPOLE_LIBRARY` environment variable will be used.
 
-  .. note:: The :ref:`temperature_method` must also be set to "multipole" for
-            windowed multipole functionality.
+  .. note:: The <temperature_multipole> element must also be set to "true" for
+    windowed multipole functionality.
 
 ``<max_order>`` Element
 ---------------------------
@@ -755,19 +755,29 @@ a material default temperature.
 ``<temperature_method>`` Element
 --------------------------------
 
-The ``<temperature_method>`` element has an accepted value of "nearest",
-"interpolation", or "multipole". A value of "nearest" indicates that for each
+The ``<temperature_method>`` element has an accepted value of "nearest" or
+"interpolation". A value of "nearest" indicates that for each
 cell, the nearest temperature at which cross sections are given is to be
 applied, within a given tolerance (see :ref:`temperature_tolerance`). A value of
 "interpolation" indicates that cross sections are to be linear-linear
 interpolated between temperatures at which nuclear data are present (see
-:ref:`temperature_treatment`). A value of "multipole" indicates that the
-windowed multipole method should be used to evaluate temperature-dependent cross
-sections in the resolved resonance range (a :ref:`windowed multipole library
-<multipole_library>` must also be available).
+:ref:`temperature_treatment`).
 
   *Default*: "nearest"
 
+.. _temperature_multipole:
+
+``<temperature_multipole>`` Element
+-----------------------------------
+
+The ``<temperature_multipole>`` element toggles the windowed multipole
+capability on or off. If this element is set to "True" and the relevant data is
+available, OpenMC will use the windowed multipole method to evaluate and Doppler
+broaden cross sections in the resolved resonance range.  This override other
+methods like "nearest" and "interpolation" in the resolved resonance range.
+
+  *Default*: False
+
 .. _temperature_tolerance:
 
 ``<temperature_tolerance>`` Element
@@ -880,17 +890,6 @@ problem. It has the following attributes/sub-elements:
 
     *Default*: None
 
-
-``<use_windowed_multipole>`` Element
-------------------------------------
-
-The ``<use_windowed_multipole>`` element toggles the windowed multipole
-capability on or off. If this element is set to "True" and the relevant data is
-available, OpenMC will use the windowed multipole method to evaluate and Doppler
-broaden cross sections in the resolved resonance range.
-
-  *Default*: False
-
 ``<verbosity>`` Element
 -----------------------
 
@@ -903,6 +902,19 @@ displayed. This element takes the following attributes:
 
     *Default*: 5
 
+``<create_fission_neutrons>`` Element
+-------------------------------------
+
+The ``<create_fission_neutrons>`` element indicates whether fission neutrons
+should be created or not.  If this element is set to "true", fission neutrons
+will be created; otherwise the fission is treated as capture and no fission
+neutron will be created. Note that this option is only applied to fixed source
+calculation. For eigenvalue calculation, fission will always be treated as real
+fission.
+
+  *Default*: true
+
+
 ``<volume_calc>`` Element
 -------------------------
 

docs/source/usersguide/install.rst

@@ -51,7 +51,7 @@ Prerequisites
       installed on your machine. Since a number of Fortran 2003/2008 features
       are used in the code, it is recommended that you use the latest version of
       whatever compiler you choose. For gfortran_, it is necessary to use
-      version 4.6.0 or above.
+      version 4.8.0 or above.
 
       If you are using Debian or a Debian derivative such as Ubuntu, you can
       install the gfortran compiler using the following command::