timflow 0.1.0__tar.gz → 0.2.0__tar.gz

{timflow-0.1.0 → timflow-0.2.0}/.github/workflows/ci-transient.yml

@@ -50,4 +50,4 @@ jobs:
 
       - name: Test benchmark notebooks
         run: |
-          uv run pytest --nbval-lax --cov-append --dist loadscope -n auto --ignore=docs/transient/05benchmarks/besselnumbanew_timing.ipynb docs/transient/05benchmarks/
+          uv run pytest --nbval-lax --cov-append --dist loadscope -n auto docs/transient/05benchmarks/

{timflow-0.1.0 → timflow-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: timflow
-Version: 0.1.0
+Version: 0.2.0
 Summary: Analytic element modeling of groundwater flow
 Author: Mark Bakker, Davíd Brakenhoff
 Maintainer-email: Mark Bakker <markbak@gmail.com>, Davíd Brakenhoff <d.brakenhoff@artesia-water.nl>
@@ -55,7 +55,10 @@ Requires-Dist: matplotlib
 Requires-Dist: pandas
 Provides-Extra: lint
 Requires-Dist: ruff; extra == "lint"
+Provides-Extra: parallel
+Requires-Dist: tqdm; extra == "parallel"
 Provides-Extra: optional
+Requires-Dist: timflow[parallel]; extra == "optional"
 Requires-Dist: lmfit; extra == "optional"
 Provides-Extra: ci
 Requires-Dist: timflow[lint,optional]; extra == "ci"
@@ -80,6 +83,7 @@ Dynamic: license-file
 
 <img src="./docs/_static/timflow_logo.jpeg" width="300">
 
+[![PyPI - Version](https://img.shields.io/pypi/v/timflow)](https://pypi.org/project/timflow/)
 [![General](https://github.com/timflow-org/timflow/actions/workflows/ci-general.yml/badge.svg)](https://github.com/timflow-org/timflow/actions/workflows/ci-general.yml)
 [![Steady](https://github.com/timflow-org/timflow/actions/workflows/ci-steady.yml/badge.svg)](https://github.com/timflow-org/timflow/actions/workflows/ci-steady.yml)
 [![Transient](https://github.com/timflow-org/timflow/actions/workflows/ci-transient.yml/badge.svg)](https://github.com/timflow-org/timflow/actions/workflows/ci-transient.yml)
@@ -92,7 +96,7 @@ Dynamic: license-file
 elements. The package is split into two main submodules: `timflow.steady` for steady-state flow
 and `timflow.transient` for modeling transient flow. Both modules may be applied to an
 arbitrary number of aquifers and leaky layers. The head, flow, and leakage between
-aquifers may be computed semi-analytically at any point in space and time. 
+aquifers may be computed semi-analytically at any point in space and time.
 
 The design
 of `timflow` is object-oriented and has been kept simple and flexible.
@@ -133,4 +137,5 @@ Some of the papers that you may want to cite when using `timflow` are:
   * M. Bakker. 2013. Semi-analytic modeling of transient multi-layer flow with TTim.
   Hydrogeology Journal, 21: 935-943. [https://doi.org/10.1007/s10040-013-0975-2](https://doi.org/10.1007/s10040-013-0975-2)
   * M .Bakker. 2013. Analytic modeling of transient multi-layer flow. In: Advances in
-  Hydrogeology, edited by P Mishra and K Kuhlman, Springer, Heidelberg, 95-114.
+  Hydrogeology, edited by P Mishra and K Kuhlman, Springer, Heidelberg, 95-114. Available [here](https://github.com/mbakker7/timflow/blob/master/papers/2013_bakker_ttim_theory.pdf).
+

{timflow-0.1.0 → timflow-0.2.0}/README.md

@@ -1,5 +1,6 @@
 <img src="./docs/_static/timflow_logo.jpeg" width="300">
 
+[![PyPI - Version](https://img.shields.io/pypi/v/timflow)](https://pypi.org/project/timflow/)
 [![General](https://github.com/timflow-org/timflow/actions/workflows/ci-general.yml/badge.svg)](https://github.com/timflow-org/timflow/actions/workflows/ci-general.yml)
 [![Steady](https://github.com/timflow-org/timflow/actions/workflows/ci-steady.yml/badge.svg)](https://github.com/timflow-org/timflow/actions/workflows/ci-steady.yml)
 [![Transient](https://github.com/timflow-org/timflow/actions/workflows/ci-transient.yml/badge.svg)](https://github.com/timflow-org/timflow/actions/workflows/ci-transient.yml)
@@ -12,7 +13,7 @@
 elements. The package is split into two main submodules: `timflow.steady` for steady-state flow
 and `timflow.transient` for modeling transient flow. Both modules may be applied to an
 arbitrary number of aquifers and leaky layers. The head, flow, and leakage between
-aquifers may be computed semi-analytically at any point in space and time. 
+aquifers may be computed semi-analytically at any point in space and time.
 
 The design
 of `timflow` is object-oriented and has been kept simple and flexible.
@@ -53,4 +54,5 @@ Some of the papers that you may want to cite when using `timflow` are:
   * M. Bakker. 2013. Semi-analytic modeling of transient multi-layer flow with TTim.
   Hydrogeology Journal, 21: 935-943. [https://doi.org/10.1007/s10040-013-0975-2](https://doi.org/10.1007/s10040-013-0975-2)
   * M .Bakker. 2013. Analytic modeling of transient multi-layer flow. In: Advances in
-  Hydrogeology, edited by P Mishra and K Kuhlman, Springer, Heidelberg, 95-114.
+  Hydrogeology, edited by P Mishra and K Kuhlman, Springer, Heidelberg, 95-114. Available [here](https://github.com/mbakker7/timflow/blob/master/papers/2013_bakker_ttim_theory.pdf).
+

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/00userguide/howtos/howto_convert_timml_model.ipynb

@@ -178,8 +178,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/00userguide/howtos/howto_select_a_model.ipynb

@@ -207,8 +207,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/00userguide/tutorials/tutorial0_well_single_layer_aquifer.ipynb

@@ -302,8 +302,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/00userguide/tutorials/tutorial1_well_multi_layer_aquifer.ipynb

@@ -260,8 +260,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/00_single_layer_model.ipynb

@@ -395,8 +395,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/01_well_in_uniform_flow.ipynb

@@ -225,8 +225,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/02_wells_rivers_and_recharge.ipynb

@@ -214,8 +214,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/03a_modeling_inhomogeneities.ipynb

@@ -421,8 +421,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/03b_modeling_inhomogeneities3D.ipynb

@@ -267,8 +267,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/04_horizontal_wells.ipynb

@@ -418,8 +418,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/05_impermeable_walls.ipynb

@@ -113,8 +113,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/building_pit.ipynb

@@ -670,8 +670,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/circular_area_sink.ipynb

@@ -52,7 +52,7 @@
    "source": [
     "qx = np.zeros_like(x)\n",
     "for i in range(len(x)):\n",
-    "    qx[i], qy = ml.disvec(x[i], 1e-6)\n",
+    "    qx[i : i + 1], qy = ml.disvec(x[i], 1e-6)\n",
     "plt.plot(x, qx)\n",
     "qxb = N * np.pi * R**2 / (2 * np.pi * R)\n",
     "plt.axhline(qxb, color=\"r\", ls=\"--\")\n",
@@ -152,8 +152,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/collector_wells.ipynb

@@ -380,8 +380,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/02examples/connected_wells.ipynb

@@ -28,9 +28,19 @@
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "\n",
+    "import timflow\n",
     "import timflow.steady as tfs"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "timflow.show_versions()"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -568,8 +578,7 @@
     "    levels=levels,\n",
     "    decimals=2,\n",
     "    layers=[ilay],\n",
-    "    newfig=False,\n",
-    "    linestyles=\"dashed\",\n",
+    "    linestyles=\"solid\",\n",
     "    color=\"C1\",\n",
     ")\n",
     "plt.plot(ws.xcp, ws.ycp, \"kx\");"
@@ -718,7 +727,7 @@
     "    decimals=2,\n",
     "    layers=[ilay],\n",
     "    newfig=False,\n",
-    "    linestyles=\"dashed\",\n",
+    "    linestyles=\"solid\",\n",
     "    color=\"C1\",\n",
     ")\n",
     "plt.plot(ws.xcp, ws.ycp, \"kx\");"
@@ -1161,8 +1170,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/03xsections/cross_section_models.ipynb

@@ -56,9 +56,22 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## 1D inhomogeneity\n",
+    "## Xsection elements\n",
     "\n",
-    "Three strips with semi-confined conditions on top of all three"
+    "Three strips with semi-confined conditions on top of all three can be modeled with the `XsectionMaq` element."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "<div class=\"alert alert-info\">\n",
+    "\n",
+    "<b>Note</b><br>\n",
+    "\n",
+    "A `ModelXsection` may consist of an arbitrary number of `Xsection3D` or `XsectionMaq` sections. The combined domain of all sections must span from $x = -\\infty$ to $x = +\\infty$, with no gaps.\n",
+    "\n",
+    "</div>"
    ]
   },
   {
@@ -512,8 +525,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/large_diameter_experimental.ipynb

@@ -97,8 +97,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_circular_buildingpit.ipynb

@@ -486,8 +486,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_linesink_discharge.ipynb

@@ -738,8 +738,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_linesinkstrings.ipynb

@@ -156,8 +156,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_normal_flux.ipynb

@@ -275,8 +275,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_polygon_areasink.ipynb

@@ -95,8 +95,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_well_near_lake.ipynb

@@ -51,8 +51,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_wells.ipynb

@@ -112,8 +112,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/steady/04benchmarks/test_wells_with_resistance.ipynb

@@ -379,8 +379,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/transient/00userguide/howtos/howto_convert_ttim_model.ipynb

@@ -24,7 +24,7 @@
     "\n",
     "and you don't want to make any other changes to your model, then replace the import statement by\n",
     "\n",
-    "```from timflow import transiewnt as ttim```\n",
+    "```from timflow import transient as ttim```\n",
     "\n",
     "or, if you like that better\n",
     "\n",
@@ -75,8 +75,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/transient/00userguide/howtos/howto_fluctuating_head_boundary.ipynb

@@ -141,21 +141,39 @@
    "source": [
     "mlbegin = tft.ModelXsection(naq=1, tmin=1e-4, tmax=1e2)\n",
     "xsection = tft.XsectionMaq(\n",
-    "    model=mlbegin, x1=-np.inf, x2=np.inf, kaq=k, z=[0, -H], Saq=S, phreatictop=True\n",
+    "    model=mlbegin,\n",
+    "    x1=-np.inf,\n",
+    "    x2=np.inf,\n",
+    "    kaq=k,\n",
+    "    z=[0, -H],\n",
+    "    Saq=S,\n",
+    "    topboundary=\"phreatic\",\n",
     ")\n",
     "lsriver = tft.River1D(model=mlbegin, xls=0, tsandh=list(zip(t, hbegin, strict=True)))\n",
     "mlbegin.solve(silent=True)\n",
     "#\n",
     "mlmid = tft.ModelXsection(naq=1, tmin=1e-4, tmax=1e2)\n",
     "xsection = tft.XsectionMaq(\n",
-    "    model=mlmid, x1=-np.inf, x2=np.inf, kaq=k, z=[0, -H], Saq=S, phreatictop=True\n",
+    "    model=mlmid,\n",
+    "    x1=-np.inf,\n",
+    "    x2=np.inf,\n",
+    "    kaq=k,\n",
+    "    z=[0, -H],\n",
+    "    Saq=S,\n",
+    "    topboundary=\"phreatic\",\n",
     ")\n",
     "lsriver = tft.River1D(model=mlmid, xls=0, tsandh=list(zip(tmid, hmid, strict=True)))\n",
     "mlmid.solve(silent=True)\n",
     "#\n",
     "mlend = tft.ModelXsection(naq=1, tmin=1e-4, tmax=1e2)\n",
     "xsection = tft.XsectionMaq(\n",
-    "    model=mlend, x1=-np.inf, x2=np.inf, kaq=k, z=[0, -H], Saq=S, phreatictop=True\n",
+    "    model=mlend,\n",
+    "    x1=-np.inf,\n",
+    "    x2=np.inf,\n",
+    "    kaq=k,\n",
+    "    z=[0, -H],\n",
+    "    Saq=S,\n",
+    "    topboundary=\"phreatic\",\n",
     ")\n",
     "lsriver = tft.River1D(model=mlend, xls=0, tsandh=list(zip(t, hend, strict=True)))\n",
     "mlend.solve(silent=True)"
@@ -236,8 +254,22 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
-   "name": "python"
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.13.5"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/transient/00userguide/howtos/howto_pumpingtest.ipynb

@@ -436,8 +436,10 @@
   }
  ],
  "metadata": {
-  "language_info": {
-   "name": "python"
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
   }
  },
  "nbformat": 4,

{timflow-0.1.0 → timflow-0.2.0}/docs/transient/00userguide/howtos/howto_select_a_model.ipynb

@@ -40,7 +40,7 @@
     "    c=[2000, 5000],\n",
     "    Saq=[0.1, 1e-4, 2e-4],\n",
     "    Sll=[1e-4, 4e-4],\n",
-    "    phreatictop=True,\n",
+    "    topboundary=\"phreatic\",\n",
     "    tmin=0.01,\n",
     "    tmax=10,\n",
     ")\n",
@@ -83,8 +83,22 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
-   "name": "python"
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.13.5"
   }
  },
  "nbformat": 4,