Merge pull request #161 from fusion-energy/develop

updated VR example, added detector example
fusion-energy · Dec 22, 2022 · 0196946 · 0196946
2 parents 1e3d2ef + 8d9baf9
commit 0196946
Show file tree

Hide file tree

Showing 14 changed files with 2,024 additions and 396 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -105,6 +105,8 @@ RUN pip install neutronics_material_maker[density] \
                 openmc_source_plotter \
                 openmc_depletion_plotter
 
+RUN pip install git+https://github.com/fusion-energy/openmc_weight_window_generator.git
+
 # Python libraries used in the workshop
 RUN pip install cmake\
 # new version of cmake needed for openmc compile

diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-
-[![CircleCI](https://circleci.com/gh/fusion-energy/neutronics-workshop/tree/main.svg?style=svg)](https://circleci.com/gh/fusion-energy/neutronics-workshop/tree/main)
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/fusion-energy/neutronics-workshop/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/fusion-energy/neutronics-workshop/tree/main)
 [![CI with install](https://github.com/fusion-energy/neutronics-workshop/actions/workflows/ci_tests.yml/badge.svg)](https://github.com/fusion-energy/neutronics-workshop/actions/workflows/ci_tests.yml)
 
 [![docker-publish-release](https://github.com/fusion-energy/neutronics-workshop/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/fusion-energy/neutronics-workshop/actions/workflows/docker-publish.yml)
@@ -153,3 +152,4 @@ The task videos are all available on a [Gather Town](https://gather.town/app/QnH
 | [Task 14 - Activation transmutation depletion](https://github.com/fusion-energy/neutronics-workshop/tree/main/tasks/task_14_activation_transmutation_depletion) | Isotope build up and tally variation as a function of time |  |
 | [Task 15 - Techniques for sampling parameter space](https://github.com/fusion-energy/neutronics-workshop/tree/main/tasks/task_15_parameter_study_sampling) | Sampling, Interpolation, Multi-dimensional parameter studies |  |
 | [Task 16 - Parameter study optimisation](https://github.com/fusion-energy/neutronics-workshop/tree/main/tasks/task_16_parameter_study_optimisation) | Data science machine learning approaches |  |
+| [Task 17 - Detector examples](https://github.com/fusion-energy/neutronics-workshop/tree/main/tasks/task_17_detector_examples) | Time filter detector response time of flight |  |
diff --git a/tasks/task_07_CSG_cell_tally_spectra/2_example_photon_spectra.ipynb b/tasks/task_07_CSG_cell_tally_spectra/2_example_photon_spectra.ipynb
@@ -100,7 +100,7 @@
     "tallies = openmc.Tallies()\n",
     "\n",
     "# sets up filters for the tallies\n",
-    "neutron_particle_filter = openmc.ParticleFilter(['photon'])  # note the use of photons here\n",
+    "particle_filter = openmc.ParticleFilter(['photon'])  # note the use of photons here\n",
     "energy_filter = openmc.EnergyFilter.from_group_structure('VITAMIN-J-175')\n",
     "\n",
     "\n",
@@ -110,7 +110,7 @@
     "# create the tally\n",
     "cell_spectra_tally = openmc.Tally(name='cell_spectra_tally')\n",
     "cell_spectra_tally.scores = ['flux']\n",
-    "cell_spectra_tally.filters = [cell_filter, neutron_particle_filter, energy_filter]\n",
+    "cell_spectra_tally.filters = [cell_filter, particle_filter, energy_filter]\n",
     "tallies.append(cell_spectra_tally)"
    ]
   },

diff --git a/tasks/task_13_variance_reduction/1_minimal_weight_window_mesh_tally_example.py b/tasks/task_13_variance_reduction/1_minimal_weight_window_mesh_tally_example.py
diff --git a/tasks/task_13_variance_reduction/2_no_weight_window_mesh_tally_example.py b/tasks/task_13_variance_reduction/2_no_weight_window_mesh_tally_example.py
diff --git a/tasks/task_13_variance_reduction/3_minimal_weight_window__spectra_tally_example.py b/tasks/task_13_variance_reduction/3_minimal_weight_window__spectra_tally_example.py