Skip to content

Commit

Permalink
Merge pull request #300 from JADE-V-V/mctalreader_removal
Browse files Browse the repository at this point in the history
Introduction of F4Enix dependency for MCNP input and output parsing
  • Loading branch information
alexvalentine94 authored Aug 9, 2024
2 parents eeacb1b + 7e77b82 commit 63b6250
Show file tree
Hide file tree
Showing 53 changed files with 27,696 additions and 7,985 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ venv/*
.vscode/*.json

# secret file for local testing
tests/secrets.json
tests/secrets.json
24 changes: 12 additions & 12 deletions docs/source/api/general.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,23 @@ General OOP scheme
General OOP scheme for the JADE code

All user interactions that happen through the command console are handled
by the ``gui.py module``. When JADE is started, a :ref:`sessionob` object
by the ``gui.py module``. When JADE is started, a Session object
is intialized which is a container for a series of information and tools
that many parts of the code may need to access. In particular it contains:

Paths
through :ref:`sessionob` it is possible to recover many paths to the
through Session it is possible to recover many paths to the
different folders that constitutes the JADE tree (see also :ref:`folders`).
Status
the :ref:`statusob` object has informations on which libraries have
the Status object has information on which libraries have
been assessed or post-processed.
Configuration
the :ref:`confob` object is the one that handles the
the Configuration object is the one that handles the
parsing of the :ref:`mainconfig` file.
Library Manager
the :ref:`libmanagerob` is responsible for all operations related
to nuclear data libraries. These include for instance checking the
the libmanager is responsible for all operations related
to nuclear data libraries. It is now included in f4enix here: `f4enix documentation <https://f4enix.readthedocs.io/en/latest/_autosummary/f4enix.input.libmanager.html#module-f4enix.input.libmanager>`_
These include for instance checking the
availability of a library, or handling the translation of a single isotope.

Generally speaking, the user can request three types of thing to the gui:
Expand All @@ -46,20 +47,19 @@ Benchmarks generation and run
=============================
Operations for the benchmarks generation and run are handled by the ``computational.py``
module.
In JADE the object representing a benchmark is the :ref:`testob` (or :ref:`multitestob`
In JADE the object representing a benchmark is the Test object (or MultipleTest object
in case the benchmark is composed by more than one run). This object is responsible
for the creation of the MCNP input and for its run. A vital attribute of the benchmark
is its associated :ref:`inputob` or one of its children. In case the benchmark is run
with d1s code, an :ref:`irradfileob` and a :ref:`reacfileob` are also associated with the
test. A fundamental attribute of inputs is the :ref:`matcardob` which handles all operations
related to the materials (including library translations).
is its associated Input object (`Input object <https://f4enix.readthedocs.io/en/latest/_autosummary/f4enix.input.MCNPinput.html>`_) or one of its children. In case the benchmark is run
with d1s code, an irradiation file and a reaction file (`D1S files <https://f4enix.readthedocs.io/en/latest/_autosummary/f4enix.input.d1suned.html>`_) are also associated with the
test.

Post-processing
===============
Operations for the post-processing of benchmark run results are handled by the
``postprocessing.py`` module.
All objects representing outputs of a benchmark run must be a child of the abstract class
:ref:`abstractoutputob`. These classes always include an :ref:`mcnpoutputob` which collect
AbstractOutput. These classes always include an MCNPoutput which collect
the results coming from the parsers of the different MCNP outputs.


43 changes: 0 additions & 43 deletions docs/source/api/initobjects.rst

This file was deleted.

106 changes: 0 additions & 106 deletions docs/source/api/inputgeneration.rst

This file was deleted.

57 changes: 0 additions & 57 deletions docs/source/api/postprocessing.rst

This file was deleted.

3 changes: 3 additions & 0 deletions docs/source/nutshell.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ JADE is an open source, Python 3 based software able to:
* Run simulations on such inputs;
* Automatically parse and post-process all the generated transport codes outputs.

MCNP input and output handling is performed by F4Enix (`f4enix documentation <https://f4enix.readthedocs.io/en/latest/>`_).
This package contains a range of utilities for the creation and post-processing of MCNP files.

The benchmarks implemented by default are divided between computational
and experimental benchmarks. The post-processing output includes:

Expand Down
2 changes: 1 addition & 1 deletion docs/source/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ scipy
python-docx
aspose-words
requests
f4enix >= 0.7.2
f4enix >= 0.8.1
# DOC reqs
sphinx
esbonio
Expand Down
Loading

0 comments on commit 63b6250

Please sign in to comment.