Add unified calibration class

docs/steady/04benchmarks/test_polygon_areasink.ipynb

@@ -83,7 +83,7 @@
     "d2hdx2 = (ml.head(x + d, y) - 2 * ml.head(x, y) + ml.head(x - d, y)) / (d**2)\n",
     "d2hdy2 = (ml.head(x, y + d) - 2 * ml.head(x, y) + ml.head(x, y - d)) / (d**2)\n",
     "d2hdx2 + d2hdy2\n",
-    "aqin = ml.aq.inhomlist[0]\n",
+    "aqin = ml.aq.inhomdict[p1.name]\n",
     "print(\"recharge from numerical derivative: \", np.sum(aqin.T * (d2hdx2 + d2hdy2)))\n",
     "h = ml.head(x, y)\n",
     "print(\"leakage from aq0 to aq1 from head difference: \", (h[1] - h[0]) / aqin.c[1])\n",
@@ -92,6 +92,13 @@
     "    aqin.T[1] * (d2hdx2[1] + d2hdy2[1]),\n",
     ")"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

docs/transient/03xsections/1d_elements.ipynb

@@ -152,7 +152,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mlconf = tft.ModelMaq(kaq=k, z=[0, -H], Saq=Ss, tmin=1e-3, tmax=1e3, topboundary=\"conf\")\n",
+    "mlconf = tft.ModelMaq(kaq=k, z=[0, -H], Saq=Ss, tmin=1e-1, tmax=10, topboundary=\"conf\")\n",
     "ls = tft.LineSink1D(mlconf, tsandq=[(0, Q)], layers=[0])\n",
     "mlconf.solve()"
    ]
@@ -199,7 +199,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ml = tft.ModelMaq(kaq=k, z=[1, 0, -H], c=[10], tmin=1e-3, tmax=1e3, topboundary=\"semi\")\n",
+    "ml = tft.ModelMaq(kaq=k, z=[1, 0, -H], c=[10], tmin=1e-1, tmax=10, topboundary=\"semi\")\n",
     "ls = tft.LineSink1D(ml, tsandq=[(0, Q)], layers=[0])\n",
     "ml.solve()"
    ]

docs/transient/03xsections/1d_inhom_elements.ipynb

@@ -204,7 +204,7 @@
     "    ax1.plot(x, h[1].squeeze(), label=f\"t={t[i]:.0f} d\", ls=\"dashed\")\n",
     "\n",
     "hss = mlss.headalongline(x, y)\n",
-    "ax0.plot(x, hss[0].squeeze(), lw=1.5, color=\"k\", ls=\"dotted\", label=\"timflow\")\n",
+    "ax0.plot(x, hss[0].squeeze(), lw=1.5, color=\"k\", ls=\"dotted\", label=\"timflow.steady\")\n",
     "ax1.plot(x, hss[1].squeeze(), lw=1.5, color=\"k\", ls=\"dotted\")\n",
     "\n",
     "ax0.legend(loc=(0, 1), frameon=False, ncol=2)\n",
@@ -509,7 +509,7 @@
     "    -np.inf,\n",
     "    0.0,\n",
     "    kaq=k,\n",
-    "    Saq=Saq,\n",
+    "    Saq=S,\n",
     "    z=z,\n",
     "    c=c,\n",
     "    topboundary=\"semi\",\n",
@@ -520,7 +520,7 @@
     "    0.0,\n",
     "    np.inf,\n",
     "    kaq=k,\n",
-    "    Saq=Saq,\n",
+    "    Saq=S,\n",
     "    z=z,\n",
     "    c=c,\n",
     "    topboundary=\"semi\",\n",
@@ -538,13 +538,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mlss = tfs.ModelMaq(\n",
-    "    kaq=k,\n",
-    "    z=z,\n",
-    "    c=c,\n",
-    "    topboundary=\"semi\",\n",
-    "    hstar=0.0,\n",
-    ")\n",
+    "mlss = tfs.ModelXsection(naq=1)\n",
     "\n",
     "inhom_left_ss = tfs.XsectionMaq(\n",
     "    mlss,\n",
@@ -575,10 +569,20 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mlsemi.plots.xsection(\n",
+    "# plot transient xsec for parameters\n",
+    "ax = mlsemi.plots.xsection(\n",
     "    xy=[(-100, 0), (100, 0)],\n",
     "    params=True,\n",
     "    labels=False,\n",
+    "    hstar=np.nan,\n",
+    "    boundaries=False,\n",
+    ")\n",
+    "# plot steady to get correct representation of hstar\n",
+    "mlss.plots.xsection(\n",
+    "    xy=[(-100, 0), (100, 0)],\n",
+    "    params=False,\n",
+    "    labels=False,\n",
+    "    ax=ax,\n",
     ");"
    ]
   },