Merge pull request #23 from fusion-energy/develop

making use of new spectrum plotter package
fusion-energy · Oct 24, 2021 · cd9a0d8 · cd9a0d8
2 parents b9dd381 + 3126aab
commit cd9a0d8
Show file tree

Hide file tree

Showing 8 changed files with 16,137 additions and 174 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -210,7 +210,7 @@ RUN cd /opt && \
 # installs TENDL and ENDF nuclear data. Performed after openmc install as
 # openmc is needed to write the cross_Sections.xml file
 RUN pip install openmc_data_downloader && \
-    openmc_data_downloader -l ENDFB-7.1-NNDC TENDL-2019 -d cross_section_data -p neutron photon -e all
+    openmc_data_downloader -l ENDFB-7.1-NNDC TENDL-2019 -d cross_section_data -p neutron photon -e all -i H3
 
 ENV OPENMC_CROSS_SECTIONS=/cross_section_data/cross_sections.xml
 
@@ -220,12 +220,12 @@ RUN pip install neutronics_material_maker \
                 openmc-plasma-source \
                 remove_dagmc_tags \
                 paramak \
-                openmc_data_downloader \
                 cad_to_h5m \
                 stl_to_h5m \
                 openmc-dagmc-wrapper \
                 openmc-post-processor \
-                regular_mesh_plotter
+                regular_mesh_plotter \
+                spectrum_plotter
 
 # these two from statements can be switched when building locally
 # FROM dependencies as final

diff --git a/tasks/task_05_CSG_cell_tally_TBR/2_example_tritium_production_study.ipynb b/tasks/task_05_CSG_cell_tally_TBR/2_example_tritium_production_study.ipynb
@@ -211,7 +211,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.8.11"
   }
  },
  "nbformat": 4,

diff --git a/tasks/task_07_CSG_cell_tally_spectra/1_example_neutron_spectra.ipynb b/tasks/task_07_CSG_cell_tally_spectra/1_example_neutron_spectra.ipynb