diff --git a/docs/source/io_formats/tallies.rst b/docs/source/io_formats/tallies.rst index 7f95f2985..50ba7b3d5 100644 --- a/docs/source/io_formats/tallies.rst +++ b/docs/source/io_formats/tallies.rst @@ -312,8 +312,8 @@ element with the tag name ````. This element has the following attributes/sub-elements: :type: - The type of mesh. This can be either "regular", "rectilinear", or - "unstructured". + The type of mesh. This can be either "regular", "rectilinear", + "cylindrical", "spherical", or "unstructured". :dimension: The number of mesh cells in each direction. (For regular mesh only.) @@ -340,7 +340,16 @@ attributes/sub-elements: The mesh divisions along the y-axis. (For rectilinear mesh only.) :z_grid: - The mesh divisions along the z-axis. (For rectilinear mesh only.) + The mesh divisions along the z-axis. (For rectilinear and cylindrical meshes only.) + + :r_grid: + The mesh divisions along the r-axis. (For cylindrical and spherical meshes only.) + + :p_grid: + The mesh divisions along the phi-axis. (For cylindrical and spherical meshes only.) + + :t_grid: + The mesh divisions along the theta-axis. (For spherical mesh only.) :library: The mesh library used to represent an unstructured mesh. This can be either diff --git a/src/relaxng/tallies.rnc b/src/relaxng/tallies.rnc index 3d504a66c..583b274c6 100644 --- a/src/relaxng/tallies.rnc +++ b/src/relaxng/tallies.rnc @@ -24,6 +24,24 @@ element tallies { attribute y_grid { list { xsd:double+ } }) & (element z_grid { list { xsd:double+ } } | attribute z_grid { list { xsd:double+ } }) + ) | ( + (element type { ( "cylindrical" ) } | + attribute type { ( "cylindrical" ) }) & + (element r_grid { list { xsd:double+ } } | + attribute r_grid { list { xsd:double+ } }) & + (element p_grid { list { xsd:double+ } } | + attribute p_grid { list { xsd:double+ } }) & + (element z_grid { list { xsd:double+ } } | + attribute z_grid { list { xsd:double+ } }) + ) | ( + (element type { ( "spherical" ) } | + attribute type { ( "spherical" ) }) & + (element r_grid { list { xsd:double+ } } | + attribute r_grid { list { xsd:double+ } }) & + (element t_grid { list { xsd:double+ } } | + attribute p_grid { list { xsd:double+ } }) & + (element p_grid { list { xsd:double+ } } | + attribute z_grid { list { xsd:double+ } }) ) ) }* &