diff --git a/src/relaxng/materials.rnc b/src/relaxng/materials.rnc
index da68ebf9ea..aec3fbcbc2 100644
--- a/src/relaxng/materials.rnc
+++ b/src/relaxng/materials.rnc
@@ -11,7 +11,7 @@ element materials {
} &
element nuclide {
- (element name { xsd:string { maxLength = "7" } } |
+ (element name { xsd:string { maxLength = "7" } } |
attribute name { xsd:string { maxLength = "7" } }) &
(element xs { xsd:string { maxLength = "3" } } |
attribute xs { xsd:string { maxLength = "3" } })? &
@@ -23,8 +23,15 @@ element materials {
)
}* &
+ element macroscopic {
+ (element name { xsd:string { maxLength = "7" } } |
+ attribute name { xsd:string { maxLength = "7" } }) &
+ (element xs { xsd:string { maxLength = "3" } } |
+ attribute xs { xsd:string { maxLength = "3" } })
+ }* &
+
element element {
- (element name { xsd:string { maxLength = "2" } } |
+ (element name { xsd:string { maxLength = "2" } } |
attribute name { xsd:string { maxLength = "2" } }) &
(element xs { xsd:string { maxLength = "3" } } |
attribute xs { xsd:string { maxLength = "3" } })? &
@@ -37,7 +44,7 @@ element materials {
}* &
element sab {
- (element name { xsd:string { maxLength = "7" } } |
+ (element name { xsd:string { maxLength = "7" } } |
attribute name { xsd:string { maxLength = "7" } }) &
(element xs { xsd:string { maxLength = "3" } } |
attribute xs { xsd:string { maxLength = "3" } })?
diff --git a/src/relaxng/materials.rng b/src/relaxng/materials.rng
index 7aba5f7382..6a4bc39645 100644
--- a/src/relaxng/materials.rng
+++ b/src/relaxng/materials.rng
@@ -118,6 +118,36 @@
+
+
+
+
+
+
+ 7
+
+
+
+
+ 7
+
+
+
+
+
+
+ 3
+
+
+
+
+ 3
+
+
+
+
+
+
diff --git a/src/relaxng/settings.rnc b/src/relaxng/settings.rnc
index a95b1f297e..1ac5b58528 100644
--- a/src/relaxng/settings.rnc
+++ b/src/relaxng/settings.rnc
@@ -34,6 +34,8 @@ element settings {
element energy_grid { ( "nuclide" | "log" | "logarithm" | "logarithmic" | "material-union" | "union" ) }? &
+ element energy_mode { ( "continuous-energy" | "ce" | "CE" | "multi-group" | "mg" | "MG" ) }? &
+
element entropy {
(element dimension { list { xsd:int+ } } |
attribute dimension { list { xsd:int+ } })? &
@@ -45,6 +47,8 @@ element settings {
element log_grid_bins { xsd:positiveInteger }? &
+ element max_order { xsd:nonNegativeInteger }? &
+
element natural_elements { xsd:string { maxLength = "20" } }? &
element no_reduce { xsd:boolean }? &
diff --git a/src/relaxng/settings.rng b/src/relaxng/settings.rng
index 8dd1a6febc..b24130b8a4 100644
--- a/src/relaxng/settings.rng
+++ b/src/relaxng/settings.rng
@@ -133,6 +133,18 @@
+
+
+
+ continuous-energy
+ ce
+ CE
+ multi-group
+ mg
+ MG
+
+
+
@@ -194,6 +206,11 @@
+
+
+
+
+
diff --git a/src/relaxng/tallies.rnc b/src/relaxng/tallies.rnc
index 75afb0f231..9efb6c4e2b 100644
--- a/src/relaxng/tallies.rnc
+++ b/src/relaxng/tallies.rnc
@@ -27,7 +27,7 @@ element tallies {
"polar" | "azimuthal" | "delayedgroup") } |
attribute type { ( "cell" | "cellborn" | "material" | "universe" |
"surface" | "distribcell" | "mesh" | "energy" | "energyout" | "mu" |
- "polar" | "azimuthal" | "delayedgroup") }) &
+ "polar" | "azimuthal" | "delayedgroup") })? &
(element bins { list { xsd:double+ } } |
attribute bins { list { xsd:double+ } })
}* &
diff --git a/src/relaxng/tallies.rng b/src/relaxng/tallies.rng
index d35c170042..8798efca33 100644
--- a/src/relaxng/tallies.rng
+++ b/src/relaxng/tallies.rng
@@ -133,42 +133,44 @@
-
-
-
- cell
- cellborn
- material
- universe
- surface
- distribcell
- mesh
- energy
- energyout
- delayedgroup
- mu
- polar
- azimuthal
-
-
-
-
- cell
- cellborn
- material
- universe
- surface
- distribcell
- mesh
- energy
- energyout
- delayedgroup
- mu
- polar
- azimuthal
-
-
-
+
+
+
+
+ cell
+ cellborn
+ material
+ universe
+ surface
+ distribcell
+ mesh
+ energy
+ energyout
+ mu
+ polar
+ azimuthal
+ delayedgroup
+
+
+
+
+ cell
+ cellborn
+ material
+ universe
+ surface
+ distribcell
+ mesh
+ energy
+ energyout
+ mu
+ polar
+ azimuthal
+ delayedgroup
+
+
+
+