Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 5eada9a
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Thu Aug 22 11:27:51 2024 -0400

    removed old gdd

commit c0fabdb
Merge: 695dffe 4b3b632
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Thu Aug 22 11:21:40 2024 -0400

    Merge branch 'dev' of https://github.com/PMEAL/porespy into rev

commit 695dffe
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Thu Aug 22 10:53:03 2024 -0400

    started example file

commit a6e5d69
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Thu Aug 22 10:52:37 2024 -0400

    added porespy import

commit e68fb9b
Merge: 0944362 366c0ec
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Tue Jul 16 13:47:41 2024 -0400

    updated docstring to include method

commit 366c0ec
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Thu Jul 11 17:12:21 2024 -0400

    implemented tau_from_cmap

commit 0944362
Merge: b9dedaa 52530d9
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Thu Jul 11 16:21:37 2024 -0400

    changed to "method"

commit 52530d9
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Mon Jul 8 13:25:07 2024 -0400

    slight documentation

commit 7dc1845
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Mon Jul 8 10:30:17 2024 -0400

    Updated docstring

commit b7c70f2
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Sun Jul 7 18:48:29 2024 -0400

    tutorial matches refactored code, must update docstrings

commit 352d14e
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Sun Jul 7 16:40:21 2024 -0400

    doc string and __main__

commit d772193
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Tue Jul 2 08:39:12 2024 -0400

    split tortuosity_fd into helper functions

commit b9dedaa
Author: jgostick <jgostick@gmail.com>
Date:   Thu Jun 20 22:30:52 2024 -0400

    fixing bare except

commit 56e0480
Author: jgostick <jgostick@gmail.com>
Date:   Thu Jun 20 22:25:21 2024 -0400

    updating notebooks

commit e9894d2
Author: jgostick <jgostick@gmail.com>
Date:   Thu Jun 20 16:02:33 2024 -0400

    renaming files and cleaning

commit 34cd821
Merge: 387308c 4f6991d
Author: jgostick <jgostick@gmail.com>
Date:   Thu Jun 20 16:00:36 2024 -0400

    Merge branch 'dev' into adding_tau_rev

commit 387308c
Author: jgostick <jgostick@gmail.com>
Date:   Thu Jun 20 15:55:07 2024 -0400

    fine tuning

commit a05f1fe
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Thu Jun 20 01:20:40 2024 -0400

    more pythonic and docstring

commit 5918c6b
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Wed Jun 12 15:38:46 2024 -0400

    comments

commit 0154c1a
Author: rickyfann3265 <ricky-fan-617@live.ca>
Date:   Wed Jun 5 16:19:27 2024 -0400

    changed to be more congruent with gdd2

commit 0329e87
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Oct 25 20:59:38 2023 +0900

    returning gdd to original form

commit 631dd73
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Tue Oct 17 12:05:49 2023 +0900

    some fine tuning to gdd2

commit d3496b4
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Mon Oct 2 12:05:38 2023 +0900

    adding time to results object

commit 4b1c125
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Tue Sep 26 13:22:11 2023 +0900

    adding some rev tests

commit eca8faa
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Tue Sep 26 11:03:02 2023 +0900

    caught a stupid bug that I added

commit a134bbd
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Mon Sep 25 15:09:23 2023 +0900

    uses user supplied chunk sizes now

commit 461285a
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Mon Sep 25 13:15:20 2023 +0900

    I think analyze_blocks is buttoned up

commit 25e50d9
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Mon Sep 25 11:11:15 2023 +0900

    changing gdd to be more flexible with block size, by trimming image instead of rejecting block sizes

commit 2c9c0fa
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Mon Sep 25 11:10:40 2023 +0900

    enhanced subdivide method to optionlly accept block_size argument, and some options, plus tests

commit 9e927f9
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Fri Sep 22 14:32:51 2023 +0900

    cleaning up dask options

commit 6d02a8b
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Thu Sep 21 10:21:28 2023 +0900

    fiddling with dask

commit ae66dee
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Thu Sep 21 09:36:23 2023 +0900

    fiixing the type checks on block_size, rev_tortuosity works

commit 161ac96
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Thu Sep 21 00:32:56 2023 +0900

    little fix to dataframe column names

commit e03c349
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Sep 20 22:57:42 2023 +0900

    adding volume of block to dataframe

commit f60d661
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Sep 20 22:42:42 2023 +0900

    one more import

commit 24dc56a
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Sep 20 22:41:23 2023 +0900

    fixing imports

commit 6786796
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Sep 20 22:32:38 2023 +0900

    final fiddle with docstrings

commit df2c366
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Sep 20 22:18:19 2023 +0900

    fixing docstrings

commit c33424e
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Sep 20 22:12:34 2023 +0900

    more tidying up

commit 94ddb17
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Wed Sep 20 21:45:18 2023 +0900

    A refactor of the gdd functions

commit ef1bfb4
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Mon Sep 18 10:55:54 2023 +0900

    changing api for rev_tau func

commit 74709af
Author: Jeff Gostick <jgostick@gmail.com>
Date:   Mon Sep 18 01:04:58 2023 +0900

    adding rev_tau plus some related tweaks
  • Loading branch information
@rickyfann
rickyfann committed Aug 22, 2024
1 parent d0db621 commit a48477c
Show file tree
Hide file tree
Showing 11 changed files with 1,319 additions and 589 deletions.
14 changes: 10 additions & 4 deletions examples/simulations/reference/tortuosity_gdd.ipynb
View file
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
186 changes: 142 additions & 44 deletions examples/simulations/tutorials/finding_tortuosity_from_image.ipynb
View file

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/porespy/beta/__init__.py
View file
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

0 comments on commit a48477c

Please sign in to comment.