Merge pull request #3010 from PMEAL/dev

Merging dev into release #patch

Author: jgostick

README.md

@@ -6,8 +6,6 @@
 
 -----
 
-> VERSION 3.0 of OpenPNM is now out. All the [examples on the website](https://openpnm.org/_examples/index.html) are now using the features and idioms of V3. For a description of the main changes please see our [recent blog post](http://pmeal.com/posts/2022-10-10-notebook-post/). 
-
 # Overview of OpenPNM
 
 OpenPNM is a comprehensive framework for performing pore network simulations of porous materials.

openpnm/__version__.py

@@ -1 +1 @@
-__version__ = '3.5.3.dev0'
+__version__ = '3.5.3.dev4'

openpnm/algorithms/_drainage.py

@@ -254,6 +254,14 @@ def apply_trapping(self):
         self['throat.invasion_pressure'][self['throat.trapped']] = np.inf
         self['pore.invasion_sequence'][self['pore.trapped']] = -1
         self['throat.invasion_sequence'][self['throat.trapped']] = -1
+        Pmask = self['pore.invasion_sequence'] < 0
+        Tmask = self['throat.invasion_sequence'] < 0
+        self['pore.invasion_sequence'] = \
+            self['pore.invasion_sequence'].astype(float)
+        self['pore.invasion_sequence'][Pmask] = np.inf
+        self['throat.invasion_sequence'] = \
+            self['throat.invasion_sequence'].astype(float)
+        self['throat.invasion_sequence'][Tmask] = np.inf
 
     def pc_curve(self, pressures=None):
         if pressures is None:

openpnm/visualization/_plottools.py

@@ -863,5 +863,5 @@ def set_mpl_style():  # pragma: no cover
     plt.rc('figure', **figure_props)
     plt.rc('image', **image_props)
 
-    import matplotlib_inline
-    matplotlib_inline.backend_inline.set_matplotlib_formats('retina')
+    # import matplotlib_inline
+    # matplotlib_inline.backend_inline.set_matplotlib_formats('retina')

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.5.3.dev0
+current_version = 3.5.3.dev4
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.(?P<release>\D+)(?P<build>\d+)?
 serialize = {major}.{minor}.{patch}.{release}{build}