diff --git a/examples/notebooks/Getting Started/Tutorial 1 - How to run a model.ipynb b/examples/notebooks/Getting Started/Tutorial 1 - How to run a model.ipynb index 1f669bb7eb..38d4d4ea53 100644 --- a/examples/notebooks/Getting Started/Tutorial 1 - How to run a model.ipynb +++ b/examples/notebooks/Getting Started/Tutorial 1 - How to run a model.ipynb @@ -83,7 +83,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 4, @@ -110,7 +110,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "f07093aa95774ca28dca871c00dde5ed", + "model_id": "06ae219fb8b94fa3aad3b8907a41ed27", "version_major": 2, "version_minor": 0 }, @@ -134,13 +134,6 @@ "\n", "In [Tutorial 2](./Tutorial%202%20-%20Compare%20models.ipynb) we cover how to simulate and compare different models." ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { diff --git a/examples/notebooks/Getting Started/Tutorial 2 - Compare models.ipynb b/examples/notebooks/Getting Started/Tutorial 2 - Compare models.ipynb index 14f8bcf00b..192cec7d86 100644 --- a/examples/notebooks/Getting Started/Tutorial 2 - Compare models.ipynb +++ b/examples/notebooks/Getting Started/Tutorial 2 - Compare models.ipynb @@ -89,7 +89,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "181cfb2fa9c14b3b8ef1da976ed1d0c0", + "model_id": "b1cbafe2711e4d91aec48dfe246967b3", "version_major": 2, "version_minor": 0 }, @@ -103,7 +103,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 4, diff --git a/examples/notebooks/Getting Started/Tutorial 3 - Basic plotting.ipynb b/examples/notebooks/Getting Started/Tutorial 3 - Basic plotting.ipynb index 6955a5dce5..a93ef8cc64 100644 --- a/examples/notebooks/Getting Started/Tutorial 3 - Basic plotting.ipynb +++ b/examples/notebooks/Getting Started/Tutorial 3 - Basic plotting.ipynb @@ -29,7 +29,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 1, @@ -666,7 +666,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "db0a3fdf88414cc68e9c56700c3a323e", + "model_id": "210ea1fb46d9436e8b48f53c70b80db7", "version_major": 2, "version_minor": 0 }, @@ -698,7 +698,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "925a9484972045d994049610547a83e9", + "model_id": "8b13649c493c4561b647cf49f3867486", "version_major": 2, "version_minor": 0 }, @@ -730,7 +730,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "3cc527fe2def46029dad129d78a92b21", + "model_id": "b471a3ef004a422d9ad5797c74099c6b", "version_major": 2, "version_minor": 0 }, @@ -768,7 +768,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "d04be712225c460fb4f3c9f8b0a33c71", + "model_id": "eb778fbfe8b8428d8bf63ce3142d36f0", "version_major": 2, "version_minor": 0 }, @@ -816,7 +816,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "2a0ac4ca6f0b48b8b10d964225ad1041", + "model_id": "ec65841022c74b27bc1c60757a8a3f1a", "version_major": 2, "version_minor": 0 }, diff --git a/examples/notebooks/Getting Started/Tutorial 5 - Run experiments.ipynb b/examples/notebooks/Getting Started/Tutorial 5 - Run experiments.ipynb index 028a7c549a..082e9accc4 100644 --- a/examples/notebooks/Getting Started/Tutorial 5 - Run experiments.ipynb +++ b/examples/notebooks/Getting Started/Tutorial 5 - Run experiments.ipynb @@ -99,13 +99,13 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 5, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "ad0d2de10623429bb18611723206e524", + "model_id": "e96a7cc47a70462187b8f74522f1e6a7", "version_major": 2, "version_minor": 0 }, @@ -151,7 +151,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 6, "metadata": {}, "outputs": [ { @@ -166,7 +166,7 @@ " 'Charge at 0.5 C for 45 minutes']" ] }, - "execution_count": 7, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } diff --git a/examples/notebooks/Getting Started/Tutorial 6 - Managing simulation outputs.ipynb b/examples/notebooks/Getting Started/Tutorial 6 - Managing simulation outputs.ipynb index eb1bdde6dc..a4d0c9569a 100644 --- a/examples/notebooks/Getting Started/Tutorial 6 - Managing simulation outputs.ipynb +++ b/examples/notebooks/Getting Started/Tutorial 6 - Managing simulation outputs.ipynb @@ -18,7 +18,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 2, "metadata": {}, "outputs": [ { @@ -31,10 +31,10 @@ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 1, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } @@ -44,7 +44,7 @@ "import pybamm\n", "model = pybamm.lithium_ion.SPMe()\n", "sim = pybamm.Simulation(model)\n", - "sim.solve()" + "sim.solve([0, 3600])" ] }, { @@ -63,7 +63,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 3, "metadata": {}, "outputs": [], "source": [ @@ -79,7 +79,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 4, "metadata": {}, "outputs": [], "source": [ @@ -96,35 +96,35 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 5, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "array([3.77057107, 3.75314464, 3.74576314, 3.74048119, 3.73590498,\n", - " 3.73162688, 3.72751694, 3.72353238, 3.71965945, 3.71589497,\n", - " 3.71223918, 3.70869335, 3.70525858, 3.70193548, 3.69872417,\n", - " 3.69562416, 3.69263437, 3.68975321, 3.68697864, 3.68430828,\n", - " 3.68173938, 3.67926892, 3.67689361, 3.67460989, 3.67241395,\n", - " 3.67030171, 3.66826873, 3.66631018, 3.66442064, 3.66259392,\n", - " 3.66082275, 3.65909838, 3.65740993, 3.65574368, 3.65408197,\n", - " 3.65240199, 3.65067437, 3.64886181, 3.64691846, 3.64479097,\n", - " 3.64242265, 3.63976269, 3.63678092, 3.63348599, 3.62994006,\n", - " 3.62625986, 3.62259745, 3.61910537, 3.61590166, 3.61305019,\n", - " 3.61056146, 3.60840705, 3.60653784, 3.60489897, 3.60343908,\n", - " 3.60211468, 3.60089123, 3.59974251, 3.59864938, 3.59759832,\n", - " 3.59658024, 3.59558939, 3.59462255, 3.59367842, 3.59275707,\n", - " 3.59185947, 3.59098718, 3.59014186, 3.58932493, 3.58853708,\n", - " 3.58777779, 3.5870448 , 3.58633359, 3.58563673, 3.58494346,\n", - " 3.58423912, 3.58350488, 3.58271742, 3.58184889, 3.5808668 ,\n", - " 3.579734 , 3.57840839, 3.57684221, 3.57498047, 3.57275806,\n", - " 3.57009492, 3.56688825, 3.56300069, 3.55824252, 3.55234578,\n", - " 3.54492664, 3.53543156, 3.52306098, 3.50666272, 3.48458581,\n", - " 3.45448671, 3.41308488, 3.35588179, 3.27689382, 3.16851949])" + "array([3.77057104, 3.75314461, 3.74576311, 3.74048117, 3.73590496,\n", + " 3.73162686, 3.72751691, 3.72353235, 3.71965942, 3.71589494,\n", + " 3.71223915, 3.70869332, 3.70525855, 3.70193545, 3.69872414,\n", + " 3.69562413, 3.69263434, 3.68975318, 3.68697862, 3.68430825,\n", + " 3.68173935, 3.67926889, 3.67689358, 3.67460986, 3.67241392,\n", + " 3.67030168, 3.6682687 , 3.66631015, 3.66442061, 3.66259389,\n", + " 3.66082272, 3.65909835, 3.6574099 , 3.65574365, 3.65408194,\n", + " 3.65240196, 3.65067434, 3.64886178, 3.64691843, 3.64479094,\n", + " 3.64242262, 3.63976266, 3.63678089, 3.63348596, 3.62994003,\n", + " 3.62625983, 3.62259742, 3.61910534, 3.61590162, 3.61305016,\n", + " 3.61056143, 3.60840702, 3.60653781, 3.60489893, 3.60343905,\n", + " 3.60211465, 3.6008912 , 3.59974248, 3.59864935, 3.59759829,\n", + " 3.59658021, 3.59558935, 3.59462252, 3.59367839, 3.59275703,\n", + " 3.59185944, 3.59098715, 3.59014183, 3.5893249 , 3.58853704,\n", + " 3.58777775, 3.58704477, 3.58633355, 3.5856367 , 3.58494342,\n", + " 3.58423909, 3.58350484, 3.58271739, 3.58184885, 3.58086676,\n", + " 3.57973396, 3.57840835, 3.57684218, 3.57498043, 3.57275802,\n", + " 3.57009488, 3.56688821, 3.56300064, 3.55824248, 3.55234574,\n", + " 3.54492659, 3.53543151, 3.52306093, 3.50666266, 3.48458575,\n", + " 3.45448664, 3.4130848 , 3.35588169, 3.27689371, 3.16851934])" ] }, - "execution_count": 4, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -142,7 +142,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 6, "metadata": {}, "outputs": [ { @@ -175,7 +175,7 @@ " 3490.90909091, 3527.27272727, 3563.63636364, 3600. ])" ] }, - "execution_count": 5, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } @@ -193,16 +193,16 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 7, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "array([3.72957191, 3.70869335, 3.67820003, 3.65409858])" + "array([3.72957189, 3.70869332, 3.6782 , 3.65409855])" ] }, - "execution_count": 6, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -227,7 +227,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 8, "metadata": {}, "outputs": [], "source": [ @@ -243,7 +243,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 9, "metadata": {}, "outputs": [], "source": [ @@ -259,18 +259,18 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 10, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "6665e273190047a08b75644328a02bfc", + "model_id": "cf1e17785b834c7dbee9b936027904d1", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "interactive(children=(FloatSlider(value=0.0, description='t', max=3599.9999999999995, step=35.99999999999999),…" + "interactive(children=(FloatSlider(value=0.0, description='t', max=1.0, step=0.01), Output()), _dom_classes=('w…" ] }, "metadata": {}, @@ -290,7 +290,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 11, "metadata": {}, "outputs": [], "source": [ @@ -307,18 +307,18 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 12, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "78a6e78f9ccc404e9d0846f22e2abdc1", + "model_id": "0c585713c60f4ec68dcbbe5496e84c59", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "interactive(children=(FloatSlider(value=0.0, description='t', max=3599.9999999999995, step=35.99999999999999),…" + "interactive(children=(FloatSlider(value=0.0, description='t', max=1.0, step=0.01), Output()), _dom_classes=('w…" ] }, "metadata": {}, @@ -327,10 +327,10 @@ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 11, + "execution_count": 12, "metadata": {}, "output_type": "execute_result" } @@ -349,7 +349,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 13, "metadata": {}, "outputs": [], "source": [ @@ -365,7 +365,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 14, "metadata": {}, "outputs": [], "source": [ @@ -383,9 +383,9 @@ ], "metadata": { "kernelspec": { - "display_name": "PyBaMM development (env)", + "display_name": "Python 3", "language": "python", - "name": "pybamm-dev" + "name": "python3" }, "language_info": { "codemirror_mode": { @@ -397,7 +397,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.8" + "version": "3.6.9" } }, "nbformat": 4, diff --git a/examples/notebooks/Getting Started/Tutorial 7 - Model options.ipynb b/examples/notebooks/Getting Started/Tutorial 7 - Model options.ipynb index 617028fe28..a8cfd5c18e 100644 --- a/examples/notebooks/Getting Started/Tutorial 7 - Model options.ipynb +++ b/examples/notebooks/Getting Started/Tutorial 7 - Model options.ipynb @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 1, "metadata": {}, "outputs": [ { @@ -36,7 +36,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -52,16 +52,16 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 3, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 6, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } @@ -85,18 +85,18 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 4, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "0f986094efb34516bfdec918871f7945", + "model_id": "7e85b1c4a9094d17b2a9c7c944f1b093", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "interactive(children=(FloatSlider(value=0.0, description='t', max=800.239418181818, step=8.00239418181818), Ou…" + "interactive(children=(FloatSlider(value=0.0, description='t', max=800.0000000000002, step=8.000000000000002), …" ] }, "metadata": {}, @@ -131,7 +131,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.8" + "version": "3.6.9" } }, "nbformat": 4,