Skip to content

Commit

Permalink
Merge branch 'JADE-V-V:linux' into linux
Browse files Browse the repository at this point in the history
  • Loading branch information
JezSw authored Feb 13, 2024
2 parents 526c32a + c8a20ba commit 968e031
Show file tree
Hide file tree
Showing 28 changed files with 1,727 additions and 2,335 deletions.
2 changes: 2 additions & 0 deletions docs/source/usage/benchmarks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ benchmark in JADE.
expect a single library (e.g. ``31c``), activation ones require
two: an activation library and a transport one for all zaids that
cannot be activated (e.g. ``99c-31c``).
* The irradiation and activation files if present for a SDDR benchmark should be
placed in the same folder as the input file.
* In activation benchmarks, the library that is considered the assessed one
is always the activation library (i.e. the first provided). No track
is kept during the post-processing of which was the transport library used
Expand Down
11 changes: 8 additions & 3 deletions jade/computational.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,14 @@ def executeBenchmarksRoutines(session, lib: str, runoption, exp=False) -> None:
bool(row["d1S"]),
])
):
print("Transport code was not specified or is not available for input generation, defaulting to MCNP")
print("")
row["MCNP"]=True
if (
testname in ["SphereSDDR", "FNG", "ITER_Cyl_SDDR"]
):
row["d1S"] = True
else:
print("Transport code was not specified or is not available for input generation, defaulting to MCNP")
print("")
row["MCNP"] = True

print(" -- " + testname.upper() + " STARTED --\n")
print(" Generating input files:" + " " + str(datetime.datetime.now()))
Expand Down
2 changes: 1 addition & 1 deletion jade/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def _process_path(self, file_path: str) -> str:
if not os.path.exists(file_path):
# If to terminate or not the session is lef to the user
# other codes path may be present but not used
logging.warning("Path {file_path} do not exist")
logging.warning(f"Path {file_path} do not exist")
# fatal_exception(file_path + ' does not exist')

return file_path
Expand Down
Binary file modified jade/default_settings/Config.xlsx
Binary file not shown.
Loading

0 comments on commit 968e031

Please sign in to comment.