From e2a8b96cfdf0a4bb218c9a7eecc32490cb679074 Mon Sep 17 00:00:00 2001
From: Sterling Harper <smharper@mit.edu>
Date: Sat, 9 Jan 2016 23:34:28 -0500
Subject: [PATCH] Update docs for distribmat

---
 docs/source/usersguide/input.rst          |  4 +++-
 docs/source/usersguide/output/summary.rst |  8 +++++---
 src/relaxng/geometry.rnc                  |  4 ++--
 src/relaxng/geometry.rng                  | 20 ++++++++++++--------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst
index fa43ca1d2..c4538b889 100644
--- a/docs/source/usersguide/input.rst
+++ b/docs/source/usersguide/input.rst
@@ -891,7 +891,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.
 
diff --git a/docs/source/usersguide/output/summary.rst b/docs/source/usersguide/output/summary.rst
index 66a5cad15..d100fab3b 100644
--- a/docs/source/usersguide/output/summary.rst
+++ b/docs/source/usersguide/output/summary.rst
@@ -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 data is an array if the cell uses
+    distributed materials, otherwise it is a scalar.  The value '-1' signifies
+    void material.
 
 **/geometry/cells/cell <uid>/offset** (*int[]*)
 
diff --git a/src/relaxng/geometry.rnc b/src/relaxng/geometry.rnc
index 2a8d07b8c..8d25789f5 100644
--- a/src/relaxng/geometry.rnc
+++ b/src/relaxng/geometry.rnc
@@ -6,8 +6,8 @@ element geometry {
     (element universe { xsd:int } | attribute universe { xsd:int })? &
     (
       (element fill { xsd:int } | attribute fill { xsd:int }) |
-      (element material { ( xsd:int | "void" ) } |
-        attribute material { ( xsd:int | "void" ) })
+      (element material { ( xsd:int | "void" )+ } |
+        attribute material { ( xsd:int | "void" )+ })
     ) &
     (element region { xsd:string } | attribute region { xsd:string })? &
     (element rotation { list { xsd:double+ } } | attribute rotation { list { xsd:double+ } })? &
diff --git a/src/relaxng/geometry.rng b/src/relaxng/geometry.rng
index fcb310d0b..d40401b28 100644
--- a/src/relaxng/geometry.rng
+++ b/src/relaxng/geometry.rng
@@ -47,16 +47,20 @@
             </choice>
             <choice>
               <element name="material">
-                <choice>
-                  <data type="int"/>
-                  <value>void</value>
-                </choice>
+                <oneOrMore>
+                  <choice>
+                    <data type="int"/>
+                    <value>void</value>
+                  </choice>
+                </oneOrMore>
               </element>
               <attribute name="material">
-                <choice>
-                  <data type="int"/>
-                  <value>void</value>
-                </choice>
+                <oneOrMore>
+                  <choice>
+                    <data type="int"/>
+                    <value>void</value>
+                  </choice>
+                </oneOrMore>
               </attribute>
             </choice>
           </choice>