Merge branch 'develop' into xml

Conflicts:
	src/DEPENDENCIES
	src/input_xml.F90
	src/templates/settings_t.xml
This commit is contained in:
Paul Romano 2013-11-08 22:23:36 +01:00
commit b56fa43088
21 changed files with 794 additions and 1 deletions

View file

@ -405,6 +405,15 @@ integers: the batch number, generation number, and particle number.
*Default*: None
.. _track:
``<track>`` Element
-------------------
The ``<track>`` element specifies particles for which OpenMC will output binary files describing particle position at every step of its transport. This element should be followed by triplets of integers. Each triplet describes one particle. The integers in each triplet specify the batch number, generation number, and particle number, respectively.
*Default*: None
``<uniform_fs>`` Element
------------------------