Skip to content

Commit

Permalink
Just a few small glitches and removing tempDir
Browse files Browse the repository at this point in the history
  • Loading branch information
@Immudzen
Immudzen committed Oct 22, 2019
1 parent 645d14e commit 5bda884
Show file tree
Hide file tree
Showing 11 changed files with 476 additions and 428 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,3 +339,4 @@ ASALocalRun/
# BeatPulse healthcheck temp database
healthchecksdb
/CADET-Tutorial/.ipynb_checkpoints
/CADET-Tutorial/.~Lesson 8 Experimental design overview.ipynb
6 changes: 3 additions & 3 deletions CADET-Tutorial/CADET Install windows.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 2,
"metadata": {
"ExecuteTime": {
"end_time": "2019-10-11T09:46:17.147206Z",
"start_time": "2019-10-11T09:46:14.562783Z"
"end_time": "2019-10-22T16:32:24.242574Z",
"start_time": "2019-10-22T16:31:54.062710Z"
}
},
"outputs": [],
Expand Down
2 changes: 1 addition & 1 deletion CADET-Tutorial/CADET install Linux.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
"\n",
"#if the tutorial has already been copied we need to update it instead of copying it again\n",
"if cadet_tutorial_dir.exists():\n",
" repo = Repo(tutorial_dir.as_posix())\n",
" repo = Repo(cadet_tutorial_dir.as_posix())\n",
"\n",
" remote = repo.remote()\n",
" remote.fetch() \n",
Expand Down
82 changes: 41 additions & 41 deletions CADET-Tutorial/Lesson 1 Creating, Running, and Plotting a Simple Model.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"execution_count": 1,
"metadata": {
"ExecuteTime": {
"end_time": "2019-10-22T08:46:49.906939Z",
"start_time": "2019-10-22T08:46:47.679727Z"
"end_time": "2019-10-22T16:37:04.989680Z",
"start_time": "2019-10-22T16:37:02.944769Z"
}
},
"outputs": [
Expand Down Expand Up @@ -73,8 +73,8 @@
"execution_count": 2,
"metadata": {
"ExecuteTime": {
"end_time": "2019-10-22T08:46:50.290939Z",
"start_time": "2019-10-22T08:46:49.908939Z"
"end_time": "2019-10-22T16:37:05.301671Z",
"start_time": "2019-10-22T16:37:04.992651Z"
},
"cell_style": "split",
"scrolled": false
Expand Down Expand Up @@ -125,10 +125,10 @@
" <defs>\r\n",
" <path d=\"M 0 0 \r\n",
"L 0 3.5 \r\n",
"\" id=\"mfd839b6d6b\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
"\" id=\"m7b90dec89d\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
" </defs>\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"69.144886\" xlink:href=\"#mfd839b6d6b\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"69.144886\" xlink:href=\"#m7b90dec89d\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_1\">\r\n",
Expand Down Expand Up @@ -164,7 +164,7 @@
" <g id=\"xtick_2\">\r\n",
" <g id=\"line2d_2\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"153.690341\" xlink:href=\"#mfd839b6d6b\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"153.690341\" xlink:href=\"#m7b90dec89d\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_2\">\r\n",
Expand Down Expand Up @@ -194,7 +194,7 @@
" <g id=\"xtick_3\">\r\n",
" <g id=\"line2d_3\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"238.235795\" xlink:href=\"#mfd839b6d6b\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"238.235795\" xlink:href=\"#m7b90dec89d\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_3\">\r\n",
Expand Down Expand Up @@ -235,7 +235,7 @@
" <g id=\"xtick_4\">\r\n",
" <g id=\"line2d_4\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"322.78125\" xlink:href=\"#mfd839b6d6b\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"322.78125\" xlink:href=\"#m7b90dec89d\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_4\">\r\n",
Expand Down Expand Up @@ -284,7 +284,7 @@
" <g id=\"xtick_5\">\r\n",
" <g id=\"line2d_5\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"407.326705\" xlink:href=\"#mfd839b6d6b\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"407.326705\" xlink:href=\"#m7b90dec89d\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_5\">\r\n",
Expand Down Expand Up @@ -318,7 +318,7 @@
" <g id=\"xtick_6\">\r\n",
" <g id=\"line2d_6\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"491.872159\" xlink:href=\"#mfd839b6d6b\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"491.872159\" xlink:href=\"#m7b90dec89d\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_6\">\r\n",
Expand Down Expand Up @@ -359,7 +359,7 @@
" <g id=\"xtick_7\">\r\n",
" <g id=\"line2d_7\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"576.417614\" xlink:href=\"#mfd839b6d6b\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"576.417614\" xlink:href=\"#m7b90dec89d\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_7\">\r\n",
Expand Down Expand Up @@ -555,10 +555,10 @@
" <defs>\r\n",
" <path d=\"M 0 0 \r\n",
"L -3.5 0 \r\n",
"\" id=\"m93427fbbbc\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
"\" id=\"mb702d3b65c\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
" </defs>\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m93427fbbbc\" y=\"526.090909\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#mb702d3b65c\" y=\"526.090909\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_9\">\r\n",
Expand All @@ -581,7 +581,7 @@
" <g id=\"ytick_2\">\r\n",
" <g id=\"line2d_9\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m93427fbbbc\" y=\"412.722352\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#mb702d3b65c\" y=\"412.722352\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_10\">\r\n",
Expand All @@ -596,7 +596,7 @@
" <g id=\"ytick_3\">\r\n",
" <g id=\"line2d_10\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m93427fbbbc\" y=\"299.353795\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#mb702d3b65c\" y=\"299.353795\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_11\">\r\n",
Expand All @@ -611,7 +611,7 @@
" <g id=\"ytick_4\">\r\n",
" <g id=\"line2d_11\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m93427fbbbc\" y=\"185.985238\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#mb702d3b65c\" y=\"185.985238\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_12\">\r\n",
Expand All @@ -626,7 +626,7 @@
" <g id=\"ytick_5\">\r\n",
" <g id=\"line2d_12\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m93427fbbbc\" y=\"72.616681\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#mb702d3b65c\" y=\"72.616681\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_13\">\r\n",
Expand Down Expand Up @@ -872,7 +872,7 @@
" </g>\r\n",
" </g>\r\n",
" <g id=\"line2d_13\">\r\n",
" <path clip-path=\"url(#p06856bc79e)\" d=\"M 69.144886 526.090909 \r\n",
" <path clip-path=\"url(#p6b2d9ce49e)\" d=\"M 69.144886 526.090909 \r\n",
"L 304.18125 525.98296 \r\n",
"L 308.408523 525.749264 \r\n",
"L 310.944886 525.435078 \r\n",
Expand Down Expand Up @@ -978,7 +978,7 @@
" </g>\r\n",
" </g>\r\n",
" <defs>\r\n",
" <clipPath id=\"p06856bc79e\">\r\n",
" <clipPath id=\"p6b2d9ce49e\">\r\n",
" <rect height=\"543.6\" width=\"558\" x=\"43.78125\" y=\"7.2\"/>\r\n",
" </clipPath>\r\n",
" </defs>\r\n",
Expand Down Expand Up @@ -1129,8 +1129,8 @@
"execution_count": 3,
"metadata": {
"ExecuteTime": {
"end_time": "2019-10-22T08:46:50.721910Z",
"start_time": "2019-10-22T08:46:50.292910Z"
"end_time": "2019-10-22T16:37:05.640683Z",
"start_time": "2019-10-22T16:37:05.304672Z"
}
},
"outputs": [
Expand Down Expand Up @@ -1178,10 +1178,10 @@
" <defs>\r\n",
" <path d=\"M 0 0 \r\n",
"L 0 3.5 \r\n",
"\" id=\"m2814f1d2c0\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
"\" id=\"me31a9bf555\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
" </defs>\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"69.144886\" xlink:href=\"#m2814f1d2c0\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"69.144886\" xlink:href=\"#me31a9bf555\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_1\">\r\n",
Expand Down Expand Up @@ -1217,7 +1217,7 @@
" <g id=\"xtick_2\">\r\n",
" <g id=\"line2d_2\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"153.690341\" xlink:href=\"#m2814f1d2c0\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"153.690341\" xlink:href=\"#me31a9bf555\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_2\">\r\n",
Expand Down Expand Up @@ -1247,7 +1247,7 @@
" <g id=\"xtick_3\">\r\n",
" <g id=\"line2d_3\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"238.235795\" xlink:href=\"#m2814f1d2c0\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"238.235795\" xlink:href=\"#me31a9bf555\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_3\">\r\n",
Expand Down Expand Up @@ -1288,7 +1288,7 @@
" <g id=\"xtick_4\">\r\n",
" <g id=\"line2d_4\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"322.78125\" xlink:href=\"#m2814f1d2c0\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"322.78125\" xlink:href=\"#me31a9bf555\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_4\">\r\n",
Expand Down Expand Up @@ -1337,7 +1337,7 @@
" <g id=\"xtick_5\">\r\n",
" <g id=\"line2d_5\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"407.326705\" xlink:href=\"#m2814f1d2c0\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"407.326705\" xlink:href=\"#me31a9bf555\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_5\">\r\n",
Expand Down Expand Up @@ -1371,7 +1371,7 @@
" <g id=\"xtick_6\">\r\n",
" <g id=\"line2d_6\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"491.872159\" xlink:href=\"#m2814f1d2c0\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"491.872159\" xlink:href=\"#me31a9bf555\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_6\">\r\n",
Expand Down Expand Up @@ -1412,7 +1412,7 @@
" <g id=\"xtick_7\">\r\n",
" <g id=\"line2d_7\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"576.417614\" xlink:href=\"#m2814f1d2c0\" y=\"550.8\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"576.417614\" xlink:href=\"#me31a9bf555\" y=\"550.8\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_7\">\r\n",
Expand Down Expand Up @@ -1608,10 +1608,10 @@
" <defs>\r\n",
" <path d=\"M 0 0 \r\n",
"L -3.5 0 \r\n",
"\" id=\"m7fb5d0dc45\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
"\" id=\"m1448cf9f06\" style=\"stroke:#000000;stroke-width:0.8;\"/>\r\n",
" </defs>\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m7fb5d0dc45\" y=\"526.090909\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m1448cf9f06\" y=\"526.090909\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_9\">\r\n",
Expand All @@ -1634,7 +1634,7 @@
" <g id=\"ytick_2\">\r\n",
" <g id=\"line2d_9\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m7fb5d0dc45\" y=\"412.722352\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m1448cf9f06\" y=\"412.722352\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_10\">\r\n",
Expand All @@ -1649,7 +1649,7 @@
" <g id=\"ytick_3\">\r\n",
" <g id=\"line2d_10\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m7fb5d0dc45\" y=\"299.353795\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m1448cf9f06\" y=\"299.353795\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_11\">\r\n",
Expand All @@ -1664,7 +1664,7 @@
" <g id=\"ytick_4\">\r\n",
" <g id=\"line2d_11\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m7fb5d0dc45\" y=\"185.985238\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m1448cf9f06\" y=\"185.985238\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_12\">\r\n",
Expand All @@ -1679,7 +1679,7 @@
" <g id=\"ytick_5\">\r\n",
" <g id=\"line2d_12\">\r\n",
" <g>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m7fb5d0dc45\" y=\"72.616681\"/>\r\n",
" <use style=\"stroke:#000000;stroke-width:0.8;\" x=\"43.78125\" xlink:href=\"#m1448cf9f06\" y=\"72.616681\"/>\r\n",
" </g>\r\n",
" </g>\r\n",
" <g id=\"text_13\">\r\n",
Expand Down Expand Up @@ -1925,7 +1925,7 @@
" </g>\r\n",
" </g>\r\n",
" <g id=\"line2d_13\">\r\n",
" <path clip-path=\"url(#p11e291f986)\" d=\"M 69.144886 526.090909 \r\n",
" <path clip-path=\"url(#p4699734c5b)\" d=\"M 69.144886 526.090909 \r\n",
"L 304.18125 525.98296 \r\n",
"L 308.408523 525.749264 \r\n",
"L 310.944886 525.435078 \r\n",
Expand Down Expand Up @@ -2031,7 +2031,7 @@
" </g>\r\n",
" </g>\r\n",
" <defs>\r\n",
" <clipPath id=\"p11e291f986\">\r\n",
" <clipPath id=\"p4699734c5b\">\r\n",
" <rect height=\"543.6\" width=\"558\" x=\"43.78125\" y=\"7.2\"/>\r\n",
" </clipPath>\r\n",
" </defs>\r\n",
Expand Down Expand Up @@ -2106,15 +2106,15 @@
"execution_count": 4,
"metadata": {
"ExecuteTime": {
"end_time": "2019-10-22T08:46:50.893912Z",
"start_time": "2019-10-22T08:46:50.725910Z"
"end_time": "2019-10-22T16:37:05.791724Z",
"start_time": "2019-10-22T16:37:05.642685Z"
}
},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "636f239c446c406197625a1fa4e4dba2",
"model_id": "e4a0a57281eb4afcba6f9b81510d81e0",
"version_major": 2,
"version_minor": 0
},
Expand Down
Loading

0 comments on commit 5bda884

Please sign in to comment.