xtgeo 4.10.1__cp313-cp313-win_amd64.whl → 4.11.0__cp313-cp313-win_amd64.whl

xtgeo/common/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '4.10.1'
-__version_tuple__ = version_tuple = (4, 10, 1)
+__version__ = version = '4.11.0'
+__version_tuple__ = version_tuple = (4, 11, 0)
+
+__commit_id__ = commit_id = 'gee9361dd9'

xtgeo/cube/_cube_window_attributes.py

@@ -63,6 +63,7 @@ class CubeAttrs:
     _upper: RegularSurface | None = None  # upper surf, resampled to cube map resolution
     _lower: RegularSurface | None = None  # lower surf, resampled to cube map resolution
     _min_thickness_mask: RegularSurface | None = None  # mask for min. thickness trunc.
+    _mask_map_by_traceidcode: RegularSurface | None = None  # mask for traceidcode 2
 
     _result_attr_maps: dict = field(default_factory=dict)  # holds the resulting maps
 
@@ -94,6 +95,7 @@ class CubeAttrs:
             else self.lower_surface
         )
 
+        # the template surface is the topology that defines the resulting attribute maps
         self._template_surface = (
             upper
             if isinstance(self.upper_surface, (float, int))
@@ -184,7 +186,7 @@ class CubeAttrs:
         from xtgeo import Cube  # avoid circular import by having this here
 
         cubev = self.cube.values.copy()  # copy, so we don't change the input instance
-        cubev[self.cube.traceidcodes == 2] = np.nan  # set dead traces to nan
+        cubev[self.cube.traceidcodes == 2] = 0.0  # set traceidcode 2 to zero
 
         # Create a boolean mask based on the threshold
         mask = self._depth_array < self._outside_depth
@@ -311,13 +313,20 @@ class CubeAttrs:
         attr_map = self._upper.copy()
         attr_map.values = np.ma.masked_invalid(values)
 
+        # apply mask for the cube's dead traces (traceidcode 2)
+        attr_map.values = np.ma.masked_where(
+            self.cube.traceidcodes == 2, attr_map.values
+        )
+
         # now resample to the original input map
         attr_map_resampled = self._template_surface.copy()
         attr_map_resampled.resample(attr_map)
 
-        attr_map_resampled.values = np.ma.masked_where(
-            self.upper_surface.values.mask, attr_map_resampled.values
-        )
+        # Use template_surface consistently for masking (it's already set correctly)
+        if hasattr(self._template_surface.values, "mask"):
+            attr_map_resampled.values = np.ma.masked_where(
+                self._template_surface.values.mask, attr_map_resampled.values
+            )
 
         self._result_attr_maps[attr_name] = attr_map_resampled
 

xtgeo/grid3d/_grid_etc1.py

@@ -1053,13 +1053,18 @@ def inactivate_inside(
         raise RuntimeError("Problems with one or more polygons. Not closed?")
 
 
-def collapse_inactive_cells(self: Grid) -> None:
+def collapse_inactive_cells(self: Grid, internal: bool = True) -> None:
     """Collapse inactive cells."""
-    self._set_xtgformat1()
+    logger.debug("Collapsing inactive cells...")
+    self._set_xtgformat2()
 
-    _cxtgeo.grd3d_collapse_inact(
-        self.ncol, self.nrow, self.nlay, self._zcornsv, self._actnumsv
-    )
+    grid_cpp = _internal.grid3d.Grid(self)
+    new_zcornsv = grid_cpp.collapse_inactive_cells(collapse_internal=internal)
+
+    if new_zcornsv is not None:
+        self._zcornsv = new_zcornsv
+
+    logger.debug("Collapsing inactive cells done")
 
 
 def copy(self: Grid) -> Grid:

xtgeo/grid3d/grid.py

@@ -2295,7 +2295,7 @@ class Grid(_Grid3D):
         * maxangle_topbase_proj (degrees) max angle projected (bird view)
         * minangle_sides (degress) minimum angle, all side surfaces
         * maxangle_sides (degress) maximum angle, all side surfaces
-        * collapsed (int) Integer, 1 of one or more corners are collpased in Z
+        * collapsed (int) Integer, 1 of one or more corners are collapsed in Z
         * faulted (int) Integer, 1 if cell is faulted (one or more neighbours offset)
         * negative_thickness (int) Integer, 1 if cell has negative thickness
         * concave_proj (int) 1 if cell is concave seen from projected bird view
@@ -2332,7 +2332,7 @@ class Grid(_Grid3D):
         inside: bool = True,
         force_close: bool = False,
     ) -> None:
-        """Inacativate grid inside a polygon.
+        """Inactivate grid inside a polygon.
 
         The Polygons instance may consist of several polygons. If a polygon
         is open, then the flag force_close will close any that are not open
@@ -2359,14 +2359,30 @@ class Grid(_Grid3D):
         layer_range: tuple[int, int] | None = None,
         force_close: bool = False,
     ) -> None:
-        """Inacativate grid outside a polygon."""
+        """Inactivate grid outside a polygon."""
         self.inactivate_inside(
             poly, layer_range=layer_range, inside=False, force_close=force_close
         )
 
-    def collapse_inactive_cells(self) -> None:
-        """Collapse inactive layers where, for I J with other active cells."""
-        _grid_etc1.collapse_inactive_cells(self)
+    def collapse_inactive_cells(self, internal: bool = True) -> None:
+        """Collapse inactive layers per I J column (~vertically).
+
+        Seen by I,J column, the inactive cells are collapsed to the first active cell in
+        the column. First transversed from top, then from bottom. If no active cells in
+        the column, the (invisible) Z coordinates are averaged to one common location.
+
+        If `internal` is True (default), then also internal inactive cells (i.e.
+        inactive "hole" surrounded by active cells) are collapsed. In this case the Z
+        coordinates of the adjacent active cells are moved to fill the gap.
+
+        The current grid instance will be updated.
+
+        Args:
+            internal: If True (default), then the internal collapse is also done.
+
+        .. versionchanged:: 4.11 Added ``internal option``, algorithm is improved
+        """
+        _grid_etc1.collapse_inactive_cells(self, internal=internal)
 
     def crop(
         self,

xtgeo/metadata/metadata.py

@@ -10,10 +10,17 @@ The metadata works through the various datatypes in XTGeo. For example::
 
 """
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
 import xtgeo
 from xtgeo.common.constants import UNDEF
 from xtgeo.common.log import null_logger
 
+if TYPE_CHECKING:
+    from datetime import datetime
+
 logger = null_logger(__name__)
 
 
@@ -50,10 +57,10 @@ class _OptionalMetaData:
         self._name = "A Longer Descriptive Name e.g. from SMDA"
         self._shortname = "TheShortName"
         self._datatype = None
-        self._md5sum = None
+        self._md5sum: str | None = None
         self._description = "Some description"
         self._crs = None
-        self._datetime = None
+        self._datetime: datetime | None = None
         self._deltadatetime = None
         self._visuals = {"colortable": "rainbow", "lower": None, "upper": None}
         self._domain = "depth"
@@ -68,29 +75,29 @@ class _OptionalMetaData:
         self._source = "unknown"
 
     @property
-    def name(self):
+    def name(self) -> str:
         return self._name
 
     @name.setter
-    def name(self, newname):
+    def name(self, newname: str) -> None:
         # TODO: validation
         self._name = newname
 
     @property
-    def datetime(self):
+    def datetime(self) -> datetime | None:
         return self._datetime
 
     @datetime.setter
-    def datetime(self, newdate):
+    def datetime(self, newdate: datetime) -> None:
         # TODO: validation
         self._datetime = newdate
 
     @property
-    def shortname(self):
+    def shortname(self) -> str:
         return self._shortname
 
     @shortname.setter
-    def shortname(self, newname):
+    def shortname(self, newname: str) -> None:
         if not isinstance(newname, str):
             raise ValueError("The shortname must be a string.")
         if len(newname) >= 32:
@@ -99,11 +106,11 @@ class _OptionalMetaData:
         self._shortname = newname
 
     @property
-    def description(self):
+    def description(self) -> str:
         return self._description
 
     @description.setter
-    def description(self, newstr):
+    def description(self, newstr: str) -> None:
         if not isinstance(newstr, str):
             raise ValueError("The description must be a string.")
         if len(newstr) >= 64:
@@ -115,7 +122,7 @@ class _OptionalMetaData:
         self._description = newstr
 
     @property
-    def md5sum(self):
+    def md5sum(self) -> str | None:
         """Set or get the md5 checksum of file content.
 
         See generate_hash() method in e.g. RegularSurface.
@@ -123,11 +130,11 @@ class _OptionalMetaData:
         return self._md5sum
 
     @md5sum.setter
-    def md5sum(self, newhash):
+    def md5sum(self, newhash: str) -> None:
         # TODO: validation
         self._md5sum = newhash
 
-    def get_meta(self):
+    def get_meta(self) -> dict[str, Any]:
         """Return metadata as an dict."""
         meta = {}
         for key in self.__slots__:

{xtgeo-4.10.1.dist-info → xtgeo-4.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xtgeo
-Version: 4.10.1
+Version: 4.11.0
 Summary: XTGeo is a Python library for 3D grids, surfaces, wells, etc
 Keywords: grids,surfaces,wells,cubes
 Author-Email: Equinor <fg_fmu-atlas@equinor.com>

{xtgeo-4.10.1.dist-info → xtgeo-4.11.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 cxtgeo.py,sha256=TdHva0vqjD5B_9jA6kxvev9i2kvZ4Oftc1bQoLdFNXQ,33972
 cxtgeoPYTHON_wrap.c,sha256=E76gd7QM28i3EYkuQEA1V_-3cxzXxsi_b151ZcEszxk,655525
 xtgeo/__init__.py,sha256=edNCOXuPS5qjutDGX5-2Pz0T2Lpx1GoeG3IoeXUdBw8,5834
-xtgeo/_cxtgeo.cp313-win_amd64.pyd,sha256=tjPrGiXnYx110Jk2kK67t-fTDI1xuhAvLBvWqpRQzoE,728064
-xtgeo/_internal.cp313-win_amd64.pyd,sha256=i0ImMJPKCLYo-ylyIfi_qJJc5vvr0RoFXhvAOdlOpGk,910848
+xtgeo/_cxtgeo.cp313-win_amd64.pyd,sha256=sW472vaPr4QBXwJ7-dY7d3X3qmHYrHW_K8SJWoUPocg,720896
+xtgeo/_internal.cp313-win_amd64.pyd,sha256=uc6sJW1i5EC-rBtKs7wzjfdCNTI2xuYa_Q9nbRK_j3M,971264
 xtgeo/common/__init__.py,sha256=6R_OizhLnAoJUmUoQtGqgNvGcn1HWc4udc6YvRRlxWQ,480
 xtgeo/common/_angles.py,sha256=fAX5FzgqIjjIDe9_C7gy6zPjdaSQuzMb8Z2XdKSx-6Y,851
 xtgeo/common/_xyz_enum.py,sha256=gb1PVOWMTRb4YGDq9Q0YVVkKqMyI_xBg1vUBvOLXlfs,1095
@@ -12,14 +12,14 @@ xtgeo/common/exceptions.py,sha256=OZyU9C8cS4NhCnjQyREfuoVy9mdvGCiccd4nC9yn_N4,12
 xtgeo/common/log.py,sha256=8-wTrZd87UNr_ZEb_lZvR1khUeKmIO_UECMpV_Q_btM,2835
 xtgeo/common/sys.py,sha256=lvvmS4D7qaAVVg5UueNSt44WeEgpZcmyINEGKLHXctM,5144
 xtgeo/common/types.py,sha256=LanIGZh0HU2XXfJelZA-FC__J6fLB1DzuN7jj7hNSgU,362
-xtgeo/common/version.py,sha256=webkQYCLapKyXq4N-wy_1-S59jreweESFu1CwTt_iwA,534
+xtgeo/common/version.py,sha256=cUrL8yRkWKktCAzG1Q7nFkTmqJi0-LynyrYt5bBPYCE,748
 xtgeo/common/xtgeo_dialog.py,sha256=XX445byFvdRjT2Eg9Mgd3ChRQ9d1Mj5MEdsBRYBSo8A,17733
 xtgeo/cube/__init__.py,sha256=5_F9Cefu4081jIwDqsyJGKTlrVLe1UfwI8wQXVRYPDM,169
 xtgeo/cube/_cube_export.py,sha256=YcU_0c_kFyh8T_ytY8XRR9Bmt8KK3J1taMLzo_w_m4c,6659
 xtgeo/cube/_cube_import.py,sha256=F6uWEXWxX0a4Px6HVa0pRCPNcfr36bMe_559CSf4h9c,17314
 xtgeo/cube/_cube_roxapi.py,sha256=UvU4yr1b1ZTyYxBIj7_ei2aub_VqAdP9S_6znpzDJ14,5101
 xtgeo/cube/_cube_utils.py,sha256=Mx79j29QLBJQ8wlwAfVgb-xN0ud7ilRIh6jOx7HMs2o,7727
-xtgeo/cube/_cube_window_attributes.py,sha256=CN2nweAwnREtE-5pANWTwCDG0KLH9-SL2K4zwVCqs0U,12435
+xtgeo/cube/_cube_window_attributes.py,sha256=NAgm2WCjpiFx5eLUM5G0HqUSf0SKaVb6hVOXMD7x3zs,12956
 xtgeo/cube/cube1.py,sha256=QKqKIGH814zehx-avRuett996cx8lI-2bYyjuqaCmkw,35864
 xtgeo/grid3d/__init__.py,sha256=yctcaBS-PW_s3hCd7xq-XZZi514R_fgcpIrMnETZ87w,347
 xtgeo/grid3d/_ecl_grid.py,sha256=Oqe0_4ErUZkM-le4EnM6hMqXGMpMZyrr9-W9Xa7ZN1A,26679
@@ -34,7 +34,7 @@ xtgeo/grid3d/_grid3d.py,sha256=rTqfhwK4dNX1A5M-xUC-9hWwfxrkX6_TVgwc79KCXCI,769
 xtgeo/grid3d/_grid3d_fence.py,sha256=yDmKwlErNCl13vV7opJjKlzlwCzwk2gSJnzIb4jGpHg,9501
 xtgeo/grid3d/_grid3d_utils.py,sha256=VBbdzah_D8yeaMU4vMQRYTFRKq95QaGqPk4oXYBWdHw,7477
 xtgeo/grid3d/_grid_boundary.py,sha256=xNumtMeOfjmwS5vzv1Nl_yZpGiDEQXk896pXzugdUVs,2384
-xtgeo/grid3d/_grid_etc1.py,sha256=fhjSSt1QDbXBX4FadWkufH7Q4jOquIbIaBNWC3yUI7Q,44538
+xtgeo/grid3d/_grid_etc1.py,sha256=VAdNNruPf_xq8vW9kX7-ICHINafdOuEYILBjLCsqHGo,44747
 xtgeo/grid3d/_grid_export.py,sha256=krz3cL-38QYa4x7RjIH_1JyiNVMtyOpL3ZVWnfUmAWo,7391
 xtgeo/grid3d/_grid_hybrid.py,sha256=4xtZlZSzn0BY8Kl8TY6Su3QtCH16ax-Tf49ItvHaRPk,1666
 xtgeo/grid3d/_grid_import.py,sha256=Y11JDjf5tZkDth69aTtbkMfMjRbVvSnQbV3lt-jCuA8,2672
@@ -57,14 +57,14 @@ xtgeo/grid3d/_gridprops_import_eclrun.py,sha256=M7hvBazZPjYsKOYBL1SHCcYqztgonARu
 xtgeo/grid3d/_gridprops_import_roff.py,sha256=fCCMwa8OgLXk9zMvFpr4nfsKLkmBFKKLSfLwUHenyTA,2550
 xtgeo/grid3d/_roff_grid.py,sha256=kppx044-JmfLvaIt5NPABnIoLwJ1BGQc2gFeog7Cl0g,17742
 xtgeo/grid3d/_roff_parameter.py,sha256=9gVlFMyT2QbwUvm_FCJG0hTvJPrK2Y86kbeljs2eCbc,11376
-xtgeo/grid3d/grid.py,sha256=TcQzPUxUYHilN3qmgZ29wWLchNoRY714O_2uh94l15U,107808
+xtgeo/grid3d/grid.py,sha256=AY91CcoeaZQtEAyuHz1UmZROh6VPq2z56CKBbG6Dn9g,108604
 xtgeo/grid3d/grid_properties.py,sha256=OlIyo1PXrTRFHGn8avXdBXNpFM5DJuLjVRB9koayKGQ,24993
 xtgeo/grid3d/grid_property.py,sha256=Fd1CC2_pSg4cLS7EGHHtDhSIk8w3VRrQ_fXUX3-1mMo,46687
 xtgeo/grid3d/types.py,sha256=eaBHJL91zXV0ipaY30K_ZpEdUfjj681CoAbKfvNZ_5Q,290
 xtgeo/io/__init__.py,sha256=k5OQUG7ePoTleAh8ECiwowCg1imL6dx9O7gPUArcQQw,23
 xtgeo/io/_file.py,sha256=-bacKEMpbPMF1al3gqoV5pu0J57g26mRdSasxNk20Gg,21085
 xtgeo/metadata/__init__.py,sha256=VV81ga8OzzrowieSQZ5bZxo3Ug70Dch89iwZF1mOshA,337
-xtgeo/metadata/metadata.py,sha256=HD98hyOA1gb0nazvgE7KoXuGBMJ4wsQa1wi1tqL7GDM,12568
+xtgeo/metadata/metadata.py,sha256=0EVNcXXDh3mimYNZYW3FIYe3bXIzeEKRyqZOzBhu31E,12874
 xtgeo/roxutils/__init__.py,sha256=_f2qb32IFeZ_8YhcTDFlNgsWyH0HPDJQ7V0qUbjmUSs,99
 xtgeo/roxutils/_roxar_loader.py,sha256=mKg3SsHJDzaGEYQwuY2yPcTxOnCybKmq3IeLmteCJPg,1958
 xtgeo/roxutils/_roxutils_etc.py,sha256=Lma5Hskrld2PDLicSTkASse2t3eqxvtnure9uDCyjxo,3852
@@ -111,7 +111,7 @@ xtgeo/xyz/_xyz_oper.py,sha256=_uCR-PYEsPQkBKh82oDvUsz7Y2vqsjqoiEdfmd8HIEU,20058
 xtgeo/xyz/_xyz_roxapi.py,sha256=NWgnPShA8amuHgSTqvy5_y21Qyx2s_6IWP1qPyHTPb8,26585
 xtgeo/xyz/points.py,sha256=UhcdR7nEw3Lxa496UMOWOm5IkpQLC_IRU0FcFLpEV-o,23253
 xtgeo/xyz/polygons.py,sha256=JjvA5BiW0HzaVmuZjnKB55n0OJXZfjOBQHfSNcZBDiA,28791
-xtgeo-4.10.1.dist-info/METADATA,sha256=BgjBbVjXQOmIf5Rb2f9KsWqpP5CMTilfqnLgm5kLzqw,5789
-xtgeo-4.10.1.dist-info/WHEEL,sha256=9y7ongB9C9SKxcdQbfZEuRQ0kgbFdtXA-x9tA6LgmEA,106
-xtgeo-4.10.1.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-xtgeo-4.10.1.dist-info/RECORD,,
+xtgeo-4.11.0.dist-info/METADATA,sha256=_ORJH3UT7GiS4VR4R8EJ5sw4uahZ_BjT6yugeM_76sU,5789
+xtgeo-4.11.0.dist-info/WHEEL,sha256=_PdgJ-W7uMAsWwnGnEdiicDU_PKcobRdffEM23gmN6g,106
+xtgeo-4.11.0.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+xtgeo-4.11.0.dist-info/RECORD,,

{xtgeo-4.10.1.dist-info → xtgeo-4.11.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: scikit-build-core 0.11.4
+Generator: scikit-build-core 0.11.5
 Root-Is-Purelib: false
 Tag: cp313-cp313-win_amd64