From 7ba35310c8da200d896d418933d30237b3c1d414 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Thu, 29 Jun 2017 15:49:18 -0400 Subject: [PATCH] Update docs, RelaxNG for partial S(a,b) --- docs/source/io_formats/materials.rst | 6 +++++- src/relaxng/materials.rnc | 3 ++- src/relaxng/materials.rng | 28 ++++++++++++++++++++-------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/docs/source/io_formats/materials.rst b/docs/source/io_formats/materials.rst index fc57280f8b..286342a2b1 100644 --- a/docs/source/io_formats/materials.rst +++ b/docs/source/io_formats/materials.rst @@ -107,9 +107,13 @@ Each ``material`` element can have the following attributes or sub-elements: multi-group :ref:`energy_mode`. :sab: - Associates an S(a,b) table with the material. This element has one + Associates an S(a,b) table with the material. This element has an attribute/sub-element called ``name``. The ``name`` attribute is the name of the S(a,b) table that should be associated with the material. + There is also an optional ``fraction`` element which indicates what fraction + of the relevant nuclides will be affected by the S(a,b) table (e.g. which + fraction of a material is crystaline versus amorphus). ``fraction`` + defaults to unity. *Default*: None diff --git a/src/relaxng/materials.rnc b/src/relaxng/materials.rnc index 4ad3ea0f01..d55656536b 100644 --- a/src/relaxng/materials.rnc +++ b/src/relaxng/materials.rnc @@ -28,7 +28,8 @@ element materials { }* & element sab { - (element name { xsd:string } | attribute name { xsd:string }) + (element name { xsd:string } | attribute name { xsd:string }) & + (element fraction { xsd:double } | attribute fraction { xsd:double })? }* }+ & diff --git a/src/relaxng/materials.rng b/src/relaxng/materials.rng index 0303d361ee..0fa81c11b2 100644 --- a/src/relaxng/materials.rng +++ b/src/relaxng/materials.rng @@ -119,14 +119,26 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + +