Merge pull request #7 from fusion-energy/develop

updated cad tasks for new paramak/paramak-neutronics
fusion-energy · Jul 28, 2021 · b677411 · b677411
2 parents a450a11 + 52c7020
commit b677411
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 91 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -86,10 +86,13 @@ RUN pip install cmake\
 # cython is needed for moab
                 cython \
                 paramak \
+                paramak-neutronics \
                 openmc_data_downloader \
                 itkwidgets \
                 nest_asyncio \
-                ipywidgets
+                ipywidgets \
+                jupyter-cadquery \
+                matplotlib
 
 # svalinn-tools should be added but it is not working with python 3 at the moment
 

diff --git a/tasks/task_02_making_materials/1_example_materials_from_isotopes.ipynb b/tasks/task_02_making_materials/1_example_materials_from_isotopes.ipynb
@@ -169,7 +169,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -183,7 +183,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

diff --git a/tasks/task_02_making_materials/2_example_materials_from_elements.ipynb b/tasks/task_02_making_materials/2_example_materials_from_elements.ipynb
@@ -155,7 +155,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -169,7 +169,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

diff --git a/tasks/task_02_making_materials/3_example_materials_from_material_maker.ipynb b/tasks/task_02_making_materials/3_example_materials_from_material_maker.ipynb
@@ -126,7 +126,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -140,7 +140,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

diff --git a/tasks/task_04_make_sources/2_ring_source.ipynb b/tasks/task_04_make_sources/2_ring_source.ipynb
@@ -79,7 +79,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -93,7 +93,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

diff --git a/tasks/task_10_making_CAD_geometry/1_make_CAD_shapes_from_points.ipynb b/tasks/task_10_making_CAD_geometry/1_make_CAD_shapes_from_points.ipynb
@@ -25,23 +25,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/Bn_TcJSOvaA\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>"
-      ],
-      "text/plain": [
-       "<IPython.core.display.HTML object>"
-      ]
-     },
-     "execution_count": 2,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "from IPython.display import HTML\n",
     "HTML('<iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/Bn_TcJSOvaA\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>')"
@@ -73,7 +59,7 @@
     "    rotation_angle=180\n",
     ")\n",
     "\n",
-    "my_shape.solid"
+    "my_shape.show()"
    ]
   },
   {
@@ -99,7 +85,7 @@
     "    rotation_angle=180\n",
     ")\n",
     "\n",
-    "my_shape.solid"
+    "my_shape.show()"
    ]
   },
   {
@@ -125,7 +111,7 @@
     "    distance=20\n",
     ")\n",
     "\n",
-    "my_shape.solid"
+    "my_shape.show()"
    ]
   },
   {
@@ -151,7 +137,7 @@
     "    distance=20\n",
     ")\n",
     "\n",
-    "my_shape.solid"
+    "my_shape.show()"
    ]
   },
   {
@@ -190,7 +176,7 @@
     "    cut=small_Shape\n",
     ")\n",
     "\n",
-    "my_shape.solid"
+    "my_shape.show()"
    ]
   },
   {
@@ -269,7 +255,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -283,7 +269,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

diff --git a/tasks/task_10_making_CAD_geometry/2_make_CAD_components_from_parameters.ipynb b/tasks/task_10_making_CAD_geometry/2_make_CAD_components_from_parameters.ipynb
@@ -55,7 +55,7 @@
     "    rotation_angle=180\n",
     ")\n",
     "\n",
-    "pf_1.solid"
+    "pf_1.show()"
    ]
   },
   {
@@ -93,7 +93,7 @@
     "    rotation_angle=180\n",
     ")\n",
     "\n",
-    "tf.solid"
+    "tf.show()"
    ]
   },
   {
@@ -130,7 +130,7 @@
     "    rotation_angle=180\n",
     ")\n",
     "\n",
-    "plasma.solid"
+    "plasma.show()"
    ]
   },
   {
@@ -168,7 +168,7 @@
     "    rotation_angle=180\n",
     ")\n",
     "\n",
-    "blanket.solid"
+    "blanket.show()"
    ]
   },
   {
@@ -191,7 +191,7 @@
     "my_reactor.export_stp()\n",
     "my_reactor.export_stl()\n",
     "\n",
-    "my_reactor.solid"
+    "my_reactor.show()"
    ]
   },
   {
@@ -271,7 +271,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -285,7 +285,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,

diff --git a/tasks/task_10_making_CAD_geometry/3_make_CAD_reactors.ipynb b/tasks/task_10_making_CAD_geometry/3_make_CAD_reactors.ipynb
@@ -48,29 +48,31 @@
     "import paramak\n",
     "\n",
     "my_reactor = paramak.BallReactor(\n",
-    "    inner_bore_radial_thickness=10,\n",
-    "    inboard_tf_leg_radial_thickness=30,\n",
-    "    center_column_shield_radial_thickness=60,\n",
-    "    divertor_radial_thickness=150,\n",
-    "    inner_plasma_gap_radial_thickness=30,\n",
-    "    plasma_radial_thickness=300,\n",
-    "    outer_plasma_gap_radial_thickness=30,\n",
-    "    firstwall_radial_thickness=30,\n",
-    "    blanket_radial_thickness=50,\n",
-    "    blanket_rear_wall_radial_thickness=30,\n",
-    "    elongation=2,\n",
-    "    triangularity=0.55,\n",
-    "    number_of_tf_coils=16,\n",
-    "    rotation_angle=180,\n",
-    "    pf_coil_radial_thicknesses=[50, 50, 50, 50],\n",
-    "    pf_coil_vertical_thicknesses=[50, 50, 50, 50],\n",
-    "    pf_coil_to_rear_blanket_radial_gap=50,\n",
-    "    pf_coil_to_tf_coil_radial_gap=50,\n",
-    "    outboard_tf_coil_radial_thickness=100,\n",
-    "    outboard_tf_coil_poloidal_thickness=50\n",
+    "   inner_bore_radial_thickness=10,\n",
+    "   inboard_tf_leg_radial_thickness=30,\n",
+    "   center_column_shield_radial_thickness=60,\n",
+    "   divertor_radial_thickness=150,\n",
+    "   inner_plasma_gap_radial_thickness=30,\n",
+    "   plasma_radial_thickness=300,\n",
+    "   outer_plasma_gap_radial_thickness=30,\n",
+    "   firstwall_radial_thickness=30,\n",
+    "   blanket_radial_thickness=50,\n",
+    "   blanket_rear_wall_radial_thickness=30,\n",
+    "   elongation=2,\n",
+    "   triangularity=0.55,\n",
+    "   number_of_tf_coils=16,\n",
+    "   rotation_angle=90,\n",
+    "   pf_coil_case_thicknesses=[10, 10, 10, 10],\n",
+    "   pf_coil_radial_thicknesses=[20, 50, 50, 20],\n",
+    "   pf_coil_vertical_thicknesses=[20, 50, 50, 20],\n",
+    "   pf_coil_radial_position=[500, 575, 575, 500],\n",
+    "   pf_coil_vertical_position=[300, 100, -100, -300],\n",
+    "   rear_blanket_to_tf_gap=50,\n",
+    "   outboard_tf_coil_radial_thickness=100,\n",
+    "   outboard_tf_coil_poloidal_thickness=50\n",
     ")\n",
     "\n",
-    "my_reactor.solid"
+    "my_reactor.show()"
    ]
   },
   {
@@ -113,7 +115,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This model could then be used in neutronics simulations with some additional stages, see https://paramak.readthedocs.io/en/main/paramak.parametric_neutronics.html for more details. The next few tasks also cover CAD based simulations."
+    "This model could then be used in neutronics simulations with some additional stages, see https://paramak-neutronics.readthedocs.io more details. The next few tasks also cover CAD based simulations."
    ]
   },
   {
@@ -128,7 +130,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -142,7 +144,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,