Merge pull request #969 from PMEAL/adding_tau_rev

Finalizing `tortuosity_bt` and `tortuosity_rev` functions #enh #new
PMEAL · Aug 24, 2024 · d2d1d9e · d2d1d9e
2 parents eb88a60 + 26c48ad
commit d2d1d9e
Show file tree

Hide file tree

Showing 13 changed files with 1,191 additions and 557 deletions.
diff --git a/examples/simulations/reference/tortuosity_gdd.ipynb b/examples/simulations/reference/tortuosity_gdd.ipynb
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# `tortuosity_gdd`\n",
+    "# `tortuosity_bt`\n",
     "Calculation of tortuosity via geometric domain decomposition method"
    ]
   },
@@ -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()"
    ]
   },
@@ -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,
@@ -39,7 +40,7 @@
    ],
    "source": [
     "import inspect\n",
-    "inspect.signature(beta.tortuosity_gdd)"
+    "inspect.signature(beta.tortuosity_bt)"
    ]
   },
   {
@@ -49,6 +50,11 @@
     "# im\n",
     "Can be a 3D image:"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
   }
  ],
  "metadata": {
@@ -67,7 +73,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.11.5"
   }
  },
  "nbformat": 4,

diff --git a/examples/simulations/tutorials/finding_tortuosity_from_image.ipynb b/examples/simulations/tutorials/finding_tortuosity_from_image.ipynb
@@ -296,7 +296,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.11.7"
   }
  },
  "nbformat": 4,

diff --git a/examples/simulations/tutorials/using_tortuosity_gdd.ipynb b/examples/simulations/tutorials/using_tortuosity_gdd.ipynb
diff --git a/src/porespy/__version__.py b/src/porespy/__version__.py
@@ -1 +1 @@
-__version__ = '3.0.0a0.dev15'
+__version__ = '3.0.0a0.dev8'
diff --git a/src/porespy/beta/__init__.py b/src/porespy/beta/__init__.py
@@ -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 *