timflow 0.2.0__tar.gz → 0.4.0__tar.gz

{timflow-0.2.0 → timflow-0.4.0}/.readthedocs.yaml

@@ -20,7 +20,6 @@ sphinx:
 
 python:
   install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - docs
+    - method: uv
+      command: sync
+      extras: ["docs"]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: timflow
-Version: 0.2.0
+Version: 0.4.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>
@@ -77,6 +77,7 @@ Requires-Dist: numpydoc; extra == "docs"
 Requires-Dist: myst_nb; extra == "docs"
 Requires-Dist: sphinxcontrib-bibtex; extra == "docs"
 Requires-Dist: sphinx-autoapi; extra == "docs"
+Requires-Dist: jupyter-cache; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: timflow[docs]; extra == "dev"
 Dynamic: license-file
@@ -137,5 +138,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. Available [here](https://github.com/mbakker7/timflow/blob/master/papers/2013_bakker_ttim_theory.pdf).
+  Hydrogeology, edited by P Mishra and K Kuhlman, Springer, Heidelberg, 95-114. Available [here](https://github.com/timflow-org/timflow/blob/main/papers/2013_bakker_ttim_theory.pdf).
 

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

@@ -54,5 +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. Available [here](https://github.com/mbakker7/timflow/blob/master/papers/2013_bakker_ttim_theory.pdf).
+  Hydrogeology, edited by P Mishra and K Kuhlman, Springer, Heidelberg, 95-114. Available [here](https://github.com/timflow-org/timflow/blob/main/papers/2013_bakker_ttim_theory.pdf).
 

{timflow-0.2.0 → timflow-0.4.0}/docs/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
-SPHINXOPTS    ?=
+SPHINXOPTS    ?= -j auto
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = _build

{timflow-0.2.0 → timflow-0.4.0}/docs/_templates/autoapi/index.rst

@@ -2,7 +2,7 @@ API Reference
 =============
 
 This section contains the Documentation of the Application Programming Interface (API)
-of Pastas. The information in this section is automatically created from the
+of timflow. The information in this section is automatically created from the
 documentation strings in original Python code. In the left-hand menu you will find the
 different categories of the API documentation.
 

timflow-0.4.0/docs/_templates/autoapi/python/class.rst

@@ -0,0 +1,104 @@
+{% if obj.display %}
+   {% if is_own_page %}
+{{ obj.short_name }}
+{{ "=" * obj.short_name | length }}
+
+   {% endif %}
+   {% set visible_children = obj.children|selectattr("display")|list %}
+   {% set own_page_children = visible_children|selectattr("type", "in", own_page_types)|list %}
+   {% if is_own_page and own_page_children %}
+.. toctree::
+   :hidden:
+
+      {% for child in own_page_children %}
+   {{ child.include_path }}
+      {% endfor %}
+
+   {% endif %}
+.. py:{{ obj.type }}:: {% if is_own_page %}{{ obj.id }}{% else %}{{ obj.short_name }}{% endif %}{% if obj.type_params %}[{{ obj.type_params }}]{% endif %}{% if obj.args %}({{ obj.args }}){% endif %}
+
+   {% for (args, return_annotation) in obj.overloads %}
+      {{ " " * (obj.type | length) }}   {{ obj.short_name }}{% if args %}({{ args }}){% endif %}
+
+   {% endfor %}
+   {% if obj.bases %}
+      {% if "show-inheritance" in autoapi_options %}
+
+   Bases: {% for base in obj.bases %}{{ base|link_objs }}{% if not loop.last %}, {% endif %}{% endfor %}
+      {% endif %}
+
+
+      {% if "show-inheritance-diagram" in autoapi_options and obj.bases != ["object"] %}
+   .. autoapi-inheritance-diagram:: {{ obj.obj["full_name"] }}
+      :parts: 1
+         {% if "private-members" in autoapi_options %}
+      :private-bases:
+         {% endif %}
+
+      {% endif %}
+   {% endif %}
+   {% if obj.docstring %}
+
+   {{ obj.docstring|indent(3) }}
+   {% endif %}
+   {% for obj_item in visible_children %}
+      {% if obj_item.type not in own_page_types %}
+
+   {{ obj_item.render()|indent(3) }}
+      {% endif %}
+   {% endfor %}
+   {% if is_own_page and own_page_children %}
+      {% set visible_attributes = own_page_children|selectattr("type", "equalto", "attribute")|list %}
+      {% if visible_attributes %}
+Attributes
+----------
+
+.. autoapisummary::
+
+         {% for attribute in visible_attributes %}
+   {{ attribute.id }}
+         {% endfor %}
+
+
+      {% endif %}
+      {% set visible_exceptions = own_page_children|selectattr("type", "equalto", "exception")|list %}
+      {% if visible_exceptions %}
+Exceptions
+----------
+
+.. autoapisummary::
+
+         {% for exception in visible_exceptions %}
+   {{ exception.id }}
+         {% endfor %}
+
+
+      {% endif %}
+      {% set visible_classes = own_page_children|selectattr("type", "equalto", "class")|list %}
+      {% if visible_classes %}
+Classes
+-------
+
+.. autoapisummary::
+
+         {% for klass in visible_classes %}
+   {{ klass.id }}
+         {% endfor %}
+
+
+      {% endif %}
+      {% set visible_methods = own_page_children|selectattr("type", "equalto", "method")|list %}
+      {% if visible_methods %}
+Methods
+-------
+
+.. autoapisummary::
+
+            {% for method in visible_methods %}
+   {{ method.id }}
+            {% endfor %}
+
+
+      {% endif %}
+   {% endif %}
+{% endif %}

{timflow-0.2.0 → timflow-0.4.0}/docs/about/index.rst

@@ -11,8 +11,8 @@ Steady flow
 .. bibliography:: publications.bib
     :list: bullet
 
-    bakker_semi-analytic_2013
-    bakker_analytic_2013
+    bakker2003
+    bakker_analytic_2006
 
 Transient flow
 --------------

{timflow-0.2.0 → timflow-0.4.0}/docs/conf.py

@@ -31,7 +31,7 @@ extensions = [
 ]
 
 # templates_path = ["_templates"]
-exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
+exclude_patterns = ["_build", "_templates", "Thumbs.db", ".DS_Store"]
 
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
@@ -79,8 +79,16 @@ autoapi_options = [
     "inherited-members",
     "show-inheritance",
 ]
-autoapi_own_page_level = "method"
+autoapi_own_page_level = "class"
 autoapi_template_dir = "_templates/autoapi"
+suppress_warnings = ["autoapi"]
+
+# Keep API signatures and section navigation compact by omitting module prefixes
+# (e.g., show `River` instead of `timflow.steady.linesink.River`).
+add_module_names = False
+
+# Keep local object TOC entries compact in the right sidebar.
+toc_object_entries_show_parents = "hide"
 
 # -- Numpydoc settings ----------------------------------------------------------------
 
@@ -99,31 +107,22 @@ intersphinx_mapping = {
 
 # -- myst_nb options ------------------------------------------------------------------
 
+nb_execution_mode = "cache"
+
 nb_execution_allow_errors = True  # Allow errors in notebooks, to see the error online
-nb_execution_mode = "auto"
-nb_merge_streams = True
+nb_execution_show_tb = True
+nb_execution_timeout = 100
 nb_execution_excludepatterns = [
     "besselnumba_timing.ipynb",
     "vertical_anisotropy.ipynb",
+    "transient/04pumpingtests/*.ipynb",
 ]
 
 myst_enable_extensions = ["dollarmath", "amsmath", "html_image"]
 myst_dmath_double_inline = True
-nb_render_markdown_format = "myst"  # Enable MyST markdown parsing in notebooks
-nb_render_text_lexer = "myst-ansi"  # Better rendering of ANSI output
-# nb_mime_priority_overrides = {
-#     "html": (
-#         "application/vnd.jupyter.widget-view+json",
-#         "application/javascript",
-#         "text/html",
-#         "image/svg+xml",
-#         "image/png",
-#         "image/jpeg",
-#         "text/markdown",
-#         "text/latex",
-#         "text/plain",
-#     )
-# }
+
+nb_merge_streams = True
+
 
 # -- bibtex options ------------------------------------------------------------------
 

{timflow-0.2.0 → timflow-0.4.0}/docs/index.rst

@@ -54,5 +54,7 @@ view the code documentation.
 
    Steady <steady/index>
    Transient <transient/index>
+   Utilities <utils/index>
    Code Reference <api/index>
+   Timings <timings>
    Cite <about/index>

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

@@ -114,7 +114,7 @@
    "id": "c00eb393-d11b-450a-acab-32192e688745",
    "metadata": {},
    "source": [
-    "The same procedure holds for combining other plots. For example combining two contour plots, or a contour plot plus a capture zone. Note that the `plotcapzone` function has moved to the `plots` module. All three can be combined as follows"
+    "The same procedure holds for combining other plots. For example combining two contour plots, or a contour plot plus a capture zone. Note that the `plot_capture_zone` function has moved to the `plots` module. All three can be combined as follows"
    ]
   },
   {
@@ -125,7 +125,7 @@
    "outputs": [],
    "source": [
     "ax0 = ml.plots.contour(win=[-1000, 100, -500, 500], ngr=50, levels=10, labels=False)\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w, nt=10, zstart=[1], hstepmax=20, tmax=10 * 365, color=\"C1\", ax=ax0\n",
     ")\n",
     "ml.plots.contour(win=[-1000, 100, -500, 500], ngr=50, levels=[40], color=\"k\", ax=ax0);"

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

@@ -75,7 +75,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ax = ml.plots.xsection(params=True, labels=True, units={\"k\": \"m/d\", \"c\": \"d\"})\n",
+    "ax = ml.plots.xsection(params=True, labels=True, units={\"kaq\": \"m/d\", \"c\": \"d\"})\n",
     "ax.set_frame_on(False)"
    ]
   },
@@ -134,7 +134,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ax = ml.plots.xsection(params=True, labels=True, units={\"k\": \"m/d\", \"c\": \"d\"})\n",
+    "ax = ml.plots.xsection(params=True, labels=True, units={\"kaq\": \"m/d\"})\n",
     "ax.set_frame_on(False)"
    ]
   },
@@ -179,7 +179,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ax = ml.plots.xsection(params=True, labels=True, units={\"k\": \"m/d\", \"c\": \"d\"})\n",
+    "ax = ml.plots.xsection(params=True, labels=True, units={\"kaq\": \"m/d\", \"c\": \"d\"})\n",
     "ax.set_frame_on(False)"
    ]
   },

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

@@ -275,7 +275,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Alternatively, a capture zone may be computed with the `plotcapzone` function by starting pathlines at the well radius and tracing the pathlines against the flow. The number of pathlines must be specified and the maximum time, which is specified as 20 years here, but since the time units are days, we specify the number of days. "
+    "Alternatively, a capture zone may be computed with the `plot_capture_zone` function by starting pathlines at the well radius and tracing the pathlines against the flow. The number of pathlines must be specified and the maximum time, which is specified as 20 years here, but since the time units are days, we specify the number of days. "
    ]
   },
   {
@@ -291,7 +291,7 @@
     "    labels=False,\n",
     "    figsize=(5, 5),\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w,\n",
     "    nt=20,  # number of pathlines\n",
     "    tmax=20 * 365.25,  # maximum time, d\n",

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

@@ -250,13 +250,6 @@
     "    ax=axes,\n",
     ")"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

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

@@ -106,7 +106,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "After the well is added (or any other elements), the model needs to be solved again. A contour plot is created and a 10 strace line are added. The stepsize is given in meters and represents the largest space step that is taken, but it is reduced when certain accuracy constraints are not met. Note that, after running the code cell below, for each trace line it is printed to the screen what the reason was that the traceline was aborted. In this case it was either because the trace line reached a well or reached the maximum number of steps (the default is 100 steps, but this can be changed by specifying the `nstepmax` keyword).  "
+    "After the well is added (or any other elements), the model needs to be solved again. A contour plot is created and a trace line is added. The stepsize is given in meters and represents the largest space step that is taken, but it is reduced when certain accuracy constraints are not met. Note that, after running the code cell below, a message is printed to the screen with the reason why the traceline was aborted. In this case it was because the trace line reached the well. The message an be suppressed by with the keyword `silent=True` or the default `silent='.'`. "
    ]
   },
   {
@@ -120,8 +120,38 @@
     "    win=[-1000, 100, -500, 500], ngr=50, levels=np.arange(39, 42, 0.1), figsize=(6, 6)\n",
     ")\n",
     "ml.plots.tracelines(\n",
-    "    -800 * np.ones(1), -200 * np.ones(1), np.zeros(1), hstepmax=20, color=\"C1\", ax=ax\n",
-    ")"
+    "    -800 * np.ones(1),\n",
+    "    -200 * np.ones(1),\n",
+    "    np.zeros(1),\n",
+    "    hstepmax=20,\n",
+    "    color=\"C1\",\n",
+    "    ax=ax,\n",
+    "    silent=False,\n",
+    ");"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "If you don't want to have contour in the background, simply specify a window for the `tracelines` function and no axes. "
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "ml.plots.tracelines(\n",
+    "    -800 * np.ones(1),\n",
+    "    -200 * np.ones(1),\n",
+    "    np.zeros(1),\n",
+    "    hstepmax=20,\n",
+    "    color=\"C1\",\n",
+    "    silent=False,\n",
+    "    win=[-1000, 100, -500, 500],\n",
+    ");"
    ]
   },
   {
@@ -276,7 +306,7 @@
     "    layers=0,\n",
     "    figsize=(6, 6),\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w, hstepmax=20, nt=20, zstart=0, tmax=5 * 365.25, color=\"C1\", ax=ax\n",
     ")"
    ]
@@ -302,7 +332,7 @@
     "    layers=0,\n",
     "    figsize=(6, 6),\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w, hstepmax=20, nt=20, zstart=0, tmax=20 * 365.25, color=\"C1\", ax=ax\n",
     ")"
    ]

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

@@ -222,6 +222,13 @@
     "print(\"The discharge at the abandoned well is:\")\n",
     "print(wabandoned.discharge())"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

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

@@ -163,7 +163,7 @@
    "outputs": [],
    "source": [
     "axes = ml.plots.topview_and_xsection(win=[0, 20000, 0, 20000], figsize=figsize)\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w1,\n",
     "    hstepmax=50,\n",
     "    nt=10,\n",
@@ -172,13 +172,13 @@
     "    orientation=\"both\",\n",
     "    ax=axes,\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w2, hstepmax=50, nt=10, zstart=30, tmax=250 * 365.25, orientation=\"both\", ax=axes\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w3, hstepmax=50, nt=10, zstart=30, tmax=250 * 365.25, orientation=\"both\", ax=axes\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w3,\n",
     "    hstepmax=50,\n",
     "    nt=10,\n",
@@ -198,16 +198,16 @@
     "axes = ml.plots.topview_and_xsection(\n",
     "    win=[0, 20000, 0, 20000], topfigfrac=0.7, figsize=figsize\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w1, hstepmax=50, nt=10, zstart=150, tmax=50 * 365.25, orientation=\"both\", ax=axes\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w2, hstepmax=50, nt=10, zstart=30, tmax=50 * 365.25, orientation=\"both\", ax=axes\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w3, hstepmax=50, nt=10, zstart=30, tmax=50 * 365.25, orientation=\"both\", ax=axes\n",
     ")\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w3, hstepmax=50, nt=10, zstart=100, tmax=50 * 365.25, orientation=\"both\", ax=axes\n",
     ")"
    ]

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

@@ -202,7 +202,7 @@
    "outputs": [],
    "source": [
     "axes = ml.plots.topview_and_xsection(win=[-200, 800, 0, 800], figsize=figsize)\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w, hstepmax=50, nt=20, zstart=10, tmax=20 * 365.25, orientation=\"both\", ax=axes\n",
     ")"
    ]

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

@@ -174,7 +174,7 @@
    "outputs": [],
    "source": [
     "axes = ml.plots.topview_and_xsection(win=[-200, 800, 0, 800])\n",
-    "ml.plots.plotcapzone(\n",
+    "ml.plots.plot_capture_zone(\n",
     "    well=w, hstepmax=50, nt=20, zstart=15, tmax=20 * 365.25, orientation=\"both\", ax=axes\n",
     ")"
    ]

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

@@ -572,7 +572,7 @@
    "source": [
     "ilay = 0\n",
     "levels = [-2.4, -2.2, -2.0, -1.8, -1.6, -1.4, -1.2]\n",
-    "ml2.plots.contour(\n",
+    "ax = ml2.plots.contour(\n",
     "    win=(-50, 50, -50, 50),\n",
     "    ngr=51,\n",
     "    levels=levels,\n",
@@ -581,7 +581,7 @@
     "    linestyles=\"solid\",\n",
     "    color=\"C1\",\n",
     ")\n",
-    "plt.plot(ws.xcp, ws.ycp, \"kx\");"
+    "ax.plot(ws.xcp, ws.ycp, \"kx\");"
    ]
   },
   {
@@ -720,17 +720,16 @@
    "source": [
     "ilay = 1\n",
     "levels = [-2.4, -2.2, -2.0, -1.8, -1.6, -1.4, -1.2]\n",
-    "ml3.plots.contour(\n",
+    "ax = ml3.plots.contour(\n",
     "    win=(-50, 50, -50, 50),\n",
     "    ngr=51,\n",
     "    levels=levels,\n",
     "    decimals=2,\n",
     "    layers=[ilay],\n",
-    "    newfig=False,\n",
     "    linestyles=\"solid\",\n",
     "    color=\"C1\",\n",
     ")\n",
-    "plt.plot(ws.xcp, ws.ycp, \"kx\");"
+    "ax.plot(ws.xcp, ws.ycp, \"kx\");"
    ]
   },
   {

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

@@ -124,7 +124,9 @@
    "outputs": [],
    "source": [
     "fig, ax = plt.subplots(1, 1, figsize=(10, 3))\n",
-    "ml.plots.xsection(xy=[(-150, 0), (150, 0)], ax=ax, params=True);"
+    "ml.plots.xsection(\n",
+    "    xy=[(-150, 0), (150, 0)], ax=ax, params=True, units={\"kaq\": \"m/d\", \"c\": \"d\"}\n",
+    ")"
    ]
   },
   {
@@ -149,7 +151,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ml.plots.vcontoursf1D(x1=-200, x2=200, nx=100, levels=20, color=\"C0\", figsize=(10, 3));"
+    "ml.plots.vcontour_stream_function(\n",
+    "    x1=-200, x2=200, nx=100, levels=20, color=\"C0\", figsize=(10, 3)\n",
+    ");"
    ]
   },
   {
@@ -238,7 +242,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ml.plots.vcontoursf1D(x1=-200, x2=200, nx=100, levels=20, color=\"C0\", figsize=(10, 3));"
+    "ml.plots.vcontour_stream_function(\n",
+    "    x1=-200, x2=200, nx=100, levels=20, color=\"C0\", figsize=(10, 3)\n",
+    ");"
    ]
   },
   {
@@ -302,7 +308,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ax = ml.plots.vcontoursf1D(\n",
+    "ax = ml.plots.vcontour_stream_function(\n",
     "    x1=-200, x2=200, nx=100, levels=20, color=\"C0\", figsize=(10, 3), horizontal_axis=\"x\"\n",
     ")\n",
     "ld1.plot(ax);  # plot wall"
@@ -359,7 +365,9 @@
     "tfs.Constant(ml, 100, 0, 10)\n",
     "ml.solve()\n",
     "\n",
-    "ml.plots.vcontoursf1D(x1=-100, x2=100, nx=100, levels=20, color=\"C0\", figsize=(10, 3));"
+    "ml.plots.vcontour_stream_function(\n",
+    "    x1=-100, x2=100, nx=100, levels=20, color=\"C0\", figsize=(10, 3)\n",
+    ");"
    ]
   },
   {
@@ -372,7 +380,7 @@
     "tfs.XsectionAreaSink(ml2, -50, 50, 0.001)\n",
     "tfs.Constant(ml2, -100, 0, 10)\n",
     "ml2.solve()\n",
-    "ml2.plots.vcontoursf1D(\n",
+    "ml2.plots.vcontour_stream_function(\n",
     "    x1=-100, x2=100, nx=100, levels=20, color=\"C0\", figsize=(10, 3), horizontal_axis=\"x\"\n",
     ");"
    ]
@@ -419,7 +427,9 @@
     "\n",
     "ml.solve()\n",
     "\n",
-    "ml.plots.vcontoursf1D(x1=-20, x2=20, nx=100, levels=20, color=\"C0\", figsize=(10, 3));"
+    "ml.plots.vcontour_stream_function(\n",
+    "    x1=-20, x2=20, nx=100, levels=20, color=\"C0\", figsize=(10, 3)\n",
+    ");"
    ]
   },
   {
@@ -448,7 +458,9 @@
     "\n",
     "ml.solve()\n",
     "\n",
-    "ml.plots.vcontoursf1D(x1=-20, x2=20, nx=100, levels=20, color=\"C0\", figsize=(10, 3));"
+    "ml.plots.vcontour_stream_function(\n",
+    "    x1=-20, x2=20, nx=100, levels=20, color=\"C0\", figsize=(10, 3)\n",
+    ");"
    ]
   },
   {
@@ -499,9 +511,7 @@
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-   "source": [
-    "from timflow.steady.linesink1d import FluxDiffLineSink1D, HeadDiffLineSink1D"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -512,8 +522,8 @@
     "ml = tfs.ModelMaq(kaq=[10], z=[0, -10], topboundary=\"conf\")\n",
     "ls = tfs.River1D(ml, xls=0, hls=1, wh=\"H\", layers=0)\n",
     "ls = tfs.River1D(ml, xls=200, hls=0, wh=\"H\", layers=0)\n",
-    "hd = HeadDiffLineSink1D(ml, xls=100)\n",
-    "fd = FluxDiffLineSink1D(ml, xls=100)\n",
+    "hd = tfs.linesink1d.HeadDiffLineSink1D(ml, xls=100)\n",
+    "fd = tfs.linesink1d.FluxDiffLineSink1D(ml, xls=100)\n",
     "ml.solve()\n",
     "\n",
     "x = np.linspace(0, 200, 101)\n",

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

@@ -36,7 +36,7 @@
    "source": [
     "ml1 = tfs.ModelMaq(kaq=20)\n",
     "rf1 = tfs.Constant(ml1, xr=0, yr=20, hr=30)\n",
-    "ls1 = tfs.LineSinkBase(ml1, x1=-10, y1=-10, x2=10, y2=10, Qls=1000)\n",
+    "ls1 = tfs.linesink.LineSinkBase(ml1, x1=-10, y1=-10, x2=10, y2=10, Qls=1000)\n",
     "ml1.solve()"
    ]
   },
@@ -73,7 +73,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ml1.plots.contour(\n",
+    "ax = ml1.plots.contour(\n",
     "    [-20, 20, -20, 20], 50, [0], np.arange(20, 31, 1), color=\"C0\", labels=False\n",
     ")\n",
     "ml2.plots.contour(\n",
@@ -83,7 +83,8 @@
     "    np.arange(20, 31, 1),\n",
     "    color=\"C1\",\n",
     "    labels=False,\n",
-    "    newfig=False,\n",
+    "    ax=ax,\n",
+    "    linestyles=\"dashed\",\n",
     ")"
    ]
   },