From 34f89ae7244d01e7e5b8d85285fa94ba272fe661 Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Fri, 12 Sep 2014 20:06:35 -0400 Subject: [PATCH] Updated RELAX NG schema for hex_lattice --- src/relaxng/geometry.rnc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/relaxng/geometry.rnc b/src/relaxng/geometry.rnc index b7975d05f3..c2cff7c488 100644 --- a/src/relaxng/geometry.rnc +++ b/src/relaxng/geometry.rnc @@ -23,12 +23,20 @@ element geometry { & element lattice { (element id { xsd:int } | attribute id { xsd:int }) & - (element type { ( "rectangular" | "hexagonal" ) } | - attribute type { ( "rectangular" | "hexagonal" ) })? & (element dimension { list { xsd:positiveInteger+ } } | attribute dimension { list { xsd:positiveInteger+ } }) & (element lower_left { list { xsd:double+ } } | attribute lower_left { list { xsd:double+ } }) & - (element width { list { xsd:double+ } } | attribute width { list { xsd:double+ } }) & + (element pitch { list { xsd:double+ } } | attribute pitch { list { xsd:double+ } }) & + (element universes { list { xsd:int+ } } | attribute universes { list { xsd:int+ } }) & + (element outside { xsd:int } | attribute outside { xsd:int })? + }* + + & element hex_lattice { + (element id { xsd:int } | attribute id { xsd:int }) & + (element n_rings { xsd:int } | attribute n_rings { xsd:int }) & + (element n_axial { xsd:int } | attribute n_axial { xsd:int })? & + (element center { list { xsd:double+ } } | attribute center { list { xsd:double+ } }) & + (element pitch { list { xsd:double+ } } | attribute pitch { list { xsd:double+ } }) & (element universes { list { xsd:int+ } } | attribute universes { list { xsd:int+ } }) & (element outside { xsd:int } | attribute outside { xsd:int })? }*