Merge branch 'develop' into cmfd_clean

Conflicts:
	src/cmfd_data.F90
	tests/run_tests.py
	tests/test_compile/test_compile.py
This commit is contained in:
Paul Romano 2013-09-21 16:20:12 -04:00
commit 60168dffc7
26 changed files with 545 additions and 238 deletions

View file

@ -381,6 +381,14 @@ survival biasing, otherwise known as implicit capture or absorption.
.. _trace:
``<threads>`` Element
---------------------
The ``<threads>`` element indicates the number of OpenMP threads to be used for
a simulation. It has no attributes and accepts a positive integer value.
*Default*: None (Determined by environment variable :envvar:`OMP_NUM_THREADS`)
``<trace>`` Element
-------------------