Skip to content

Improve validation xsections + cleanup #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dbrakenhoff wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Improve validation xsections + cleanup #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
be1c331
add check for length of z for semi confined modelmaq,
dbrakenhoff May 12, 2026
19f9e88
add gaps check for modelxsection
dbrakenhoff May 12, 2026
cef18ad
add gaps check for modelxsection
dbrakenhoff May 12, 2026
fe195fc
improve formatting
dbrakenhoff May 12, 2026
952f1f6
clean up inits
dbrakenhoff May 12, 2026
ffe1eeb
update notebooks and clear
dbrakenhoff May 12, 2026
d4ba7d6
sort xsection coordinates prior to gap check
dbrakenhoff May 12, 2026
1194762
improve coordinate checks for Xsections that may span to infinity
dbrakenhoff May 14, 2026
1e6d44f
add check method to ModelXsection that checks for elements on boundaries
dbrakenhoff May 14, 2026
0817e90
ruff and make nudge smaller
dbrakenhoff May 14, 2026
2b5b3f6
forgot some checks in the if statement
dbrakenhoff May 14, 2026
ffc42b7
attempt to speed up some notebooks
dbrakenhoff May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions docs/steady/00userguide/tutorials/tutorial1_well_multi_layer_aquifer.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,21 +254,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/steady/02examples/01_well_in_uniform_flow.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,21 +233,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
8 changes: 3 additions & 5 deletions docs/steady/03xsections/cross_section_models.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,7 @@
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"from timflow.steady.linesink1d import FluxDiffLineSink1D, HeadDiffLineSink1D"
]
"source": []
},
{
"cell_type": "code",
Expand All @@ -512,8 +510,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",
Expand Down
2 changes: 1 addition & 1 deletion docs/steady/04benchmarks/test_linesink_discharge.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()"
]
},
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/00userguide/howtos/howto_fluctuating_head_boundary.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,21 +255,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/00userguide/howtos/howto_pumpingtest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,21 +437,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/00userguide/howtos/howto_select_a_model.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/00userguide/tutorials/tutorial0_start_a_model.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/02examples/connected_wells.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,21 +567,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/02examples/horizontal_well.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,21 +162,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
15 changes: 2 additions & 13 deletions docs/transient/02examples/line_sink_well_sol.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
" labels=True,\n",
" decimals=2,\n",
" ax=ax,\n",
" parallel=True,\n",
" )\n",
" ax.set_aspect(\"equal\", adjustable=\"box\")"
]
Expand Down Expand Up @@ -178,21 +179,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/02examples/meandering_river.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
14 changes: 1 addition & 13 deletions docs/transient/02examples/well_in_multilayer_system.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,21 +224,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
2 changes: 1 addition & 1 deletion docs/transient/02examples/well_near_wall.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"metadata": {},
"outputs": [],
"source": [
"ml2.contour(win=[-30, 50, -10, 30], ngr=40, t=1, decimals=2);"
"ml2.plots.contour(win=[-30, 50, -10, 30], ngr=40, t=1, decimals=2, parallel=True);"
]
}
],
Expand Down
18 changes: 3 additions & 15 deletions docs/transient/03xsections/1d_elements.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"outputs": [],
"source": [
"mlconf = tft.ModelMaq(kaq=k, z=[0, -H], Saq=Ss, tmin=1e-3, tmax=1e3, topboundary=\"conf\")\n",
"ls = tft.DischargeLineSink1D(mlconf, tsandq=[(0, Q)], layers=[0])\n",
"ls = tft.LineSink1D(mlconf, tsandq=[(0, Q)], layers=[0])\n",
"mlconf.solve()"
]
},
Expand Down Expand Up @@ -200,7 +200,7 @@
"outputs": [],
"source": [
"ml = tft.ModelMaq(kaq=k, z=[1, 0, -H], c=[10], tmin=1e-3, tmax=1e3, topboundary=\"semi\")\n",
"ls = tft.DischargeLineSink1D(ml, tsandq=[(0, Q)], layers=[0])\n",
"ls = tft.LineSink1D(ml, tsandq=[(0, Q)], layers=[0])\n",
"ml.solve()"
]
},
Expand Down Expand Up @@ -613,21 +613,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
16 changes: 2 additions & 14 deletions docs/transient/03xsections/1d_given_linesink.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
" topboundary=\"phreatic\",\n",
")\n",
"\n",
"qls = tft.DischargeLineSink1D(\n",
"qls = tft.linesink1d.DischargeLineSink1D(\n",
" mlconf,\n",
" xls=0.0,\n",
" tsandq=[(0, 1.0), (10.0, 2.0)],\n",
Expand Down Expand Up @@ -147,21 +147,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3 (ipykernel)",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"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,
Expand Down
Loading