diff --git a/openmc/settings.py b/openmc/settings.py
index 79f3606441..c1d4adc24c 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -1264,10 +1264,6 @@ class ResonanceScattering(object):
if self.method is not None:
subelement = ET.SubElement(scatterer, 'method')
subelement.text = self.method
- subelement = ET.SubElement(scatterer, 'xs_label')
- subelement.text = self.nuclide.name
- subelement = ET.SubElement(scatterer, 'xs_label_0K')
- subelement.text = self.nuclide_0K.name
if self.E_min is not None:
subelement = ET.SubElement(scatterer, 'E_min')
subelement.text = str(self.E_min)
diff --git a/src/relaxng/materials.rnc b/src/relaxng/materials.rnc
index 1b5b7c705a..4d1b217db0 100644
--- a/src/relaxng/materials.rnc
+++ b/src/relaxng/materials.rnc
@@ -4,6 +4,8 @@ element materials {
(element name { xsd:string { maxLength="52" } } |
attribute name { xsd:string { maxLength="52" } })? &
+ element temperature { xsd:string { maxLength = "6" } }? &
+
element density {
(element value { xsd:double } | attribute value { xsd:double })? &
(element units { xsd:string { maxLength = "10" } } |
@@ -12,8 +14,6 @@ element materials {
element nuclide {
(element name { xsd:string } | attribute name { xsd:string }) &
- (element xs { xsd:string { maxLength = "5" } } |
- attribute xs { xsd:string { maxLength = "5" } })? &
(element scattering { ( "data" | "iso-in-lab" ) } |
attribute scattering { ( "data" | "iso-in-lab" ) })? &
(
@@ -24,16 +24,12 @@ element materials {
element macroscopic {
(element name { xsd:string } |
- attribute name { xsd:string }) &
- (element xs { xsd:string { maxLength = "5" } } |
- attribute xs { xsd:string { maxLength = "5" } })
+ attribute name { xsd:string })
}* &
element element {
(element name { xsd:string { maxLength = "2" } } |
attribute name { xsd:string { maxLength = "2" } }) &
- (element xs { xsd:string { maxLength = "5" } } |
- attribute xs { xsd:string { maxLength = "5" } })? &
(element scattering { ( "data" | "iso-in-lab" ) } |
attribute scattering { ( "data" | "iso-in-lab" ) })? &
(
@@ -43,11 +39,9 @@ element materials {
}* &
element sab {
- (element name { xsd:string } | attribute name { xsd:string }) &
- (element xs { xsd:string { maxLength = "5" } } |
- attribute xs { xsd:string { maxLength = "5" } })?
+ (element name { xsd:string } | attribute name { xsd:string })
}*
}+ &
- element default_xs { xsd:string { maxLength = "5" } }?
+ element default_temperature { xsd:string { maxLength = "6" } }?
}
diff --git a/src/relaxng/materials.rng b/src/relaxng/materials.rng
index e93f201655..20b7b86ecb 100644
--- a/src/relaxng/materials.rng
+++ b/src/relaxng/materials.rng
@@ -26,6 +26,13 @@
+
+
+
+ 6
+
+
+
@@ -63,20 +70,6 @@
-
-
-
-
- 5
-
-
-
-
- 5
-
-
-
-
@@ -116,28 +109,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 5
-
-
-
-
- 5
-
-
-
-
+
+
+
+
+
+
+
+
@@ -155,20 +134,6 @@
-
-
-
-
- 5
-
-
-
-
- 5
-
-
-
-
@@ -208,39 +173,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 5
-
-
-
-
- 5
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
- 5
+ 6
diff --git a/src/relaxng/settings.rnc b/src/relaxng/settings.rnc
index 742e137738..c554dfa753 100644
--- a/src/relaxng/settings.rnc
+++ b/src/relaxng/settings.rnc
@@ -170,10 +170,6 @@ element settings {
attribute nuclide { xsd:string { maxLength = "12" } }) &
(element method { xsd:string { maxLength = "16" } } |
attribute method { xsd:string { maxLength = "16" } }) &
- (element xs_label { xsd:string { maxLength = "12" } } |
- attribute xs_label { xsd:string { maxLength = "12" } }) &
- (element xs_label_0K { xsd:string { maxLength = "12" } } |
- attribute xs_label_0K { xsd:string { maxLength = "12" } }) &
(element E_min { xsd:double } |
attribute E_min { xsd:double }) &
(element E_max { xsd:double } |
diff --git a/src/relaxng/settings.rng b/src/relaxng/settings.rng
index 39bed4a62f..0719bcbc66 100644
--- a/src/relaxng/settings.rng
+++ b/src/relaxng/settings.rng
@@ -778,30 +778,6 @@
-
-
-
- 12
-
-
-
-
- 12
-
-
-
-
-
-
- 12
-
-
-
-
- 12
-
-
-