From 39e4efd5926f80264949db100a6157b29e0fd0c1 Mon Sep 17 00:00:00 2001 From: margauxmouchene Date: Tue, 27 Feb 2018 10:04:40 -0700 Subject: [PATCH 1/3] Add warning: developer install is needed to run this tuto as component is not included in latest release, correct minor typo --- .../TLHDiff_tutorial.ipynb | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb b/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb index 56b6788..b4b50e0 100644 --- a/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb +++ b/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb @@ -29,7 +29,15 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "This ipython notebook illustrtes running the transport-length-model hillslope diffusion component in a simple example.\n", + "# WARNING:\n", + "**Some components used in this tutorial are not included in the latest release of Landlab. You need to do the [developer install](https://github.com/landlab/landlab/wiki/Installing-Landlab-from-source-code-(%22developer-install%22) to use them and run this tutorial.**" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "This ipython notebook illustrates running the transport-length-model hillslope diffusion component in two simple examples.\n", "\n", "# The basics:\n", "\n", @@ -128,9 +136,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "import numpy as np\n", @@ -154,9 +160,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "mg = RasterModelGrid((100, 100), 10.) # raster grid with 100 rows, 100 columns and dx=10m\n", @@ -176,9 +180,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "total_t = 2000000. # total run time (yr)\n", @@ -201,9 +203,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "fdir = FlowDirectorSteepest(mg)\n", @@ -323,9 +323,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "total_t = 1000000. # total run time (yr)\n", @@ -343,9 +341,7 @@ { "cell_type": "code", "execution_count": null, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "fdir = FlowDirectorSteepest(mg2)\n", @@ -429,9 +425,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python [conda root]", + "display_name": "Python 3", "language": "python", - "name": "conda-root-py" + "name": "python3" }, "language_info": { "codemirror_mode": { @@ -443,7 +439,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.4" + "version": "3.6.2" } }, "nbformat": 4, From ceab2f80bf37017d8809675627acf2d8111712d4 Mon Sep 17 00:00:00 2001 From: margauxmouchene Date: Tue, 27 Feb 2018 11:07:12 -0700 Subject: [PATCH 2/3] Revert "Add warning: developer install is needed to run this tuto as component is not included in latest release, correct minor typo" This reverts commit 39e4efd5926f80264949db100a6157b29e0fd0c1. --- .../TLHDiff_tutorial.ipynb | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb b/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb index b4b50e0..56b6788 100644 --- a/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb +++ b/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb @@ -29,15 +29,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# WARNING:\n", - "**Some components used in this tutorial are not included in the latest release of Landlab. You need to do the [developer install](https://github.com/landlab/landlab/wiki/Installing-Landlab-from-source-code-(%22developer-install%22) to use them and run this tutorial.**" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "This ipython notebook illustrates running the transport-length-model hillslope diffusion component in two simple examples.\n", + "This ipython notebook illustrtes running the transport-length-model hillslope diffusion component in a simple example.\n", "\n", "# The basics:\n", "\n", @@ -136,7 +128,9 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "collapsed": true + }, "outputs": [], "source": [ "import numpy as np\n", @@ -160,7 +154,9 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "collapsed": true + }, "outputs": [], "source": [ "mg = RasterModelGrid((100, 100), 10.) # raster grid with 100 rows, 100 columns and dx=10m\n", @@ -180,7 +176,9 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "collapsed": true + }, "outputs": [], "source": [ "total_t = 2000000. # total run time (yr)\n", @@ -203,7 +201,9 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "collapsed": true + }, "outputs": [], "source": [ "fdir = FlowDirectorSteepest(mg)\n", @@ -323,7 +323,9 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "collapsed": true + }, "outputs": [], "source": [ "total_t = 1000000. # total run time (yr)\n", @@ -341,7 +343,9 @@ { "cell_type": "code", "execution_count": null, - "metadata": {}, + "metadata": { + "collapsed": true + }, "outputs": [], "source": [ "fdir = FlowDirectorSteepest(mg2)\n", @@ -425,9 +429,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python [conda root]", "language": "python", - "name": "python3" + "name": "conda-root-py" }, "language_info": { "codemirror_mode": { @@ -439,7 +443,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.2" + "version": "3.5.4" } }, "nbformat": 4, From f42c82a71c46d9edda514e01ba8ff84614915f04 Mon Sep 17 00:00:00 2001 From: margauxmouchene Date: Tue, 27 Feb 2018 15:03:16 -0700 Subject: [PATCH 3/3] Add warning, correct minor typo add warning: developer install is needed to run this tuto as component is not included in latest release, --- .../TLHDiff_tutorial.ipynb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb b/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb index 56b6788..930b533 100644 --- a/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb +++ b/transport-length_hillslope_diffuser/TLHDiff_tutorial.ipynb @@ -25,6 +25,14 @@ "
" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# WARNING\n", + "**Some components used in this tutorial are not included in the latest release of Landlab. You need to do the [developer install](https://github.com/landlab/landlab/wiki/Installing-Landlab-from-source-code-(%22developer-install%22) to use them and run this tutorial.**" + ] + }, { "cell_type": "markdown", "metadata": {},