Skip to content

Commit

Permalink
fix natural zaid test according to new behaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
@dodu94
dodu94 committed Mar 15, 2024
1 parent 6c66738 commit d1b20e1
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 58 deletions.
3 changes: 2 additions & 1 deletion tests/libmanager_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,11 @@ def test_get_zaidname(self, lm):
assert name == "hydrogen"
assert formula == "H-1"

# Behaviour has been modified
zaid = "1000"
name, formula = lm.get_zaidname(zaid)
assert name == "hydrogen"
assert formula == "H-0"
assert formula == "H"

def test_get_zaidnum(self, lm):
zaid = "92235"
Expand Down
122 changes: 65 additions & 57 deletions tests/matreader_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
You should have received a copy of the GNU General Public License
along with JADE. If not, see <http://www.gnu.org/licenses/>.
"""

from __future__ import annotations
import sys
import os

Expand All @@ -33,44 +33,48 @@
root = os.path.dirname(cp)
sys.path.insert(1, root)

from jade.matreader import (Element, Zaid, MatCardsList)
from jade.matreader import Element, Zaid, MatCardsList, Material
from jade.libmanager import LibManager
import pytest
import pandas as pd

# Files
INP = os.path.join(cp, 'TestFiles', 'matreader', 'mat_test.i')
INP2 = os.path.join(cp, 'TestFiles', 'matreader', 'mat_test2.i')
ACTIVATION_INP = os.path.join(cp, 'TestFiles', 'matreader', 'activation.i')
XSDIR = os.path.join(cp, 'TestFiles', 'matreader', 'xsdir_mcnp6.2')
INP = os.path.join(cp, "TestFiles", "matreader", "mat_test.i")
INP2 = os.path.join(cp, "TestFiles", "matreader", "mat_test2.i")
ACTIVATION_INP = os.path.join(cp, "TestFiles", "matreader", "activation.i")
XSDIR = os.path.join(cp, "TestFiles", "matreader", "xsdir_mcnp6.2")
# Other
ISOTOPES_FILE = os.path.join(root, 'jade', 'resources', 'Isotopes.txt')
ACTIVATION_FILE = os.path.join(cp, 'TestFiles', 'libmanager',
'Activation libs.xlsx')
ISOTOPES_FILE = os.path.join(root, "jade", "resources", "Isotopes.txt")
ACTIVATION_FILE = os.path.join(cp, "TestFiles", "libmanager", "Activation libs.xlsx")
# XSDIR_FILE = os.path.join(cp, 'TestFiles', 'libmanager', 'xsdir')


@pytest.fixture
def LIBMAN():
df_rows = [
['99c', 'sda', '', XSDIR],
['98c', 'acsdc', '', XSDIR],
['21c', 'adsadsa', '', XSDIR],
['31c', 'adsadas', '', XSDIR],
['00c', 'sdas', '', XSDIR],
['71c', 'sdasxcx', '', XSDIR],
['81c', 'sdasxcx', 'yes', XSDIR]]
["99c", "sda", "", XSDIR],
["98c", "acsdc", "", XSDIR],
["21c", "adsadsa", "", XSDIR],
["31c", "adsadas", "", XSDIR],
["00c", "sdas", "", XSDIR],
["71c", "sdasxcx", "", XSDIR],
["81c", "sdasxcx", "yes", XSDIR],
]
df_lib = pd.DataFrame(df_rows)
df_lib.columns = ['Suffix', 'Name', 'Default', 'MCNP']
df_lib.columns = ["Suffix", "Name", "Default", "MCNP"]

return LibManager(df_lib, activationfile=ACTIVATION_FILE,
isotopes_file=ISOTOPES_FILE)
return LibManager(
df_lib, activationfile=ACTIVATION_FILE, isotopes_file=ISOTOPES_FILE
)


class TestZaid:

tests = [{'str': '1001.31c -2.3', 'res': [-2.3, '1', '001', '31c']},
{'str': '1001.31c\t-2.3', 'res': [-2.3, '1', '001', '31c']},
{'str': '15205 1', 'res': [1, '15', '205', None]}]
tests = [
{"str": "1001.31c -2.3", "res": [-2.3, "1", "001", "31c"]},
{"str": "1001.31c\t-2.3", "res": [-2.3, "1", "001", "31c"]},
{"str": "15205 1", "res": [1, "15", "205", None]},
]

def test_fromstring(self):
"""
Expand All @@ -83,17 +87,17 @@ def test_fromstring(self):
"""

for test in self.tests:
text = test['str']
text = test["str"]
zaid = Zaid.from_string(text)
res = test['res']
res = test["res"]
assert zaid.fraction == res[0]
assert zaid.element == res[1]
assert zaid.isotope == res[2]
assert zaid.library == res[3]


class TestElement:
zaid_strings = ['1001.31c -1', '1002.31c -3']
zaid_strings = ["1001.31c -1", "1002.31c -3"]

def _buildElem(self):
zaids = []
Expand All @@ -111,15 +115,14 @@ def test_update_zaidinfo(self, LIBMAN):
elem = self._buildElem()

# Check for the correct element
elem.Z = '1'
elem.Z = "1"

# Check the correct update of infos in element
elem.update_zaidinfo(LIBMAN)
res = [{'fullname': 'H-1', 'ab': 25},
{'fullname': 'H-2', 'ab': 75}]
res = [{"fullname": "H-1", "ab": 25}, {"fullname": "H-2", "ab": 75}]
for zaid, checks in zip(elem.zaids, res):
assert int(zaid.ab) == checks['ab']
assert zaid.fullname == checks['fullname']
assert int(zaid.ab) == checks["ab"]
assert zaid.fullname == checks["fullname"]

def test_get_fraction(self):
"""
Expand All @@ -131,6 +134,12 @@ def test_get_fraction(self):


class Testmaterial:

def test_natural_expansion(self, LIBMAN: LibManager):
material = Material.from_text(["C Header", "M1 1000.31c -2.3"])
material.translate("31c", LIBMAN)
assert len(material.submaterials[0].zaidList) == 2

def test_switch_fraction(self, LIBMAN):
# Read a material
matcard = MatCardsList.from_input(INP)
Expand All @@ -141,41 +150,41 @@ def test_switch_fraction(self, LIBMAN):

# -- Switch back and forth --
# this first one should do nothing
material.switch_fraction('atom', LIBMAN)
material.switch_fraction("atom", LIBMAN)
unchanged = material.to_text()
assert original == unchanged
# switch to mass
material.switch_fraction('mass', LIBMAN)
material.switch_fraction("mass", LIBMAN)
mass = material.to_text()
# change again, should do nothing
material.switch_fraction('mass', LIBMAN)
material.switch_fraction("mass", LIBMAN)
unchanged = material.to_text()
assert unchanged == mass
# go back to atom
material.switch_fraction('atom', LIBMAN)
material.switch_fraction("atom", LIBMAN)
atom = material.to_text()
# at last check that the inplace oprion works
material.switch_fraction('mass', LIBMAN, inplace=False)
material.switch_fraction("mass", LIBMAN, inplace=False)
inplace = material.to_text()
assert inplace == atom
# go back to mass
material.switch_fraction('mass', LIBMAN)
material.switch_fraction("mass", LIBMAN)
massnorm = material.to_text()
assert massnorm == mass

def test_switch_pnnl(self, LIBMAN):
# --- Test the PNNL with Bismuth Germanate (BGO) ---
# read the material cards
inp = os.path.join(cp, 'TestFiles', 'matreader', 'BGO_mass.i')
inp = os.path.join(cp, "TestFiles", "matreader", "BGO_mass.i")
matcard = MatCardsList.from_input(inp)
mass_material = matcard[0]

inp = os.path.join(cp, 'TestFiles', 'matreader', 'BGO_atom.i')
inp = os.path.join(cp, "TestFiles", "matreader", "BGO_atom.i")
matcard = MatCardsList.from_input(inp)
atom_material = matcard[0]

# Switch the mass fraction to atomic fraction
mass_material.switch_fraction('atom', LIBMAN)
mass_material.switch_fraction("atom", LIBMAN)
print(mass_material.to_text())

tolerance = 1e-5 # tolerance for the difference with respect to pnnl
Expand Down Expand Up @@ -214,7 +223,7 @@ def test_headers(self):
"""
matcard = MatCardsList.from_input(INP)

headers = {'m1': 'C Header M1\n', 'm2': 'C Header M2\n', 'm102': ''}
headers = {"m1": "C Header M1\n", "m2": "C Header M2\n", "m102": ""}
for key, header in headers.items():
assert matcard[key].header == header

Expand All @@ -229,9 +238,11 @@ def test_subheaders(self):
"""
matcard = MatCardsList.from_input(INP)

headers = {'m1': ['C M1-submat1', 'C M1-Submat 2'],
'm2': ['', 'C M2-submat1\nC second line'],
'm102': ['']}
headers = {
"m1": ["C M1-submat1", "C M1-Submat 2"],
"m2": ["", "C M2-submat1\nC second line"],
"m102": [""],
}

for key, subheaders in headers.items():
for i, submat in enumerate(matcard[key].submaterials):
Expand All @@ -248,9 +259,7 @@ def test_zaidnumbers(self):
"""
matcard = MatCardsList.from_input(INP)

zaids = {'m1': [2, 1],
'm2': [1, 1],
'm102': [5]}
zaids = {"m1": [2, 1], "m2": [1, 1], "m102": [5]}

for key, zaids in zaids.items():
for i, submat in enumerate(matcard[key].submaterials):
Expand All @@ -261,26 +270,25 @@ def test_translation(self, LIBMAN):
Test that translation works (all possile modes)
"""
# Dic mode 1
newlib = {'21c': '31c', '99c': '81c'}
newlib = {"21c": "31c", "99c": "81c"}
matcard = MatCardsList.from_input(ACTIVATION_INP)
matcard.translate(newlib, LIBMAN)
translation = matcard.to_text()
assert translation.count('31c') == 3
assert translation.count('81c') == 3
assert translation.count("31c") == 3
assert translation.count("81c") == 3

# dic mode 2 - test 1
matcard = MatCardsList.from_input(ACTIVATION_INP)
newlib = {'99c': ['1001'], '21c': ['28061', '28062', '28064', '29063',
'5010']}
newlib = {"99c": ["1001"], "21c": ["28061", "28062", "28064", "29063", "5010"]}
matcard.translate(newlib, LIBMAN)
translation = matcard.to_text()
assert translation.count('99c') == 0
assert translation.count('21c') == 5
assert translation.count('81c') == 1
assert translation.count("99c") == 0
assert translation.count("21c") == 5
assert translation.count("81c") == 1

# dic mode 2 - test 2
matcard = MatCardsList.from_input(ACTIVATION_INP)
newlib = {'99c': ['1001'], '21c': ['28061', '28062', '28064', '29063']}
newlib = {"99c": ["1001"], "21c": ["28061", "28062", "28064", "29063"]}
try:
matcard.translate(newlib, LIBMAN)
assert False
Expand All @@ -289,9 +297,9 @@ def test_translation(self, LIBMAN):

# classic mode
matcard = MatCardsList.from_input(INP2)
matcard.translate('21c', LIBMAN)
matcard.translate("21c", LIBMAN)
translation = matcard.to_text()
assert translation.count('21c') == 10
assert translation.count("21c") == 10

def test_get_info(self, LIBMAN):
"""
Expand Down

0 comments on commit d1b20e1

Please sign in to comment.