Skip to content
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

Jump to bottom

Up to date tortuosity_bt #986

Closed
wants to merge 7 commits into from
Closed

Up to date tortuosity_bt #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
717231f
Bump version number (dev segment)
actions-user Jul 2, 2024
d0db621
Merge branch 'dev' of https://github.com/PMEAL/porespy into dev
rickyfann Aug 22, 2024
a48477c
Squashed commit of the following:
rickyfann Aug 22, 2024
d54891b
Bump version number (dev segment)
actions-user Aug 22, 2024
1f51fcd
fixed table, reverted to original documentation
rickyfann Aug 22, 2024
c8f6f57
Merge branch 'dev' of https://github.com/rickyfann/porespy into dev
rickyfann Aug 22, 2024
2b0f34c
Bump version number (dev segment)
actions-user Aug 22, 2024
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: 10 additions & 4 deletions examples/simulations/reference/tortuosity_gdd.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"# `tortuosity_gdd`\n",
"# `tortuosity_bt`\n",
"Calculation of tortuosity via geometric domain decomposition method"
]
},
Expand All @@ -18,6 +18,7 @@
"import numpy as np\n",
"import porespy as ps\n",
"from porespy import beta\n",
"\n",
"ps.visualization.set_mpl_style()"
]
},
Expand All @@ -29,7 +30,7 @@
{
"data": {
"text/plain": [
"<Signature (im, scale_factor=3, use_dask=True)>"
"<Signature (im, block_size=None, use_dask=True)>"
]
},
"execution_count": 2,
Expand All @@ -39,7 +40,7 @@
],
"source": [
"import inspect\n",
"inspect.signature(beta.tortuosity_gdd)"
"inspect.signature(beta.tortuosity_bt)"
]
},
{
Expand All @@ -49,6 +50,11 @@
"# im\n",
"Can be a 3D image:"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": []
}
],
"metadata": {
Expand All @@ -67,7 +73,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.12"
"version": "3.11.5"
}
},
"nbformat": 4,
Expand Down
61 changes: 19 additions & 42 deletions examples/simulations/tutorials/finding_tortuosity_from_image.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

790 changes: 632 additions & 158 deletions examples/simulations/tutorials/using_tortuosity_gdd.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/porespy/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.0.0a0.dev13'
__version__ = '3.0.0a0.dev15'
2 changes: 1 addition & 1 deletion src/porespy/beta/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ._dns_tools import *
from ._drainage2 import *
from ._gdd import *
from ._tortuosity_bt_funcs import *
from ._generators import *
from ._poly_cylinders import *
Loading