Skip to content

Commit

Permalink
Few updates for climlab API changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@brian-rose
brian-rose committed Jan 13, 2017
1 parent c9d9d0a commit 610f3a6
Show file tree
Hide file tree
Showing 8 changed files with 199 additions and 243 deletions.
25 changes: 9 additions & 16 deletions Lectures/Lecture01 -- Planetary energy budget.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,6 @@
"collapsed": false
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Compiling Akamaev_adjustment() with numba.\n"
]
},
{
"data": {
"application/json": {
Expand All @@ -365,40 +358,40 @@
},
{
"module": "OS",
"version": "Darwin 16.1.0 x86_64 i386 64bit"
"version": "Darwin 16.3.0 x86_64 i386 64bit"
},
{
"module": "numpy",
"version": "1.11.1"
},
{
"module": "climlab",
"version": "0.4.0"
"version": "0.4.2dev"
}
]
},
"text/html": [
"<table><tr><th>Software</th><th>Version</th></tr><tr><td>Python</td><td>2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)]</td></tr><tr><td>IPython</td><td>5.1.0</td></tr><tr><td>OS</td><td>Darwin 16.1.0 x86_64 i386 64bit</td></tr><tr><td>numpy</td><td>1.11.1</td></tr><tr><td>climlab</td><td>0.4.0</td></tr><tr><td colspan='2'>Fri Dec 09 15:50:21 2016 EST</td></tr></table>"
"<table><tr><th>Software</th><th>Version</th></tr><tr><td>Python</td><td>2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)]</td></tr><tr><td>IPython</td><td>5.1.0</td></tr><tr><td>OS</td><td>Darwin 16.3.0 x86_64 i386 64bit</td></tr><tr><td>numpy</td><td>1.11.1</td></tr><tr><td>climlab</td><td>0.4.2dev</td></tr><tr><td colspan='2'>Fri Jan 13 08:56:11 2017 EST</td></tr></table>"
],
"text/latex": [
"\\begin{tabular}{|l|l|}\\hline\n",
"{\\bf Software} & {\\bf Version} \\\\ \\hline\\hline\n",
"Python & 2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)] \\\\ \\hline\n",
"IPython & 5.1.0 \\\\ \\hline\n",
"OS & Darwin 16.1.0 x86\\_64 i386 64bit \\\\ \\hline\n",
"OS & Darwin 16.3.0 x86\\_64 i386 64bit \\\\ \\hline\n",
"numpy & 1.11.1 \\\\ \\hline\n",
"climlab & 0.4.0 \\\\ \\hline\n",
"\\hline \\multicolumn{2}{|l|}{Fri Dec 09 15:50:21 2016 EST} \\\\ \\hline\n",
"climlab & 0.4.2dev \\\\ \\hline\n",
"\\hline \\multicolumn{2}{|l|}{Fri Jan 13 08:56:11 2017 EST} \\\\ \\hline\n",
"\\end{tabular}\n"
],
"text/plain": [
"Software versions\n",
"Python 2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)]\n",
"IPython 5.1.0\n",
"OS Darwin 16.1.0 x86_64 i386 64bit\n",
"OS Darwin 16.3.0 x86_64 i386 64bit\n",
"numpy 1.11.1\n",
"climlab 0.4.0\n",
"Fri Dec 09 15:50:21 2016 EST"
"climlab 0.4.2dev\n",
"Fri Jan 13 08:56:11 2017 EST"
]
},
"execution_count": 2,
Expand Down
45 changes: 19 additions & 26 deletions Lectures/Lecture02 -- Solving the zero-dimensional EBM.ipynb
View file

Large diffs are not rendered by default.

33 changes: 13 additions & 20 deletions Lectures/Lecture03 -- Climate sensitivity and feedback.ipynb
View file

Large diffs are not rendered by default.

27 changes: 10 additions & 17 deletions Lectures/Lecture04 -- Climate system components.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
" "
],
"text/plain": [
"<IPython.lib.display.YouTubeVideo at 0x104513d50>"
"<IPython.lib.display.YouTubeVideo at 0x1068f9e10>"
]
},
"execution_count": 5,
Expand Down Expand Up @@ -520,13 +520,6 @@
"collapsed": false
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Compiling Akamaev_adjustment() with numba.\n"
]
},
{
"data": {
"application/json": {
Expand All @@ -541,40 +534,40 @@
},
{
"module": "OS",
"version": "Darwin 16.1.0 x86_64 i386 64bit"
"version": "Darwin 16.3.0 x86_64 i386 64bit"
},
{
"module": "numpy",
"version": "1.11.1"
},
{
"module": "climlab",
"version": "0.4.0"
"version": "0.4.2dev"
}
]
},
"text/html": [
"<table><tr><th>Software</th><th>Version</th></tr><tr><td>Python</td><td>2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)]</td></tr><tr><td>IPython</td><td>5.1.0</td></tr><tr><td>OS</td><td>Darwin 16.1.0 x86_64 i386 64bit</td></tr><tr><td>numpy</td><td>1.11.1</td></tr><tr><td>climlab</td><td>0.4.0</td></tr><tr><td colspan='2'>Fri Dec 09 15:49:56 2016 EST</td></tr></table>"
"<table><tr><th>Software</th><th>Version</th></tr><tr><td>Python</td><td>2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)]</td></tr><tr><td>IPython</td><td>5.1.0</td></tr><tr><td>OS</td><td>Darwin 16.3.0 x86_64 i386 64bit</td></tr><tr><td>numpy</td><td>1.11.1</td></tr><tr><td>climlab</td><td>0.4.2dev</td></tr><tr><td colspan='2'>Fri Jan 13 08:59:46 2017 EST</td></tr></table>"
],
"text/latex": [
"\\begin{tabular}{|l|l|}\\hline\n",
"{\\bf Software} & {\\bf Version} \\\\ \\hline\\hline\n",
"Python & 2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)] \\\\ \\hline\n",
"IPython & 5.1.0 \\\\ \\hline\n",
"OS & Darwin 16.1.0 x86\\_64 i386 64bit \\\\ \\hline\n",
"OS & Darwin 16.3.0 x86\\_64 i386 64bit \\\\ \\hline\n",
"numpy & 1.11.1 \\\\ \\hline\n",
"climlab & 0.4.0 \\\\ \\hline\n",
"\\hline \\multicolumn{2}{|l|}{Fri Dec 09 15:49:56 2016 EST} \\\\ \\hline\n",
"climlab & 0.4.2dev \\\\ \\hline\n",
"\\hline \\multicolumn{2}{|l|}{Fri Jan 13 08:59:46 2017 EST} \\\\ \\hline\n",
"\\end{tabular}\n"
],
"text/plain": [
"Software versions\n",
"Python 2.7.12 64bit [GCC 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)]\n",
"IPython 5.1.0\n",
"OS Darwin 16.1.0 x86_64 i386 64bit\n",
"OS Darwin 16.3.0 x86_64 i386 64bit\n",
"numpy 1.11.1\n",
"climlab 0.4.0\n",
"Fri Dec 09 15:49:56 2016 EST"
"climlab 0.4.2dev\n",
"Fri Jan 13 08:59:46 2017 EST"
]
},
"execution_count": 6,
Expand Down
27 changes: 10 additions & 17 deletions Lectures/Lecture05 -- Radiation.ipynb
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 610f3a6

Please sign in to comment.