Updated pumping tests

docs/transient/04pumpingtests/confined1_oude_korendijk.ipynb

@@ -2,7 +2,13 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "# 1. Confined Aquifer Test - Oude Korendijk"
    ]
@@ -49,7 +55,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "<img src=\"./figs/oude_korendijk.png\" style=\"width:400pt\">\n"
+    "<img src=\"./figs/oude_korendijk.png\" style=\"width:400pt\">"
    ]
   },
   {
@@ -129,7 +135,7 @@
     "cal.set_parameter(name=\"Saq\", initial=1e-4, layers=0)\n",
     "cal.series(name=\"obs1\", x=ro1, y=0, t=to1, h=ho1, layer=0)  # Adding well 1\n",
     "cal.series(name=\"obs2\", x=ro2, y=0, t=to2, h=ho2, layer=0)  # Adding well 2\n",
-    "cal.fit(report=True)"
+    "cal.fit(report=False)"
    ]
   },
   {
@@ -138,14 +144,20 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "display(cal.parameters)\n",
-    "print(\"RMSE:\", cal.rmse())"
+    "display(cal.parameters.loc[:, [\"optimal\"]])\n",
+    "print(f\"RMSE: {cal.rmse():.3f} m\")"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "outputs": [],
    "source": [
     "hm1 = ml.head(ro1, 0, to1)\n",
@@ -155,8 +167,8 @@
     "plt.semilogx(to2, ho2, \"C1.\", label=\"obs at 90m\")\n",
     "plt.semilogx(to2, hm2[0], \"C1\", label=\"timflow at 90m\")\n",
     "plt.title(\"Model Results\")\n",
-    "plt.xlabel(\"time(d)\")\n",
-    "plt.ylabel(\"drawdown(m)\")\n",
+    "plt.xlabel(\"time (d)\")\n",
+    "plt.ylabel(\"head change (m)\")\n",
     "plt.legend()\n",
     "plt.grid()"
    ]
@@ -172,13 +184,21 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The performance of `timflow` was evaluated by comparison with AQTESOLV (Duffield, 2007), MLU (Carlson and Randall, 2012), and Kruseman and de Ridder (1970), here abbreviated to K&dR. Results from `timflow` and AQTESOLV are identical, those from MLU are very similar, while the solution of Kruseman and de Ridder shows small deviations."
+    "The performance of `timflow` was compared with AQTESOLV (Duffield, 2007), MLU (Carlson and Randall, 2012), and Kruseman and de Ridder (1970), here abbreviated to K&dR. Results from `timflow` and AQTESOLV are identical, those from MLU are very similar, while the solution of Kruseman and de Ridder shows small differences."
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": [
+     "hide-input"
+    ]
+   },
    "outputs": [],
    "source": [
     "t = pd.DataFrame(\n",
@@ -195,7 +215,7 @@
     "    {\n",
     "        \"k [m/d]\": \"{:.2f}\",\n",
     "        \"Ss [1/m]\": \"{:.2e}\",\n",
-    "        \"RMSE [m]\": lambda x: \"-\" if x == \"-\" else f\"{float(x):.2f}\",\n",
+    "        \"RMSE [m]\": lambda x: \"-\" if x == \"-\" else f\"{float(x):.3f}\",\n",
     "    }\n",
     ")\n",
     "t_formatted"

docs/transient/04pumpingtests/confined2_grindley.ipynb

@@ -43,7 +43,13 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "### Introduction and Conceptual Model"
    ]
@@ -58,14 +64,22 @@
     "tags": []
    },
    "source": [
-    "This example is a pumping test conducted in 1953 in Gridley, Illinois, US. It was reported by Walton (1962). The aquifer is an 18 ft thick sand and gravel layer under confined conditions. The pumping well fully penetrates the formation, and pumping was conducted for 8 hours at a rate of 220 gallons per minute. The effect of pumping was observed at observation well 1, located 824 ft away from the well.\n",
+    "This example is a pumping test conducted in 1953 in Gridley, Illinois, US. It was reported by Walton (1962). \n",
+    "\n",
+    "The aquifer is an 18 ft thick sand and gravel layer under confined conditions. The pumping well fully penetrates the formation, and pumping was conducted for 8 hours at a rate of 220 gallons per minute. The effect of pumping was observed at observation well 1, located 824 ft away from the well.\n",
     "\n",
     "The time-drawdown data for the observation well were obtained from the AQTESOLV documentation (Duffield, 2007), while data from the pumping well were obtained from the original paper from Walton (1962). Following AQTESOLV documentation (Duffield, 2007), radii of 0.5 ft were used for both the pumping and observation wells. "
    ]
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "<img src=\"./figs/gridley.png\" style=\"width:400pt\">"
    ]
@@ -201,7 +215,13 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "outputs": [],
    "source": [
     "# unknown parameters: kaq, Saq\n",
@@ -212,23 +232,35 @@
     "cal.set_parameter(name=\"Saq\", initial=1e-4, pmin=1e-7, layers=0)\n",
     "cal.series(name=\"obs1\", x=r, y=0, t=to1, h=ho1, layer=0)  # setting the observation data\n",
     "cal.seriesinwell(name=\"obs2\", element=w, t=to2, h=ho2)  # setting the observation data\n",
-    "cal.fit(report=True)"
+    "cal.fit(report=False)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "outputs": [],
    "source": [
-    "display(cal.parameters)\n",
-    "print(\"RMSE:\", cal.rmse())"
+    "display(cal.parameters.loc[:, [\"optimal\"]])\n",
+    "print(f\"RMSE: {cal.rmse():.3f} m\")"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "outputs": [],
    "source": [
     "hm1 = ml.head(r, 0, to1)\n",
@@ -239,7 +271,7 @@
     "plt.semilogx(to2, ho2, \"C1.\", label=\"obs well\")\n",
     "plt.title(\"Model Results\")\n",
     "plt.xlabel(\"time [d]\")\n",
-    "plt.ylabel(\"head [m]\")\n",
+    "plt.ylabel(\"head change [m]\")\n",
     "plt.legend()\n",
     "plt.grid()"
    ]
@@ -267,7 +299,7 @@
     "tags": []
    },
    "source": [
-    "The performance of `timflow` with two datasets simultaneously was evaluated by comparison with AQTESOLV (Duffield, 2007), and MLU (Carlson and Randall, 2012). Results from `timflow` with added wellbore storage and MLU are identical, while those from AQTESOLV show small deviations."
+    "The performance of `timflow` with two datasets simultaneously was compared with AQTESOLV (Duffield, 2007) and MLU (Carlson and Randall, 2012). Results from `timflow` with added wellbore storage and MLU are identical, while those from AQTESOLV show small differences."
    ]
   },
   {
@@ -293,7 +325,7 @@
     "t.loc[\"AQTESOLV\"] = [37.803, 1.356e-06, 0.270]\n",
     "\n",
     "t_formatted = t.style.format(\n",
-    "    {\"k [m/d]\": \"{:.2f}\", \"Ss [1/m]\": \"{:.2e}\", \"RMSE [m]\": \"{:.2f}\"}\n",
+    "    {\"k [m/d]\": \"{:.2f}\", \"Ss [1/m]\": \"{:.2e}\", \"RMSE [m]\": \"{:.3f}\"}\n",
     ")\n",
     "t_formatted"
    ]