Merge branch 'develop' into source-improvements

This commit is contained in:
Paul Romano 2016-01-13 21:47:00 -06:00
commit d833f90720
17 changed files with 415 additions and 176 deletions

View file

@ -955,7 +955,9 @@ Each ``<cell>`` element can have the following attributes or sub-elements:
:material:
The ``id`` of the material that this cell contains. If the cell should
contain no material, this can also be set to "void".
contain no material, this can also be set to "void". A list of materials
can be specified for the "distributed material" feature. This will give each
unique instance of the cell its own material.
.. note:: If a material is specified, no fill should be given.

View file

@ -91,10 +91,12 @@ The current revision of the summary file format is 1.
Type of fill for the cell. Can be 'normal', 'universe', or 'lattice'.
**/geometry/cells/cell <uid>/material** (*int*)
**/geometry/cells/cell <uid>/material** (*int* or *int[]*)
Unique ID of the material assigned to the cell. This dataset is present only
if fill_type is set to 'normal'.
Unique ID of the material(s) assigned to the cell. This dataset is present
only if fill_type is set to 'normal'. The value '-1' signifies void
material. The data is an array if the cell uses distributed materials,
otherwise it is a scalar.
**/geometry/cells/cell <uid>/offset** (*int[]*)