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

Sorted returned element list and updated tests

Browse source 
Returned element list is now sorted alphabetically.
Tests updated to check list elements instead of list length.

Co-Authored-By: Jonathan Shimwell <jonathan.shimwell@ukaea.uk>
This commit is contained in:
billingsley-john 2020-03-26 12:59:12 +00:00 • committed by GitHub
parent ed36017015
commit 1c3373ce61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openmc/material.py
View file

@ -732,7 +732,7 @@ class Material(IDManagerMixin):
"""
return list({re.split(r'(\d+)', i)[0] for i in self.get_nuclides()})
return sorted({re.split(r'(\d+)', i)[0] for i in self.get_nuclides()})
def get_nuclides(self):
"""Returns all nuclides in the material

12
tests/unit_tests/test_material.py
View file

@ -230,30 +230,26 @@ def test_get_elements():
# test addition of a single element
m.add_element('Li', 0.2)
assert len(m.get_elements()) == 1
assert 'Li' in m.get_elements()
# test that adding the same element
m.add_element('Li', 0.3)
assert len(m.get_elements()) == 1
assert m.get_elements() == ["Li"]
assert 'Li' in m.get_elements()
# test adding another element
m.add_element('Si', 0.3)
assert len(m.get_elements()) == 2
assert 'Si' in m.get_elements()
assert m.get_elements() == ["Li", "Si"]
# test adding a third element
m.add_element('O', 0.4)
assert len(m.get_elements()) == 3
assert m.get_elements() == ["Li", "O", "Si"]
# test removal of nuclides
m.remove_nuclide('O16')
m.remove_nuclide('O17')
assert 'O' not in m.get_elements()
assert 'Si' in m.get_elements()
assert 'Li' in m.get_elements()
assert len(m.get_elements()) == 2
assert m.get_elements() == ["Si", "Li"]
def test_get_nuclide_densities(uo2):