Merge pull request #133 from csdms/bc/corrections

Adjust CFL formula

.github/workflows/test.yml

@@ -60,4 +60,4 @@ jobs:
       - name: Test
         env:
           MPLBACKEND: "Agg"
-        run: nox -s test-notebooks
+        run: nox -s test-notebooks --python "3.11"

lessons/python/advection.ipynb

@@ -167,7 +167,7 @@
     "- Wind speed `v = 10` m/s\n",
     "- Grid spacing `dx = 500` m (see previous code block)\n",
     "- Total model run duration = 3 hours\n",
-    "- Calculate time step `dt` using the CFL criterion: `dt = 0.9 * v / dx`\n",
+    "- Calculate time step `dt` using the CFL criterion: `dt = 0.9 * dx / abs(v)`\n",
     "- Periodic boundary conditions: the solution at the left boundary depends on the solution at the right boundary if velocity is positive and vice versa for negative velocities. \n",
     "- Plot the wave every 10^5 iterations \n",
     "\n",
@@ -190,7 +190,7 @@
     "    if v > 0:\n",
     "        # here comes the solution of the advection equation  \n",
     "    \n",
-    "    if iter % 1e5 == 0: \n",
+    "    if iter % 10 == 0: \n",
     "        plt.plot(x/1.e3, T, 'b') \n",
     "        plt.xlim((0, max(x/1e3)))\n",
     "        plt.xlabel('x (km)')\n",
@@ -211,7 +211,7 @@
     "# Set parameter values\n",
     "v = 10\n",
     "run_duration = 3 * 60 * 60.0\n",
-    "dt = 0.9 * v / dx\n",
+    "dt = 0.9 * dx / abs(v)\n",
     "print(f\"Time step = {dt} s\")"
    ]
   },
@@ -245,7 +245,7 @@
     "        T[1:] -= v * dt / dx * np.diff(T)\n",
     "        T[0] = T[-1]\n",
     "\n",
-    "    if iter % 1e5 == 0:\n",
+    "    if iter % 10 == 0:\n",
     "        plt.plot(x / 1.0e3, T, \"b\")\n",
     "        plt.xlim((0, max(x / 1e3)))\n",
     "        plt.xlabel(\"x (km)\")\n",
@@ -312,7 +312,7 @@
     "        T[:-1] -= v * dt / dx * np.diff(T)\n",
     "        T[-1] = T[0]\n",
     "\n",
-    "    if iter % 1e5 == 0:\n",
+    "    if iter % 10 == 0:\n",
     "        plt.plot(x / 1.0e3, T, \"r\")\n",
     "        plt.xlim((0, max(x / 1e3)))\n",
     "        plt.xlabel(\"x (km)\")\n",
@@ -390,7 +390,7 @@
     "- Assume an advection velocity of 10 km/h (that is, the wind speed at which ash aerosols are advected towards the continent)\n",
     "- Calculate the time step by combining the CFL criterium for advection (see above) and diffusion:\n",
     "~~~\n",
-    "dt_a = 0.9*v/dx\n",
+    "dt_a = 0.9*dx/v\n",
     "dt_d = dx*dx/D/2.5\n",
     "dt = min(dt_a,dt_d)\n",
     "print('dt is: ' + str(dt) + 'hours')\n",
@@ -445,7 +445,7 @@
     "plt.scatter(x[ind_Bru], C[ind_Bru], c=\"r\")\n",
     "\n",
     "# Calculate a stable time step\n",
-    "dt_a = 0.9 * v / dx\n",
+    "dt_a = 0.9 * dx / v\n",
     "dt_d = dx * dx / D / 2.5\n",
     "dt = min(dt_a, dt_d)\n",
     "print(\"dt is: \" + str(dt) + \"hours\")"
@@ -553,7 +553,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.11.0"
   }
  },
  "nbformat": 4,

noxfile.py

@@ -30,7 +30,7 @@ def test(session: nox.Session) -> None:
     session.run("pytest", *args)
 
 
-@nox.session(name="test-notebooks", venv_backend="mamba")
+@nox.session(name="test-notebooks", venv_backend="mamba", python="3.11")
 def test_notebooks(session: nox.Session) -> None:
     """Run the notebooks."""
     args = [