Commit 1e3ce703 authored by Fabian Neumann's avatar Fabian Neumann

minor clarifications and updates in T5

parent c50c7922
......@@ -234,7 +234,7 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78c4d2b9b0>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee975a630>"
]
},
"execution_count": 10,
......@@ -440,7 +440,7 @@
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Time: 3.998594045639038\n",
" Time: 3.898280382156372\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
......@@ -638,7 +638,7 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78c04b8b38>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4f55c18>"
]
},
"execution_count": 19,
......@@ -774,7 +774,7 @@
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Time: 8.340548753738403\n",
" Time: 7.731746435165405\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
......@@ -939,7 +939,7 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78c16755c0>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee6148748>"
]
},
"execution_count": 26,
......@@ -1002,7 +1002,7 @@
},
{
"cell_type": "code",
"execution_count": 29,
"execution_count": 28,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1079,7 +1079,7 @@
"2012-01-01 04:00:00 0.0 0.641201"
]
},
"execution_count": 29,
"execution_count": 28,
"metadata": {},
"output_type": "execute_result"
}
......@@ -1091,7 +1091,7 @@
},
{
"cell_type": "code",
"execution_count": 30,
"execution_count": 29,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1101,10 +1101,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78c1675860>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee623d2e8>"
]
},
"execution_count": 30,
"execution_count": 29,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1127,7 +1127,7 @@
},
{
"cell_type": "code",
"execution_count": 31,
"execution_count": 30,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -1151,7 +1151,7 @@
" dtype='datetime64[ns]', name='name', length=744, freq=None)"
]
},
"execution_count": 31,
"execution_count": 30,
"metadata": {},
"output_type": "execute_result"
}
......@@ -1162,7 +1162,7 @@
},
{
"cell_type": "code",
"execution_count": 32,
"execution_count": 31,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1175,7 +1175,7 @@
},
{
"cell_type": "code",
"execution_count": 33,
"execution_count": 32,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1193,7 +1193,7 @@
},
{
"cell_type": "code",
"execution_count": 34,
"execution_count": 33,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1222,7 +1222,7 @@
},
{
"cell_type": "code",
"execution_count": 35,
"execution_count": 34,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1279,7 +1279,7 @@
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Time: 8.114485740661621\n",
" Time: 8.02032470703125\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
......@@ -1294,7 +1294,7 @@
"('ok', 'optimal')"
]
},
"execution_count": 35,
"execution_count": 34,
"metadata": {},
"output_type": "execute_result"
}
......@@ -1316,7 +1316,7 @@
},
{
"cell_type": "code",
"execution_count": 36,
"execution_count": 35,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1329,7 +1329,7 @@
"525.895790860553"
]
},
"execution_count": 36,
"execution_count": 35,
"metadata": {},
"output_type": "execute_result"
}
......@@ -1341,7 +1341,7 @@
},
{
"cell_type": "code",
"execution_count": 37,
"execution_count": 36,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1356,7 +1356,7 @@
"Name: p_nom_opt, dtype: float64"
]
},
"execution_count": 37,
"execution_count": 36,
"metadata": {},
"output_type": "execute_result"
}
......@@ -1369,7 +1369,7 @@
},
{
"cell_type": "code",
"execution_count": 38,
"execution_count": 37,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1391,7 +1391,7 @@
"Name: p_nom_opt, dtype: float64"
]
},
"execution_count": 38,
"execution_count": 37,
"metadata": {},
"output_type": "execute_result"
}
......@@ -1404,7 +1404,7 @@
},
{
"cell_type": "code",
"execution_count": 39,
"execution_count": 38,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1421,7 +1421,7 @@
"Name: e_nom_opt, dtype: float64"
]
},
"execution_count": 39,
"execution_count": 38,
"metadata": {},
"output_type": "execute_result"
}
......@@ -1434,7 +1434,7 @@
},
{
"cell_type": "code",
"execution_count": 40,
"execution_count": 39,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1444,10 +1444,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78bfd405f8>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4855e48>"
]
},
"execution_count": 40,
"execution_count": 39,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1470,7 +1470,7 @@
},
{
"cell_type": "code",
"execution_count": 41,
"execution_count": 40,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1480,10 +1480,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78bfdfab00>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee49060f0>"
]
},
"execution_count": 41,
"execution_count": 40,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1520,7 +1520,7 @@
},
{
"cell_type": "code",
"execution_count": 42,
"execution_count": 41,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1539,7 +1539,7 @@
},
{
"cell_type": "code",
"execution_count": 43,
"execution_count": 42,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1562,7 +1562,7 @@
},
{
"cell_type": "code",
"execution_count": 44,
"execution_count": 43,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1591,7 +1591,7 @@
},
{
"cell_type": "code",
"execution_count": 45,
"execution_count": 44,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1601,10 +1601,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78bff63358>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4a5e240>"
]
},
"execution_count": 45,
"execution_count": 44,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1628,7 +1628,7 @@
},
{
"cell_type": "code",
"execution_count": 46,
"execution_count": 45,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1638,10 +1638,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78bffd6860>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4af0198>"
]
},
"execution_count": 46,
"execution_count": 45,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1665,7 +1665,7 @@
},
{
"cell_type": "code",
"execution_count": 47,
"execution_count": 46,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1675,10 +1675,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78c0dee4e0>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4b2fa90>"
]
},
"execution_count": 47,
"execution_count": 46,
"metadata": {},
"output_type": "execute_result"
},
......
......@@ -28,7 +28,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 1,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -57,7 +57,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 2,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -123,7 +123,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 3,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -133,10 +133,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fba94945160>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f09f5771fd0>"
]
},
"execution_count": 6,
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
},
......@@ -197,7 +197,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 4,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -240,7 +240,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 5,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -289,7 +289,7 @@
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Time: 0.18898773193359375\n",
" Time: 0.1875760555267334\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
......@@ -304,7 +304,7 @@
"('ok', 'optimal')"
]
},
"execution_count": 8,
"execution_count": 5,
"metadata": {},
"output_type": "execute_result"
}
......@@ -326,7 +326,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 6,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -339,7 +339,7 @@
"14706.193806194"
]
},
"execution_count": 9,
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
......@@ -361,7 +361,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 7,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -377,7 +377,7 @@
"Name: p_nom_opt, dtype: float64"
]
},
"execution_count": 10,
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
......@@ -411,7 +411,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 8,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -422,10 +422,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fba91c55860>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f09f2a4c0b8>"
]
},
"execution_count": 11,
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
},
......@@ -459,7 +459,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 9,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -470,10 +470,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fba91c85e10>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f09f2a33d30>"
]
},
"execution_count": 12,
"execution_count": 9,
"metadata": {},
"output_type": "execute_result"
},
......@@ -507,7 +507,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 10,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -518,10 +518,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7fba92018128>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f09f2aa7550>"
]
},
"execution_count": 13,
"execution_count": 10,
"metadata": {},
"output_type": "execute_result"
},
......@@ -567,7 +567,7 @@
},
{
"cell_type": "code",
"execution_count": 20,
"execution_count": 11,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -583,7 +583,7 @@
"dtype: float64"
]
},
"execution_count": 20,
"execution_count": 11,
"metadata": {},
"output_type": "execute_result"
}
......@@ -608,7 +608,7 @@
},
{
"cell_type": "code",
"execution_count": 21,
"execution_count": 12,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -624,7 +624,7 @@
"dtype: float64"
]
},
"execution_count": 21,
"execution_count": 12,
"metadata": {},
"output_type": "execute_result"
}
......@@ -638,7 +638,7 @@
},
{
"cell_type": "code",
"execution_count": 23,
"execution_count": 13,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -654,7 +654,7 @@
"dtype: int64"
]
},
"execution_count": 23,
"execution_count": 13,
"metadata": {},
"output_type": "execute_result"
}
......
......@@ -75,8 +75,6 @@
"\n",
"* The marginal costs are illustrative, not accurate.\n",
"\n",
"* Only the first day of 2011 is in the github dataset, which is not representative. The full year of 2011 can be downloaded [here](http://www.pypsa.org/examples/scigrid-with-load-gen-trafos-2011.zip).\n",
"\n",
"* The ENTSO-E total load for Germany may not be scaled correctly; it is scaled up uniformly by factor 1.12 (a simplification of the methodology in Schumacher, Hirth (2015), which suggests monthly factors).\n",
"\n",
"* Biomass from the EEG Stammdaten are not read in at the moment.\n",
......@@ -98,7 +96,7 @@
},
{
"cell_type": "code",
"execution_count": 105,
"execution_count": 52,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -138,12 +136,12 @@
}
},
"source": [
"Some general settings (You may have to adjust this path to where you downloaded the network data!):"
"Some general settings:"
]
},
{
"cell_type": "code",
"execution_count": 106,
"execution_count": 53,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -170,7 +168,7 @@
},
{
"cell_type": "code",
"execution_count": 107,
"execution_count": 54,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -190,7 +188,7 @@
},
{
"cell_type": "code",
"execution_count": 108,
"execution_count": 55,
"metadata": {},
"outputs": [],
"source": [
......@@ -220,7 +218,7 @@
},
{
"cell_type": "code",
"execution_count": 137,
"execution_count": 56,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -257,7 +255,7 @@
},
{
"cell_type": "code",
"execution_count": 110,
"execution_count": 57,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -267,6 +265,7 @@
"source": [
"network.lines[\"s_nom_original\"] = network.lines.s_nom\n",
"\n",
"# extendable, but no reduction of line capacities\n",
"network.lines.s_nom_extendable = True\n",
"network.lines.s_nom_min = network.lines.s_nom\n",
"\n",
......@@ -286,7 +285,7 @@
},
{
"cell_type": "code",
"execution_count": 136,
"execution_count": 58,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -306,7 +305,7 @@
},
"source": [
"***\n",
"## (a) Describe the nework as well as its regio