crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 14:15:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

A few more fixes pointed out by @smharper

Browse source
This commit is contained in:
Paul Romano 2019-06-17 06:24:45 -05:00
parent e7f3e34088
commit a6c099e29a
3 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
openmc/lattice.py
View file

@ -1085,7 +1085,7 @@ class HexLattice(Lattice):
# Check the center ring.
if len(axial_slice[-1]) != 1:
msg = 'HexLattice ID={0:d} has the wrong number of ' \
'elements in the innermost ring.Only 1 element is ' \
'elements in the innermost ring. Only 1 element is ' \
'allowed in the innermost ring.'.format(self._id)
raise ValueError(msg)
@ -1093,7 +1093,7 @@ class HexLattice(Lattice):
for r in range(self._num_rings-1):
if len(axial_slice[r]) != 6*(self._num_rings - 1 - r):
msg = 'HexLattice ID={0:d} has the wrong number of ' \
'elements in ring number{1:d}(counting from the '\
'elements in ring number {1:d} (counting from the '\
'outermost ring). This ring should have {2:d} ' \
'elements.'.format(self._id, r,
6*(self._num_rings - 1 - r))
@ -1788,15 +1788,15 @@ class HexLattice(Lattice):
setting the :attr:`HexLattice.universes` property. For example,running
this method with num_rings=3 will return the similar diagram::
(0, 4) (0, 3) (0, 2)
(0, 5) (1, 2) (1, 1) (0, 1)
(0, 6) (1, 3) (2, 0) (1, 0) (0, 0)
(0, 8) (0, 9) (0,10)
(0, 7) (1, 4) (1, 5) (0,11)
(0, 8) (0, 9) (0,10)
(0, 6) (1, 3) (2, 0) (1, 0) (0, 0)
(0, 5) (1, 2) (1, 1) (0, 1)
(0, 4) (0, 3) (0, 2)
Parameters
----------

2
src/relaxng/geometry.rnc
View file

@ -36,7 +36,6 @@ element geometry {
attribute dimension { list { xsd:positiveInteger+ } }) &
(element lower_left { list { xsd:double+ } } | attribute lower_left { list { xsd:double+ } }) &
(element pitch { list { xsd:double+ } } | attribute pitch { list { xsd:double+ } }) &
(element orientation { ( "x" | "y" ) } | attribute orientation { ( "x" | "y" ) })? &
(element universes { list { xsd:int+ } } | attribute universes { list { xsd:int+ } }) &
(element outer { xsd:int } | attribute outer { xsd:int })?
}*
@ -49,6 +48,7 @@ element geometry {
(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 orientation { ( "x" | "y" ) } | attribute orientation { ( "x" | "y" ) })? &
(element universes { list { xsd:int+ } } | attribute universes { list { xsd:int+ } }) &
(element outer { xsd:int } | attribute outer { xsd:int })?
}*

32
src/relaxng/geometry.rng
View file

@ -294,22 +294,6 @@
</list>
</attribute>
</choice>
<optional>
<choice>
<element name="orientation">
<choice>
<value>x</value>
<value>y</value>
</choice>
</element>
<attribute name="orientation">
<choice>
<value>x</value>
<value>y</value>
</choice>
</attribute>
</choice>
</optional>
<choice>
<element name="universes">
<list>
@ -414,6 +398,22 @@
</list>
</attribute>
</choice>
<optional>
<choice>
<element name="orientation">
<choice>
<value>x</value>
<value>y</value>
</choice>
</element>
<attribute name="orientation">
<choice>
<value>x</value>
<value>y</value>
</choice>
</attribute>
</choice>
</optional>
<choice>
<element name="universes">
<list>