crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-26 21:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1588 from paulromano/py38-attribute-order

Browse source 
Fix failing tests for Python 3.8
This commit is contained in:
Patrick Shriwise 2020-06-19 08:08:42 -05:00 • committed by GitHub
commit a4fcf9a210
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
openmc/_xml.py
View file

@ -43,3 +43,21 @@ def get_text(elem, name, default=None):
else:
child = elem.find(name)
return child.text if child is not None else default
def reorder_attributes(root):
"""Sort attributes in XML to preserve pre-Python 3.8 behavior
Parameters
----------
root : xml.etree.ElementTree.Element
Root element
"""
for el in root.iter():
attrib = el.attrib
if len(attrib) > 1:
# adjust attribute order, e.g. by sorting
attribs = sorted(attrib.items())
attrib.clear()
attrib.update(attribs)

3
openmc/data/library.py
View file

@ -5,7 +5,7 @@ import pathlib
import h5py
from openmc.mixin import EqualityMixin
from openmc._xml import clean_indentation
from openmc._xml import clean_indentation, reorder_attributes
class DataLibrary(EqualityMixin):
@ -112,6 +112,7 @@ class DataLibrary(EqualityMixin):
clean_indentation(root)
# Write XML file
reorder_attributes(root) # TODO: Remove when support is Python 3.8+
tree = ET.ElementTree(root)
tree.write(str(path), xml_declaration=True, encoding='utf-8',
method='xml')

1
openmc/geometry.py
View file

@ -110,6 +110,7 @@ class Geometry:
p /= 'geometry.xml'
# Write the XML Tree to the geometry.xml file
xml.reorder_attributes(root_element) # TODO: Remove when support is Python 3.8+
tree = ET.ElementTree(root_element)
tree.write(str(p), xml_declaration=True, encoding='utf-8')

4
openmc/material.py
View file

@ -12,7 +12,7 @@ import numpy as np
import openmc
import openmc.data
import openmc.checkvalue as cv
from ._xml import clean_indentation
from ._xml import clean_indentation, reorder_attributes
from .mixin import IDManagerMixin
@ -1239,6 +1239,7 @@ class Materials(cv.CheckedList):
clean_indentation(element, level=1)
element.tail = element.tail.strip(' ')
fh.write(' ')
reorder_attributes(element) # TODO: Remove when support is Python 3.8+
ET.ElementTree(element).write(fh, encoding='unicode')
# Write the <material> elements.
@ -1247,6 +1248,7 @@ class Materials(cv.CheckedList):
clean_indentation(element, level=1)
element.tail = element.tail.strip(' ')
fh.write(' ')
reorder_attributes(element) # TODO: Remove when support is Python 3.8+
ET.ElementTree(element).write(fh, encoding='unicode')
# Write the closing tag for the root element.

20
openmc/mesh.py
View file

@ -361,14 +361,14 @@ class RegularMesh(MeshBase):
n_dim = len(self.dimension)
# Build the cell which will contain the lattice
xplanes = [openmc.XPlane(self.lower_left[0], bc[0]),
openmc.XPlane(self.upper_right[0], bc[1])]
xplanes = [openmc.XPlane(self.lower_left[0], boundary_type=bc[0]),
openmc.XPlane(self.upper_right[0], boundary_type=bc[1])]
if n_dim == 1:
yplanes = [openmc.YPlane(-1e10, 'reflective'),
openmc.YPlane(1e10, 'reflective')]
yplanes = [openmc.YPlane(-1e10, boundary_type='reflective'),
openmc.YPlane(1e10, boundary_type='reflective')]
else:
yplanes = [openmc.YPlane(self.lower_left[1], bc[2]),
openmc.YPlane(self.upper_right[1], bc[3])]
yplanes = [openmc.YPlane(self.lower_left[1], boundary_type=bc[2]),
openmc.YPlane(self.upper_right[1], boundary_type=bc[3])]
if n_dim <= 2:
# Would prefer to have the z ranges be the max supported float, but
@ -378,11 +378,11 @@ class RegularMesh(MeshBase):
# inconsistency between what numpy uses as the max float and what
# Fortran expects for a real(8), so this avoids code complication
# and achieves the same goal.
zplanes = [openmc.ZPlane(-1e10, 'reflective'),
openmc.ZPlane(1e10, 'reflective')]
zplanes = [openmc.ZPlane(-1e10, boundary_type='reflective'),
openmc.ZPlane(1e10, boundary_type='reflective')]
else:
zplanes = [openmc.ZPlane(self.lower_left[2], bc[4]),
openmc.ZPlane(self.upper_right[2], bc[5])]
zplanes = [openmc.ZPlane(self.lower_left[2], boundary_type=bc[4]),
openmc.ZPlane(self.upper_right[2], boundary_type=bc[5])]
root_cell = openmc.Cell()
root_cell.region = ((+xplanes[0] & -xplanes[1]) &
(+yplanes[0] & -yplanes[1]) &

3
openmc/plots.py
View file

@ -8,7 +8,7 @@ import numpy as np
import openmc
import openmc.checkvalue as cv
from ._xml import clean_indentation
from ._xml import clean_indentation, reorder_attributes
from .mixin import IDManagerMixin
@ -844,5 +844,6 @@ class Plots(cv.CheckedList):
p /= 'plots.xml'
# Write the XML Tree to the plots.xml file
reorder_attributes(self._plots_file) # TODO: Remove when support is Python 3.8+
tree = ET.ElementTree(self._plots_file)
tree.write(str(p), xml_declaration=True, encoding='utf-8')

3
openmc/settings.py
View file

@ -6,7 +6,7 @@ from xml.etree import ElementTree as ET
import openmc.checkvalue as cv
from . import VolumeCalculation, Source, RegularMesh
from ._xml import clean_indentation, get_text
from ._xml import clean_indentation, get_text, reorder_attributes
class RunMode(Enum):
@ -1375,6 +1375,7 @@ class Settings:
p /= 'settings.xml'
# Write the XML Tree to the settings.xml file
reorder_attributes(root_element) # TODO: Remove when support is Python 3.8+
tree = ET.ElementTree(root_element)
tree.write(str(p), xml_declaration=True, encoding='utf-8')

3
openmc/tallies.py
View file

@ -14,7 +14,7 @@ import scipy.sparse as sps
import openmc
import openmc.checkvalue as cv
from ._xml import clean_indentation
from ._xml import clean_indentation, reorder_attributes
from .mixin import IDManagerMixin
@ -3143,5 +3143,6 @@ class Tallies(cv.CheckedList):
p /= 'tallies.xml'
# Write the XML Tree to the tallies.xml file
reorder_attributes(root_element) # TODO: Remove when support is Python 3.8+
tree = ET.ElementTree(root_element)
tree.write(str(p), xml_declaration=True, encoding='utf-8')

4
tests/regression_tests/photon_production/test.py
View file

@ -13,9 +13,9 @@ def model():
model.materials.append(mat)
cyl = openmc.XCylinder(r=1.0, boundary_type='vacuum')
x_plane_left = openmc.XPlane(-1.0, 'vacuum')
x_plane_left = openmc.XPlane(-1.0, boundary_type='vacuum')
x_plane_center = openmc.XPlane(1.0)
x_plane_right = openmc.XPlane(1.0e9, 'vacuum')
x_plane_right = openmc.XPlane(1.0e9, boundary_type='vacuum')
inner_cyl_left = openmc.Cell()
inner_cyl_right = openmc.Cell()

2
tests/regression_tests/resonance_scattering/test.py
View file

@ -17,7 +17,7 @@ class ResonanceScatteringTestHarness(PyAPITestHarness):
mats_file.export_to_xml()
# Geometry
dumb_surface = openmc.XPlane(100, 'reflective')
dumb_surface = openmc.XPlane(100, boundary_type='reflective')
c1 = openmc.Cell(cell_id=1, fill=mat, region=-dumb_surface)
root_univ = openmc.Universe(universe_id=0, cells=[c1])
geometry = openmc.Geometry(root_univ)