diff --git a/Untitled.ipynb b/Untitled.ipynb deleted file mode 100644 index 1fa9c088d8..0000000000 --- a/Untitled.ipynb +++ /dev/null @@ -1,55 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "metadata": {}, - "outputs": [ - { - "ename": "ModuleNotFoundError", - "evalue": "No module named 'casadi'", - "output_type": "error", - "traceback": [ - "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[0;31mModuleNotFoundError\u001b[0m Traceback (most recent call last)", - "\u001b[0;32m\u001b[0m in \u001b[0;36m\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mimport\u001b[0m \u001b[0mpybamm\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m", - "\u001b[0;32m~/Documents/PyBaMM/pybamm/__init__.py\u001b[0m in \u001b[0;36m\u001b[0;34m\u001b[0m\n\u001b[1;32m 101\u001b[0m )\n\u001b[1;32m 102\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mexpression_tree\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0moperations\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjacobian\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mJacobian\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 103\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mexpression_tree\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0moperations\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mconvert_to_casadi\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mCasadiConverter\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 104\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mexpression_tree\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0moperations\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0munpack_symbols\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mSymbolUnpacker\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 105\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n", - "\u001b[0;32m~/Documents/PyBaMM/pybamm/expression_tree/operations/convert_to_casadi.py\u001b[0m in \u001b[0;36m\u001b[0;34m\u001b[0m\n\u001b[1;32m 3\u001b[0m \u001b[0;31m#\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 4\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mpybamm\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m \u001b[0;32mimport\u001b[0m \u001b[0mcasadi\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 6\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mnumpy\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mnp\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 7\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0mscipy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0minterpolate\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mPchipInterpolator\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mCubicSpline\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", - "\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'casadi'" - ] - } - ], - "source": [ - "import pybamm" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.6.9" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -} diff --git a/Untitled1.ipynb b/Untitled1.ipynb deleted file mode 100644 index 033f27e6e6..0000000000 --- a/Untitled1.ipynb +++ /dev/null @@ -1,107 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 18, - "metadata": {}, - "outputs": [], - "source": [ - "import pybamm\n", - "import numpy as np\n", - "import matplotlib.pyplot as plt\n", - "\n", - "param = pybamm.ParameterValues(chemistry=pybamm.parameter_sets.Ecker2015)\n", - "D_fun = param[\"Negative electrode diffusivity [m2.s-1]\"]\n", - "x = pybamm.Array(np.linspace(0,1,100))\n", - "D = D_fun(x, 300)\n", - "plt.plot(x.entries,D.entries) # would be nice to automate as pybamm.plot" - ] - }, - { - "cell_type": "code", - "execution_count": 19, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": 20, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": 21, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": 22, - "metadata": {}, - "outputs": [], - "source": [] - }, - { - "cell_type": "code", - "execution_count": 25, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "[]" - ] - }, - "execution_count": 25, - "metadata": {}, - "output_type": "execute_result" - }, - { - "data": { - "image/png": "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\n", - "text/plain": [ - "
" - ] - }, - "metadata": { - "needs_background": "light" - }, - "output_type": "display_data" - } - ], - "source": [] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.6.9" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -} diff --git a/Untitled2.ipynb b/Untitled2.ipynb deleted file mode 100644 index 7c3b0f45fd..0000000000 --- a/Untitled2.ipynb +++ /dev/null @@ -1,236 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 35, - "metadata": {}, - "outputs": [], - "source": [ - "import pybamm" - ] - }, - { - "cell_type": "code", - "execution_count": 36, - "metadata": {}, - "outputs": [], - "source": [ - "model = pybamm.lithium_ion.SPM()" - ] - }, - { - "cell_type": "code", - "execution_count": 37, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{Variable(-0x2d4478ebf648a7a3, Discharge capacity [A.h], children=[], domain=[], auxiliary_domains={}): Division(0x16eb37becd67e722, /, children=['Current function [A] * 96485.33289 * Maximum concentration in negative electrode [mol.m-3] * Negative electrode thickness [m] + Separator thickness [m] + Positive electrode thickness [m] / function (absolute)', '3600.0'], domain=[], auxiliary_domains={}),\n", - " Variable(0x5390b9830957db8b, X-averaged negative particle concentration, children=[], domain=['negative particle'], auxiliary_domains={'secondary': \"['current collector']\"}): Multiplication(0x60a162aa9d582fd0, *, children=['-1.0 / Negative particle radius [m] ** 2.0 / Negative electrode diffusivity [m2.s-1] / 96485.33289 * Maximum concentration in negative electrode [mol.m-3] * Negative electrode thickness [m] + Separator thickness [m] + Positive electrode thickness [m] / function (absolute)', 'div(-Negative electrode diffusivity [m2.s-1] / Negative electrode diffusivity [m2.s-1] * grad(X-averaged negative particle concentration))'], domain=['negative particle'], auxiliary_domains={'secondary': \"['current collector']\"}),\n", - " Variable(-0x585c98cab29114ca, X-averaged positive particle concentration, children=[], domain=['positive particle'], auxiliary_domains={'secondary': \"['current collector']\"}): Multiplication(0x4dd6d9b7567c6b92, *, children=['-1.0 / Positive particle radius [m] ** 2.0 / Positive electrode diffusivity [m2.s-1] / 96485.33289 * Maximum concentration in negative electrode [mol.m-3] * Negative electrode thickness [m] + Separator thickness [m] + Positive electrode thickness [m] / function (absolute)', 'div(-Positive electrode diffusivity [m2.s-1] / Positive electrode diffusivity [m2.s-1] * grad(X-averaged positive particle concentration))'], domain=['positive particle'], auxiliary_domains={'secondary': \"['current collector']\"})}" - ] - }, - "execution_count": 37, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "model.rhs" - ] - }, - { - "cell_type": "code", - "execution_count": 38, - "metadata": {}, - "outputs": [], - "source": [ - "params = []" - ] - }, - { - "cell_type": "code", - "execution_count": 39, - "metadata": {}, - "outputs": [], - "source": [ - "for value in model.rhs.values():\n", - " for symbol in value.pre_order():\n", - " if isinstance(symbol, (pybamm.Parameter, pybamm.FunctionParameter)) and symbol.name not in params:\n", - " params.append(symbol.name)" - ] - }, - { - "cell_type": "code", - "execution_count": 40, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "['Current function [A]',\n", - " 'Maximum concentration in negative electrode [mol.m-3]',\n", - " 'Negative electrode thickness [m]',\n", - " 'Separator thickness [m]',\n", - " 'Positive electrode thickness [m]',\n", - " 'Typical current [A]',\n", - " 'Number of electrodes connected in parallel to make a cell',\n", - " 'Electrode width [m]',\n", - " 'Electrode height [m]',\n", - " 'Negative particle radius [m]',\n", - " 'Negative electrode diffusivity [m2.s-1]',\n", - " 'Reference temperature [K]',\n", - " 'Ambient temperature [K]',\n", - " 'Positive particle radius [m]',\n", - " 'Positive electrode diffusivity [m2.s-1]']" - ] - }, - "execution_count": 40, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "params" - ] - }, - { - "cell_type": "code", - "execution_count": 41, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "" - ] - }, - "execution_count": 41, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "param = model.default_parameter_values\n", - "param.process_model(model)" - ] - }, - { - "cell_type": "code", - "execution_count": 45, - "metadata": {}, - "outputs": [], - "source": [ - "params_1 = []\n", - "for value in model.rhs.values():\n", - " for symbol in value.pre_order():\n", - " if isinstance(symbol, (pybamm.Parameter, pybamm.Scalar)) and symbol.name not in params_1:\n", - " params_1.append(symbol.name)" - ] - }, - { - "cell_type": "code", - "execution_count": 46, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "['Current function [A]',\n", - " 'Maximum concentration in negative electrode [mol.m-3]',\n", - " 'Negative electrode thickness [m]',\n", - " 'Separator thickness [m]',\n", - " 'Positive electrode thickness [m]',\n", - " 'Typical current [A]',\n", - " 'Number of electrodes connected in parallel to make a cell',\n", - " 'Electrode width [m]',\n", - " 'Electrode height [m]',\n", - " 'Negative particle radius [m]',\n", - " 'Negative electrode diffusivity [m2.s-1]',\n", - " 'Reference temperature [K]',\n", - " 'Ambient temperature [K]',\n", - " 'Positive particle radius [m]',\n", - " 'Positive electrode diffusivity [m2.s-1]']" - ] - }, - "execution_count": 46, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "params" - ] - }, - { - "cell_type": "code", - "execution_count": 47, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "['0.680616',\n", - " '96485.33289',\n", - " 'Maximum concentration in negative electrode [mol.m-3]',\n", - " 'Negative electrode thickness [m]',\n", - " 'Separator thickness [m]',\n", - " 'Positive electrode thickness [m]',\n", - " 'Typical current [A]',\n", - " 'Number of electrodes connected in parallel to make a cell',\n", - " 'Electrode width [m]',\n", - " 'Electrode height [m]',\n", - " '3600.0',\n", - " '1.0',\n", - " 'Negative particle radius [m]',\n", - " '2.0',\n", - " '3.9e-14',\n", - " '5144.0503687323135',\n", - " '0.0033540164346805303',\n", - " '298.15',\n", - " 'Reference temperature [K]',\n", - " 'Positive particle radius [m]',\n", - " '1e-13',\n", - " '2231.0529422488758']" - ] - }, - "execution_count": 47, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "params_1" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.6.9" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -} diff --git a/Untitled3.ipynb b/Untitled3.ipynb deleted file mode 100644 index 50f9d84ce4..0000000000 --- a/Untitled3.ipynb +++ /dev/null @@ -1,170 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "metadata": {}, - "outputs": [], - "source": [ - "import pybamm" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "metadata": {}, - "outputs": [], - "source": [ - "model = pybamm.lithium_ion.SPM()" - ] - }, - { - "cell_type": "code", - "execution_count": 3, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "[]" - ] - }, - "execution_count": 3, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "model.input_parameters" - ] - }, - { - "cell_type": "code", - "execution_count": 4, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "['Maximum concentration in negative electrode [mol.m-3]',\n", - " 'Negative electrode thickness [m]',\n", - " 'Separator thickness [m]',\n", - " 'Positive electrode thickness [m]',\n", - " 'Typical current [A]',\n", - " 'Number of electrodes connected in parallel to make a cell',\n", - " 'Electrode width [m]',\n", - " 'Electrode height [m]',\n", - " 'Negative particle radius [m]',\n", - " 'Reference temperature [K]',\n", - " 'Positive particle radius [m]',\n", - " 'Maximum concentration in positive electrode [mol.m-3]',\n", - " 'Cell capacity [A.h]',\n", - " 'Negative electrode active material volume fraction',\n", - " 'Positive electrode active material volume fraction',\n", - " 'Negative electrode surface area to volume ratio [m-1]',\n", - " 'Positive electrode surface area to volume ratio [m-1]',\n", - " 'Typical electrolyte concentration [mol.m-3]',\n", - " 'Initial temperature [K]',\n", - " 'Negative electrode Bruggeman coefficient (electrolyte)',\n", - " 'Separator Bruggeman coefficient (electrolyte)',\n", - " 'Positive electrode Bruggeman coefficient (electrolyte)',\n", - " 'Negative electrode Bruggeman coefficient (electrode)',\n", - " 'Separator Bruggeman coefficient (electrode)',\n", - " 'Positive electrode Bruggeman coefficient (electrode)',\n", - " 'Negative electrode electrons in reaction',\n", - " 'Positive electrode electrons in reaction',\n", - " 'Number of cells connected in series to make a battery',\n", - " 'Lower voltage cut-off [V]',\n", - " 'Upper voltage cut-off [V]']" - ] - }, - "execution_count": 4, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "[param.name for param in model.parameters]" - ] - }, - { - "cell_type": "code", - "execution_count": 5, - "metadata": {}, - "outputs": [], - "source": [ - "geometry = model.default_geometry" - ] - }, - { - "cell_type": "code", - "execution_count": 6, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "[Parameter(-0x6e62c48430b494e8, Negative electrode thickness [m], children=[], domain=[], auxiliary_domains={}),\n", - " Parameter(0x346cbed00339412f, Separator thickness [m], children=[], domain=[], auxiliary_domains={}),\n", - " Parameter(-0xc769984b89bbf4d, Positive electrode thickness [m], children=[], domain=[], auxiliary_domains={})]" - ] - }, - "execution_count": 6, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "geometry.parameters" - ] - }, - { - "cell_type": "code", - "execution_count": 7, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "" - ] - }, - "execution_count": 7, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "model.param" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.6.9" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -}