Merge pull request #59 from fusion-energy/develop

improved testing, corrected link and a few typos

tasks/task_04_make_sources/3_plasma_source_plots.ipynb

@@ -74,7 +74,7 @@
    "source": [
     "import openmc_source_plotter as osp\n",
     "\n",
-    "osp.create_initial_particles(source, openmc_exec='/opt/conda/envs/openmc_version_0_11_0/bin/openmc')\n",
+    "osp.create_initial_particles(my_source, openmc_exec='/opt/conda/envs/openmc_version_0_11_0/bin/openmc')\n",
     "osp.plot_energy_from_initial_source()"
    ]
   },
@@ -136,7 +136,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.12"
+   "version": "3.9.5"
   }
  },
  "nbformat": 4,

tasks/task_12_CAD_mesh_fast_flux/README.md

@@ -1,9 +1,9 @@
 
-## Task 1 - Cross sections
+## Task 12 - CAD mesh tally of fast flux
 
 Please allow 30 minutes for this task.
 
-Expected outputs from this task are also in the [presentation](https://slides.com/neutronics_workshop/neutronics_workshop#/13.
+Expected outputs from this task are also in the [presentation](https://slides.com/neutronics_workshop/neutronics_workshop#/13).
 
 In this task you will be using OpenMC, DAGMC to perform neutronics simulations
 on 2D meshes and 3D meshes.

tasks/task_13_parameter_study_sampling/1_techniques_for_sampling_design_space.ipynb

@@ -65,7 +65,7 @@
     "number_of_simulations = 16\n",
     "\n",
     "# defines the parameter space to search over\n",
-    "# space = Space([(0., 100.), (0., 100.)])"
+    "space = Space([(0., 100.), (0., 100.)])"
    ]
   },
   {
@@ -362,7 +362,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.12"
+   "version": "3.9.5"
   }
  },
  "nbformat": 4,

tests/test_all_tasks.py

@@ -60,12 +60,17 @@ def test_task_3(self):
             nb, errors = _notebook_run(notebook)
             assert errors == []
 
-# ModuleNotFoundError: No module named 'source_extraction_utils
-    # def test_task_4(self):
-            # print(notebook)
-    #     for notebook in Path().rglob("tasks/task_04_*/*.ipynb"):
-    #         nb, errors = _notebook_run(notebook)
-    #         assert errors == []
+    def test_task_4(self):
+        for notebook in Path().rglob("tasks/task_04_*/1_.ipynb"):
+            nb, errors = _notebook_run(notebook)
+            assert errors == []
+        for notebook in Path().rglob("tasks/task_04_*/4_.ipynb"):
+            nb, errors = _notebook_run(notebook)
+            assert errors == []
+# failing tasks
+# 2_ring_source.ipynb -> no ring source in openmc 0.11
+# 3_plasma_source_plots.ipynb -> no ring source in openmc 0.11
+# 5_gamma_source_example.ipynb -> gamma outside of nuclear data energy range
 
     def test_task_5(self):
         for notebook in Path().rglob("tasks/task_05_*/*.ipynb"):
@@ -79,12 +84,11 @@ def test_task_6(self):
             nb, errors = _notebook_run(notebook)
             assert errors == []
 
-# ModuleNotFoundError: No module named 'plotting_utils'
-    # def test_task_7(self):
-    #     for notebook in Path().rglob("tasks/task_07_*/*.ipynb"):
-            # print(notebook)
-    #         nb, errors = _notebook_run(notebook)
-    #         assert errors == []
+    def test_task_7(self):
+        for notebook in Path().rglob("tasks/task_07_*/*.ipynb"):
+            print(notebook)
+            nb, errors = _notebook_run(notebook)
+            assert errors == []
 
 # ModuleNotFoundError: No module named 'statepoint_to_vtk'
 #     def test_task_8(self):
@@ -105,23 +109,28 @@ def test_task_10(self):
             nb, errors = _notebook_run(notebook)
             assert errors == []
 
-# TimeoutError: Cell execution timed out
     def test_task_11(self):
         for notebook in Path().rglob("tasks/task_11_*/*.ipynb"):
             print(notebook)
             nb, errors = _notebook_run(notebook)
             assert errors == []
 
-    # def test_task_12(self):
-    #     for notebook in Path().rglob("tasks/task_12_*/*.ipynb"):
+    def test_task_12(self):
+        for notebook in Path().rglob("tasks/task_12_*/*.ipynb"):
+            print(notebook)
+            nb, errors = _notebook_run(notebook)
+            assert errors == []
+
+# No module named 'openmc_model'
+    # def test_task_13(self):
+    #     for notebook in Path().rglob("tasks/task_13_*/*.ipynb"):
     #         print(notebook)
     #         nb, errors = _notebook_run(notebook)
     #         assert errors == []
 
 # No module named 'openmc_model'
-# ModuleNotFoundError: No module named 'statepoint_to_vtk'
-    # def test_task_13(self):
-    #     for notebook in Path().rglob("tasks/task_13_*/*.ipynb"):
+    # def test_task_14(self):
+    #     for notebook in Path().rglob("tasks/task_14_*/*.ipynb"):
     #         print(notebook)
     #         nb, errors = _notebook_run(notebook)
     #         assert errors == []