xtgeo 4.10.1__cp39-cp39-macosx_11_0_arm64.whl → 4.11.0__cp39-cp39-macosx_11_0_arm64.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/lib/pkgconfig/fmt.pc

@@ -1,5 +1,5 @@
-prefix=/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/tmpzhf11f5z/wheel/platlib/xtgeo
-exec_prefix=/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/tmpzhf11f5z/wheel/platlib/xtgeo
+prefix=/var/folders/x7/ch5v91h56_zbvbd1y2f600dm0000gn/T/tmpm15nust6/wheel/platlib/xtgeo
+exec_prefix=/var/folders/x7/ch5v91h56_zbvbd1y2f600dm0000gn/T/tmpm15nust6/wheel/platlib/xtgeo
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 

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,12 +1,8 @@
 cxtgeo.py,sha256=MjY_SfwNrahCXED08vVn7OsQPQPU7rsKwxSp2GY5WKI,33396
 cxtgeoPYTHON_wrap.c,sha256=jdx6wYGtLu7KKXcEHC9XqRTEMkYc4x4D07FPmYKSjPE,635145
-xtgeo-4.10.1.dist-info/RECORD,,
-xtgeo-4.10.1.dist-info/WHEEL,sha256=YlHs6QrNqeLOOdzG0Kyl_FxLeqDcuwEMqdchZlltl3k,139
-xtgeo-4.10.1.dist-info/METADATA,sha256=BgjBbVjXQOmIf5Rb2f9KsWqpP5CMTilfqnLgm5kLzqw,5789
-xtgeo-4.10.1.dist-info/licenses/LICENSE.md,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 xtgeo/__init__.py,sha256=-p6vKOv7EfAt1S-7CmWHfN8iHjFHQ--5UwhIysS_gRQ,5588
-xtgeo/_cxtgeo.cpython-39-darwin.so,sha256=XMxpYaj2jkFsagsDlBqnNgKBWPW6buGXNn7dle2OJAU,414864
-xtgeo/_internal.cpython-39-darwin.so,sha256=2We58WfeXc-B1xj6SwWDLka1AQIHcJxzCP5PZZQaWWY,664080
+xtgeo/_cxtgeo.cpython-39-darwin.so,sha256=Gx6zT-TrHNU3r7QeO2aHqo1Hc4aLMe-u0BSYgnoLa64,414880
+xtgeo/_internal.cpython-39-darwin.so,sha256=2fT1z2Gkd3gx4Qhyl7hv8Q3YtB9mXrV8IkitU4_VK64,714816
 xtgeo/well/_wells_utils.py,sha256=hjJEBdtILtK87sbCYWHJ7aEgqgKkak6ihfOcxSixNPo,4945
 xtgeo/well/_blockedwell_roxapi.py,sha256=G0IEChtCF7SPV_nXDIYsJ5L601HjA9QdWU7cNoyJyus,7489
 xtgeo/well/_well_io.py,sha256=CHvLfuIVNoX_4PQd7sCWg5xvyCd1L73J5dkmV2uaJqU,9821
@@ -36,7 +32,7 @@ xtgeo/include/fmt/std.h,sha256=ogzbgTUxCUFupDozCWAG0yMhWeiV6QtkEbaR0p9jR8A,22277
 xtgeo/include/fmt/base.h,sha256=E8jZU_stmNyVUondFmmZvSLbq_66f0hrNpPCxtnWJ9s,103990
 xtgeo/grid3d/_grid_import.py,sha256=T--Nk4CVKifCskc2i8y6cpFXV2LZdTmJC3iSxKXXiZE,2593
 xtgeo/grid3d/_roff_parameter.py,sha256=UNS2cngVP3GIAr5nVCoGQYJq062KtfvCAkFb0FEJY68,11073
-xtgeo/grid3d/grid.py,sha256=1zPBimDbI2X6zPSu7dDHPM3RbTvPxOFtYI0gJ-tvBTw,104960
+xtgeo/grid3d/grid.py,sha256=8ImGx_fgKcbcsnV3GuxWX_9sPxK_iWe3cPWbAmI6bjA,105740
 xtgeo/grid3d/_grid_boundary.py,sha256=oxWmQdy9cG1PzAtOH-IcCqAQYfmIwTD87tc-c4VgTA8,2308
 xtgeo/grid3d/_grid_import_ecl.py,sha256=gIcX4uMnwg0UnYMXyUdJsFSNKV-yhLFtc88AL1fmx6Y,3453
 xtgeo/grid3d/_gridprop_roxapi.py,sha256=4asCcVUXF42TKyD3oXTavBdPkAcAjZsra9QI12I3has,6857
@@ -62,7 +58,7 @@ xtgeo/grid3d/_grdecl_format.py,sha256=qUxq4c4e4-HGccFshLoOoGkgwwpaZeMbnWi4PhxPA7
 xtgeo/grid3d/_grid_wellzone.py,sha256=cBLmO4YL62vHEVvltxFHyQScZIY2RQQcrIqq9Cx6euE,5786
 xtgeo/grid3d/_find_gridprop_in_eclrun.py,sha256=zUv1Fk5ouSICYd9SR7NpHbN78rFBcN7FBlURmeyaedk,21434
 xtgeo/grid3d/_gridprop_lowlevel.py,sha256=8aUDxj1mPu8yH0F9FVaxxumew1OdBOkwEQI5tjIZEQI,5086
-xtgeo/grid3d/_grid_etc1.py,sha256=Wj9YmfOW4LXo5rUC01j0V_LLb-uWb9kaeOB6jc7tTUA,42969
+xtgeo/grid3d/_grid_etc1.py,sha256=54q91KLpkvtYweWHer7Fq18O0haA2nP-K-nikGPl-dI,43173
 xtgeo/grid3d/_gridprops_import_eclrun.py,sha256=kWzubpyeorvfUSEjIF-UdoGnzQYYsUePW2jUtgoTuf0,11438
 xtgeo/grid3d/_gridprop_import_roff.py,sha256=tXp_mMqwfblSEb5KUbMOcL-TgGVn--vEqzPeXAK1IuI,1523
 xtgeo/grid3d/_gridprop_export.py,sha256=J_EL1bfs2ZB0B-foQLRhYjCQ1lB40yVHUD_utrd3TlU,5456
@@ -76,7 +72,7 @@ xtgeo/grid3d/_gridprop_import_xtgcpprop.py,sha256=-9576pMYO78IZl4VgaI_dk-ArCh0LR
 xtgeo/grid3d/_gridprop_value_init.py,sha256=tN3LVziZsyIxbghkpGt6tCsHWFvGEm1e8ZpYpBgBdB8,4314
 xtgeo/cube/_cube_roxapi.py,sha256=mj9Nnug13t_Fsu0w4KKaJNEmrB_kYb0m133T6W-7wt0,4921
 xtgeo/cube/__init__.py,sha256=JJHhXXkXgFYRZTk5JDtqjxVzczDgLsHSLS-NPgCutIU,160
-xtgeo/cube/_cube_window_attributes.py,sha256=NSzfMioXxCCyl8fu3Kj3No4KK3pW2luxAjb1PdeQJ8Y,12095
+xtgeo/cube/_cube_window_attributes.py,sha256=Ld4cGYQnN-jEu1m2CROWu6uCVbBIhr9TDv2G3pJSEFc,12607
 xtgeo/cube/_cube_utils.py,sha256=wTQZX2sNgmsYRRswjqr4h_NJp1CwbXVH1DWIejaIRbo,7440
 xtgeo/cube/_cube_import.py,sha256=7wgjUZHeXnP2KyW5zKQwX1X1k_t0RC6Rat7PL-m67PA,16782
 xtgeo/cube/_cube_export.py,sha256=G2e4ybxl7htjkGn1O-Eb9FrVf1o55esr_roNNubEknk,6445
@@ -113,7 +109,7 @@ xtgeo/surface/_regsurf_cube.py,sha256=xZXIE418guB3rG8iscI9xQ0deAtJ_auu1XDe3ml9GB
 xtgeo/surface/_regsurf_utils.py,sha256=P91jVmstYGe-bn6ut-9xfd8DiOw7QUCt2DLwbnlJwB4,2307
 xtgeo/surface/_regsurf_import.py,sha256=IXD1T4hLRk705RbixSfcOxyrBUilRRbUHYC_S_xZqZA,10396
 xtgeo/common/_xyz_enum.py,sha256=IiKRWhvIKKRhUH2QwpDttW4XqJ4f4StPrVt1vfVBTxM,1045
-xtgeo/common/version.py,sha256=vAiDsjske6vYWCo19AZtvfNbZxxZSZdkh63Bfib72AE,513
+xtgeo/common/version.py,sha256=O12saSYjwbRCsG-uGD4_hG7qeZhWVDdXRNxpZkiz9TU,714
 xtgeo/common/log.py,sha256=3C_WdYpCMEr5ebIGoGmalXNP0O2IGvLuJdzeuR8Cd-o,2742
 xtgeo/common/xtgeo_dialog.py,sha256=AcT8DrIBViSZJltwZuEfrcRbmicQEFfbwlf_gV2-6k8,17129
 xtgeo/common/constants.py,sha256=vp6k7lkWKKxyvojQZ1yYhhwXRXGZlMCPK8WY9nG2yns,749
@@ -123,8 +119,8 @@ xtgeo/common/_angles.py,sha256=VuNLV9pTooF_V3thFTg9SmTMBnKkv6ZxyvOXw22vLE0,822
 xtgeo/common/calc.py,sha256=xrJIVqFlrPIjhORbMThQylbjD4xdMM_vtEqBu5vc7C8,10134
 xtgeo/common/exceptions.py,sha256=4BRCtzk74eyc4LeeapAWFLkNh-TT0ev5pDxKJlPaI7s,1175
 xtgeo/common/sys.py,sha256=NGxnVoPoAGx_lekTF9QPBEf-VF8ORp4buoBeh6jkZko,4978
-xtgeo/lib/libfmt.a,sha256=M3dluLM0ZXPMtvFa6ylDUh223bdHhJgVkPAEuZhdSbU,164136
-xtgeo/lib/pkgconfig/fmt.pc,sha256=mVA6ez3oJYJIxd6sF-Ks-ZbjuJkHw331_8vR0ODKEgI,353
+xtgeo/lib/libfmt.a,sha256=O5aRzwF5At8JIM-yAmE5uFnb9ENCUF_IxF3UNOLb5wk,165328
+xtgeo/lib/pkgconfig/fmt.pc,sha256=T_3O_tJaJnyigieH16ePSJD8x5EJ1y4ZLI3j8n9r3gk,353
 xtgeo/lib/cmake/fmt/fmt-targets-release.cmake,sha256=0hurnnAYtVc8r8yvaxkXAS5Op01RPnwKE6SFNOL1nYA,807
 xtgeo/lib/cmake/fmt/fmt-config.cmake,sha256=Cd-Xn_HSZ-Lk5ZBDX8q49OQKSvnS0_k4r0-tb6G8LW4,999
 xtgeo/lib/cmake/fmt/fmt-config-version.cmake,sha256=p1j16l20z3aEnEsIu-cbcrqFT32K2IJNZl10B8Ww2pk,1862
@@ -133,5 +129,9 @@ xtgeo/roxutils/roxutils.py,sha256=BGvnWhYKvX2h7eU0ZXNUuDnHi8IM_2lLIzpq9lWZI6M,69
 xtgeo/roxutils/__init__.py,sha256=UJKTgNSIGdtRxaUAwot4D5sGCTdfITw6BRaOnGkk41k,92
 xtgeo/roxutils/_roxutils_etc.py,sha256=K1fJKFBinfj32GGYnauU5t1sIgJ0l7N2gkXvaxMpNS8,3730
 xtgeo/roxutils/_roxar_loader.py,sha256=R2yBt7su6_u87UP00lLaiDxW0QuSnFLkEJQgcTWhjZI,1904
-xtgeo/metadata/metadata.py,sha256=kvbXu6dzVtdt-rEHsiHK_wJ0MRHNQCCzopBsw53T2l8,12137
+xtgeo/metadata/metadata.py,sha256=mGkjNYcU4Y11EoLKTzSNW6JYpJVvIYNCbQ8obKMv21g,12436
 xtgeo/metadata/__init__.py,sha256=WXmKZjBGV3kr-lmrPxr3Ph7CpI5KIn3WKlE23crBteA,320
+xtgeo-4.11.0.dist-info/RECORD,,
+xtgeo-4.11.0.dist-info/WHEEL,sha256=cmStAX5iofQGAl7xoF50y-CsNTK74uIt8Y11VBvrtS4,139
+xtgeo-4.11.0.dist-info/METADATA,sha256=_ORJH3UT7GiS4VR4R8EJ5sw4uahZ_BjT6yugeM_76sU,5789
+xtgeo-4.11.0.dist-info/licenses/LICENSE.md,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652

{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: cp39-cp39-macosx_11_0_arm64
 Generator: delocate 0.13.0