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.

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

Finalizing tortuosity_bt and rev functions #969

Merged
merged 37 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
74709af
adding rev_tau plus some related tweaks
jgostick Sep 17, 2023
ef1bfb4
changing api for rev_tau func
jgostick Sep 18, 2023
94ddb17
A refactor of the gdd functions
jgostick Sep 20, 2023
c33424e
more tidying up
jgostick Sep 20, 2023
df2c366
fixing docstrings
jgostick Sep 20, 2023
6786796
final fiddle with docstrings
jgostick Sep 20, 2023
24dc56a
fixing imports
jgostick Sep 20, 2023
f60d661
one more import
jgostick Sep 20, 2023
e03c349
adding volume of block to dataframe
jgostick Sep 20, 2023
161ac96
little fix to dataframe column names
jgostick Sep 20, 2023
ae66dee
fiixing the type checks on block_size, rev_tortuosity works
jgostick Sep 21, 2023
6d02a8b
fiddling with dask
jgostick Sep 21, 2023
9e927f9
cleaning up dask options
jgostick Sep 22, 2023
2c9c0fa
enhanced subdivide method to optionlly accept block_size argument, an…
jgostick Sep 25, 2023
25e50d9
changing gdd to be more flexible with block size, by trimming image i…
jgostick Sep 25, 2023
461285a
I think analyze_blocks is buttoned up
jgostick Sep 25, 2023
a134bbd
uses user supplied chunk sizes now
jgostick Sep 25, 2023
eca8faa
caught a stupid bug that I added
jgostick Sep 26, 2023
4b1c125
adding some rev tests
jgostick Sep 26, 2023
d3496b4
adding time to results object
jgostick Oct 2, 2023
631dd73
some fine tuning to gdd2
jgostick Oct 17, 2023
0329e87
returning gdd to original form
jgostick Oct 25, 2023
0154c1a
changed to be more congruent with gdd2
rickyfann Jun 5, 2024
5918c6b
comments
rickyfann Jun 12, 2024
a05f1fe
more pythonic and docstring
rickyfann Jun 20, 2024
387308c
fine tuning
jgostick Jun 20, 2024
34cd821
Merge branch 'dev' into adding_tau_rev
jgostick Jun 20, 2024
e9894d2
renaming files and cleaning
jgostick Jun 20, 2024
56e0480
updating notebooks
jgostick Jun 21, 2024
b9dedaa
fixing bare except
jgostick Jun 21, 2024
e7c8c37
fixed table, reverted to old documentation
rickyfann Aug 22, 2024
1b9bc8c
Merge branch 'release' of https://github.com/PMEAL/porespy into release
rickyfann Aug 22, 2024
332fe4f
Merge branch 'dev' of https://github.com/PMEAL/porespy into release
rickyfann Aug 22, 2024
72f1631
squashed merge
rickyfann Aug 22, 2024
36ea8b3
Merge branch 'adding_tau_rev' of https://github.com/PMEAL/porespy int…
rickyfann Aug 22, 2024
a923fc6
adding np version check to fmm test
jgostick Aug 24, 2024
26c48ad
fixing changes to fft related PR
jgostick Aug 24, 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
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
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.5"
"version": "3.11.7"
}
},
"nbformat": 4,
Expand Down
790 changes: 632 additions & 158 deletions examples/simulations/tutorials/using_tortuosity_gdd.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/porespy/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.0.0a0.dev15'
__version__ = '3.0.0a0.dev8'
2 changes: 1 addition & 1 deletion src/porespy/beta/__init__.py
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
Loading