corrected OpenMC Lib

docs/source/requirements.txt

@@ -9,7 +9,7 @@ scipy
 python-docx
 aspose-words
 requests
-f4enix >= 0.8.1
+f4enix >= 0.12.0
 seaborn
 # DOC reqs
 sphinx

pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "python-docx",
     "aspose-words",
     "requests",
-    "f4enix >= 0.8.1",
+    "f4enix >= 0.12.0",
 #    openmc @ git+https://github.com/openmc-dev/[email protected]#egg=openmc
     "pyyaml",
     "ttkthemes",

src/jade/config/run_config.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import xml.etree.ElementTree as ET
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
 from dataclasses import dataclass
@@ -256,14 +257,16 @@ def __post_init__(self):
         # table to get the correct zaid name. This could be expensive.
         lm = LibManager(defaultlib="00c")  # Just for name conversions
         self._available_zaids = []
-        for filename in os.listdir(self.path):
-            if filename.endswith(".h5"):
-                zaid = filename.split(".")[0]
-                try:
-                    zaidnum = lm.get_zaidnum(zaid)
-                except ValueError:
-                    continue  # ignore the files that we cannot understand for the moment
-                self._available_zaids.append(zaidnum)
+        root = ET.parse(self.path).getroot()
+        for type_tag in root.findall("library"):
+            zaidname = type_tag.get("materials")
+            try:
+                zaidnum = lm.get_zaidnum(str(zaidname))
+            except ValueError:
+                continue  # ignore the files that we cannot understand for the moment
+            except KeyError:
+                continue  # ignore the files that we cannot understand for the moment
+            self._available_zaids.append(zaidnum)
 
     def get_lib_zaids(self) -> list[str]:
         return self._available_zaids

tests/config/test_run_config.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from importlib.resources import files
+from importlib.resources import as_file, files
 
 import pytest
 
@@ -19,7 +19,7 @@
 from tests.config import resources as conf_res
 
 ROOT_DEFAULT_CFG = files(res).joinpath("default_cfg")
-OPENMC_LIBS = files(conf_res).joinpath("openmclib")
+CONF_RES = files(conf_res)
 
 
 class TestEnvironmentVariables:
@@ -122,9 +122,8 @@ def test_from_yamls(self, tmpdir):
 
 class TestLibraryOpenMC:
     def test_post(self):
-        with OPENMC_LIBS as path:
-            lib = LibraryOpenMC("dummy", path)
+        with as_file(CONF_RES.joinpath("cross_sections.xml")) as file:
+            lib = LibraryOpenMC("dummy", file)
 
-        for name in lib.get_lib_zaids():
-            assert name in ["1001", "2004"]
-        assert len(lib.get_lib_zaids()) == 2
+        assert "1001" in lib.get_lib_zaids()
+        assert "1000" in lib.get_lib_zaids()