Skip to content

Replacing endf c functions with package #3101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulromano merged 2 commits into from
Aug 14, 2024
Merged

Replacing endf c functions with package #3101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41d28ff
float_endf from endf package
shimwell Jul 29, 2024
c03a236
removed reference to float endf
shimwell Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions openmc/data/_endf.pyx
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions openmc/data/endf.c
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions openmc/data/endf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@

from .data import gnds_name
from .function import Tabulated1D
try:
from ._endf import float_endf
_CYTHON = True
except ImportError:
_CYTHON = False
from endf.records import float_endf


_LIBRARY = {0: 'ENDF/B', 1: 'ENDF/A', 2: 'JEFF', 3: 'EFF',
Expand Down Expand Up @@ -91,10 +87,6 @@ def py_float_endf(s):
return float(ENDF_FLOAT_RE.sub(r'\1e\2\3', s))


if not _CYTHON:
float_endf = py_float_endf


def int_endf(s):
"""Convert string of integer number in ENDF to int.

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ dependencies = [
"lxml",
"uncertainties",
"setuptools",
"endf",
]

[project.optional-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


kwargs = {
# Cython is used to add resonance reconstruction and fast float_endf
# Cython is used to add resonance reconstruction
'ext_modules': cythonize('openmc/data/*.pyx'),
'include_dirs': [np.get_include()]
}
Expand Down