Merge pull request #120 from csdms/mdpiper/rearrange-lessons

Rearrange Python lessons
csdms · Aug 11, 2023 · 1510a49 · 1510a49
2 parents ff948f6 + 0513d96
commit 1510a49
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 18 deletions.
diff --git a/lessons/python/9_advection.ipynb → lessons/python/advection.ipynb b/lessons/python/9_advection.ipynb → lessons/python/advection.ipynb
@@ -382,7 +382,7 @@
     "$$\\frac{\\partial C}{\\partial t} = -v \\frac{\\partial C}{\\partial x} + D\\frac{\\delta^2 C}{\\delta x^2} \n",
     "\\label{eq:5}\\tag{5}$$\n",
     "\n",
-    "Copy-paste your script from the diffusion notebook. \n",
+    "Copy-paste your script from the [diffusion](./diffusion.ipynb) notebook. \n",
     "Adjust the script by adding advection.\n",
     "You can use the code derived in the previous blocks. \n",
     "\n",

diff --git a/lessons/python/4_arrays.ipynb → lessons/python/arrays.ipynb b/lessons/python/4_arrays.ipynb → lessons/python/arrays.ipynb
@@ -113,7 +113,7 @@
    "metadata": {},
    "source": [
     "NumPy arrays have an attribute\n",
-    "(this is an object-oriented programming term; more [later](7_oop.ipynb))\n",
+    "(this is an object-oriented programming term; more [later](oop.ipynb))\n",
     "called `shape` that provides the dimensions of an array.\n",
     "\n",
     "What is the shape of `a`?"
@@ -251,7 +251,7 @@
    "source": [
     "## Indexing\n",
     "\n",
-    "NumPy arrays can be indexed in the manner described in the first lesson on [variables](1_fundamentals.ipynb)."
+    "NumPy arrays can be indexed in the manner described in the first lesson on [variables](fundamentals.ipynb)."
    ]
   },
   {
@@ -866,10 +866,10 @@
     "\n",
     "The [NumPy documentation](https://numpy.org/doc/stable/index.html) contains just about anything you'll need to know about NumPy.\n",
     "\n",
-    "Last, although we deemphasize visualization here,\n",
+    "Although we deemphasize visualization in Ivy,\n",
     "it almost always really helps to visualize data.\n",
     "Data visualization is covered well in many other places,\n",
-    "but we do have a [notebook](./4a_plots.ipynb) demonstrating how to visualize the DEM data used here."
+    "but we do have a [notebook](./visualization.ipynb) demonstrating how to visualize the DEM data used here."
    ]
   }
  ],

diff --git a/lessons/python/8_diffusion.ipynb → lessons/python/diffusion.ipynb b/lessons/python/8_diffusion.ipynb → lessons/python/diffusion.ipynb
diff --git a/lessons/python/6_functions.ipynb → lessons/python/functions.ipynb b/lessons/python/6_functions.ipynb → lessons/python/functions.ipynb
@@ -13,7 +13,7 @@
    "source": [
     "# Functions\n",
     "\n",
-    "In the [diffusion](8_diffusion.ipynb) and [advection](9_advection.ipynb) notebooks,\n",
+    "In the [diffusion](diffusion.ipynb) and [advection](advection.ipynb) notebooks,\n",
     "we wrote code\n",
     "to solve the one-dimensional diffusion and advection equations numerically,\n",
     "evolve the solutions with time,\n",

diff --git a/lessons/python/1_fundamentals.ipynb → lessons/python/fundamentals.ipynb b/lessons/python/1_fundamentals.ipynb → lessons/python/fundamentals.ipynb
diff --git a/lessons/python/index.ipynb b/lessons/python/index.ipynb
@@ -85,25 +85,25 @@
    "source": [
     "## Topics\n",
     "\n",
-    "Before we dive into the solution of the advection-diffusion problem posed by the volcanic eruption, we need to cover a series of Python and general programming topics.\n",
+    "In addition to the solution of the advection-diffusion problem posed by the volcanic eruption, we will cover a series of Python and general programming topics.\n",
     "\n",
     "### Python Fundamentals\n",
     "\n",
-    "1. [Variables, indexing, and containers](1_fundamentals.ipynb)\n",
-    "1. [Libraries](2_libraries.ipynb)\n",
-    "1. [Loops, conditionals, and errors](3_more_fundamentals.ipynb)\n",
-    "1. [Arrays](4_arrays.ipynb)\n",
+    "1. [Variables, indexing, and containers](fundamentals.ipynb)\n",
+    "2. [Libraries](libraries.ipynb)\n",
+    "3. [Loops, conditionals, and errors](more_fundamentals.ipynb)\n",
+    "4. [Arrays](arrays.ipynb)\n",
     "\n",
-    "### Python Programming\n",
+    "### Scientific Programming: the Advection-Diffusion Equation\n",
     "\n",
-    "5. [Scripts](5_scripts.ipynb)\n",
-    "6. [Functions](6_functions.ipynb)\n",
-    "7. [A very basic introduction to object-oriented programming](7_oop.ipynb)\n",
+    "5. [Diffusion](diffusion.ipynb)\n",
+    "6. [Advection](advection.ipynb)\n",
     "\n",
-    "### Scientific Programming: the Advection-Diffusion Equation\n",
+    "### Programming with Python\n",
     "\n",
-    "8. [Diffusion](8_diffusion.ipynb)\n",
-    "9. [Advection](9_advection.ipynb)"
+    "5. [Functions](functions.ipynb)\n",
+    "6. [Modules, scripts, and the basics of packaging](modules.ipynb)\n",
+    "7. [An introduction to object-oriented programming](oop.ipynb)\n"
    ]
   }
  ],

diff --git a/lessons/python/2_libraries.ipynb → lessons/python/libraries.ipynb b/lessons/python/2_libraries.ipynb → lessons/python/libraries.ipynb
diff --git a/lessons/python/5_scripts.ipynb → lessons/python/modules.ipynb b/lessons/python/5_scripts.ipynb → lessons/python/modules.ipynb
diff --git a/lessons/python/3_more_fundamentals.ipynb → lessons/python/more_fundamentals.ipynb b/lessons/python/3_more_fundamentals.ipynb → lessons/python/more_fundamentals.ipynb
diff --git a/lessons/python/7_oop.ipynb → lessons/python/oop.ipynb b/lessons/python/7_oop.ipynb → lessons/python/oop.ipynb
@@ -209,6 +209,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# Uncomment the next line to try to create a Shape.\n",
     "# x = Shape()"
    ]
   },

diff --git a/lessons/python/7a_shapes.ipynb → lessons/python/shapes.ipynb b/lessons/python/7a_shapes.ipynb → lessons/python/shapes.ipynb
diff --git a/lessons/python/4a_plots.ipynb → lessons/python/visualization.ipynb b/lessons/python/4a_plots.ipynb → lessons/python/visualization.ipynb