Skip to content
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.

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

fix issue #298 #299

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion jade/atlas.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import logging

# import win32com.client
import aspose.words
# import aspose.words
import docx
import pandas as pd
from docx.enum.table import WD_ALIGN_VERTICAL
Expand Down
4 changes: 3 additions & 1 deletion jade/computational.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import jade.testrun as testrun


def executeBenchmarksRoutines(session, lib: str, runoption, exp=False) -> None:
def executeBenchmarksRoutines(session, lib: str, runoption: str, exp=False) -> None:
"""
Check which benchmarks have to be generated and/or run and execute their
routines
Expand All @@ -42,6 +42,8 @@ def executeBenchmarksRoutines(session, lib: str, runoption, exp=False) -> None:
library to assess (e.g. 31c)
or couple activation+transport (e.g. 99c-31c).
Double quotes are needed.
runoption : str
if 'c' the code is run in console mode, if 's' is submitted as batch.
exp : bool
if True the experimental Benchmarks are selected. The default is False

Expand Down
15 changes: 12 additions & 3 deletions jade/libmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ def __init__(
self.isotopes = self.isotope_parser.isotopes

# Convert all columns to lower case
# create a copy here or it will modify the configuration file one
lib_df = lib_df.copy()
new_columns = []
for column in lib_df:
new_columns.append(column.lower())
Expand All @@ -135,6 +137,7 @@ def __init__(

self.data = {}
self.codes = []

lib_df.set_index("suffix", inplace=True)
# Initilize the Xsdir object
# self.XS = xs.Xsdir(xsdir_file)
Expand Down Expand Up @@ -173,7 +176,9 @@ def __init__(
self.data[code][library] = xsdir
else:
logging.warning(
"Library %s not present in MCNP XSDIR file: %s", library, path
"Library %s not present in MCNP XSDIR file: %s",
library,
path,
)

elif code == "openmc":
Expand All @@ -186,7 +191,9 @@ def __init__(
self.data[code][library] = xsdir
else:
logging.warning(
"Library %s not present in Serpent XSDIR file: %s", library, path
"Library %s not present in Serpent XSDIR file: %s",
library,
path,
)

elif code == "d1s":
Expand All @@ -197,7 +204,9 @@ def __init__(
self.data[code][library] = xsdir
else:
logging.warning(
"Library %s not present in D1S XSDIR file: %s", library, path
"Library %s not present in D1S XSDIR file: %s",
library,
path,
)

else:
Expand Down
Binary file added tests/TestFiles/computational/config.xlsx
Binary file not shown.
Loading