Skip to content

Commit

Permalink
Merge pull request #41 from fusion-energy/develop
Browse files Browse the repository at this point in the history 
Fixing task 12
  • Loading branch information
@shimwell
shimwell authored Dec 8, 2021
2 parents 1e67eb8 + 7283f2d commit 85d1683
Show file tree
Hide file tree
Showing 8 changed files with 452 additions and 289 deletions.
1 change: 1 addition & 0 deletions install_scripts/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
These install scripts are at various stages of completeness and are not ready to replace the Dockerfile yet.
26 changes: 24 additions & 2 deletions tasks/task_10_making_CAD_geometry/1_make_CAD_shapes_from_points.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,31 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 9,
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"/home/jshim/miniconda3/envs/openmc-dagmc/lib/python3.8/site-packages/IPython/core/display.py:724: UserWarning: Consider using IPython.display.IFrame instead\n",
" warnings.warn(\"Consider using IPython.display.IFrame instead\")\n"
]
},
{
"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": 9,
"metadata": {},
"output_type": "execute_result"
}
],
"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>')"
Expand Down
221 changes: 219 additions & 2 deletions tasks/task_10_making_CAD_geometry/2_make_CAD_components_from_parameters.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,226 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 1,
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Overwriting auto display for cadquery Workplane and Shape\n"
]
},
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "6f28acd8ed8d4f20a0fbcbf5f8e34c10",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"HBox(children=(VBox(children=(HBox(children=(Checkbox(value=False, description='Axes', indent=False, _dom_clas…"
]
},
"metadata": {},
"output_type": "display_data"
},
{
"data": {
"text/html": [
"<style>\n",
".scroll-area {\n",
" overflow: scroll !important;\n",
" border: unset !important;\n",
"}\n",
"\n",
".mac-scrollbar::-webkit-scrollbar {\n",
" width: 5px !important;\n",
" height: 5px !important;\n",
"}\n",
"\n",
".mac-scrollbar::-webkit-scrollbar-track {\n",
" background-color: transparent !important;\n",
"}\n",
"\n",
".mac-scrollbar .widget-html-content {\n",
" overflow-x: visible;\n",
" overflow-y: visible;\n",
"}\n",
"\n",
".tab-content-no-padding .widget-tab-contents {\n",
" overflow-x: visible !important;\n",
" overflow-y: visible !important;\n",
" padding-bottom: 0px !important;\n",
"}\n",
"\n",
".view_renderer {\n",
" border: 1px solid var(--jp-border-color1);\n",
" margin-top: 3px;\n",
" margin-left: 2px;\n",
"}\n",
"\n",
".view_tree {\n",
" padding: 0px !important;\n",
"}\n",
"\n",
".view_axes {\n",
" width: 60px !important;\n",
" margin-left: 5px !important;\n",
"}\n",
"\n",
".view_zero {\n",
" width: 55px !important;\n",
"}\n",
"\n",
".view_grid {\n",
" width: 56px !important;\n",
"}\n",
"\n",
".view_ortho {\n",
" width: 64px !important;\n",
"}\n",
"\n",
".view_transparent {\n",
" width: 125px !important;\n",
"}\n",
"\n",
".view_black_edges {\n",
" width: 105px !important;\n",
"}\n",
"\n",
".view_button {\n",
" padding: 0px !important;\n",
"}\n",
"\n",
".view_button>img {\n",
" height: 28px;\n",
" width: 36px;\n",
"}\n",
"\n",
".node_entry_wrap {\n",
" white-space: pre;\n",
"}\n",
"\n",
".node_entry {\n",
" white-space: nowrap;\n",
" padding-top: 4px;\n",
"}\n",
"\n",
".t-caret {\n",
" cursor: pointer;\n",
" -webkit-user-select: none;\n",
" /* Safari 3.1+ */\n",
" -moz-user-select: none;\n",
" /* Firefox 2+ */\n",
" -ms-user-select: none;\n",
" /* IE 10+ */\n",
" user-select: none;\n",
"}\n",
"\n",
".t-caret-down::before {\n",
" -ms-transform: rotate(90deg);\n",
" /* IE 9 */\n",
" -webkit-transform: rotate(90deg);\n",
" /* Safari */\n",
" transform: rotate(90deg);\n",
"}\n",
"\n",
".toplevel {\n",
" list-style-type: none;\n",
" padding-inline-start: 0px;\n",
"}\n",
"\n",
".nested {\n",
" display: none;\n",
" list-style-type: none;\n",
" padding-inline-start: 16px;\n",
"}\n",
"\n",
".active {\n",
" display: block;\n",
"}\n",
"\n",
".icon {\n",
" width: 28px !important;\n",
" height: 22px !important;\n",
" padding-right: 2px;\n",
" vertical-align: middle;\n",
"}\n",
"\n",
".indent {\n",
" margin-left: 12px;\n",
"}\n",
"\n",
".tree_label {\n",
" padding-left: 2px;\n",
" font-size: 14px;\n",
"}\n",
"\n",
".scroll_down {\n",
" display: flex;\n",
" flex-direction: column-reverse;\n",
"}\n",
"\n",
".small_table {\n",
" line-height: 14px;\n",
"}\n",
"\n",
".monospace select {\n",
" font-family: monospace;\n",
"}\n",
"\n",
" .t-caret::before {\n",
" content: u\"▶\";\n",
" font-size: 12px;\n",
" color: \"#080808\";\n",
" display: inline-block;\n",
" margin-right: 2px;\n",
" }\n",
"\n",
" .mac-scrollbar::-webkit-scrollbar-thumb {\n",
" background-color: rgba(0, 0, 0, 0.2) !important;\n",
" border-radius: 100px !important;\n",
" }\n",
"\n",
" .mac-scrollbar::-webkit-scrollbar-thumb:hover {\n",
" background: rgba(0, 0, 0, 0.4) !important;\n",
" }\n",
"\n",
" .mac-scrollbar::-webkit-scrollbar-thumb:active {\n",
" background: #181818 !important;\n",
" }\n",
"\n",
" .mac-scrollbar::-webkit-scrollbar-corner {\n",
" background: white;\n",
" }\n",
"\n",
" .view_output {\n",
" border: 1px solid var(--jp-border-color1);\n",
" margin: 2px 2px 2px 2px !important;\n",
" padding-right: 1px !important;\n",
" background-color: white;\n",
" }\n",
" </style>"
],
"text/plain": [
"<IPython.core.display.HTML object>"
]
},
"metadata": {},
"output_type": "display_data"
},
{
"data": {
"text/plain": [
"<jupyter_cadquery.cad_display.CadqueryDisplay at 0x7f4778429d60>"
]
},
"execution_count": 1,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"import paramak\n",
"\n",
Expand Down
Loading

0 comments on commit 85d1683

Please sign in to comment.