xtgeo 4.12.0__cp312-cp312-win_amd64.whl → 4.13.0__cp312-cp312-win_amd64.whl

xtgeo/well/_blockedwell_roxapi.py

@@ -1,5 +1,7 @@
 """Blocked Well input and output, private module for ROXAPI"""
 
+import warnings
+
 import numpy as np
 import numpy.ma as npma
 import pandas as pd
@@ -191,7 +193,6 @@ def _roxapi_export_bwell(self, rox, gname, bwname, wname, lognames, ijk, realisa
         else:
             bwlog = bwprops[lname]
             bwprop = bwlog.get_values(realisation=realisation)
-
         usedtype = bwprop.dtype
         dind = bwset.get_data_indices([self._wname], realisation=realisation)
 
@@ -199,9 +200,28 @@ def _roxapi_export_bwell(self, rox, gname, bwname, wname, lognames, ijk, realisa
             raise ValueError(
                 "Dataframe is of wrong size, changing numbers of rows is not possible"
             )
-        maskedvalues = np.ma.masked_invalid(
-            self.get_dataframe(copy=False)[lname].values
-        ).astype(usedtype)
+
+        # Get the values
+        values = self.get_dataframe(copy=False)[lname].values
+
+        # Create masked array first, then handle casting
+        masked_values = np.ma.masked_invalid(values)
+
+        # Handle casting based on target type
+        if np.issubdtype(usedtype, np.integer):
+            # For integer types, suppress the warning and handle invalid values
+            with warnings.catch_warnings():
+                warnings.filterwarnings(
+                    "ignore", "invalid value encountered in cast", RuntimeWarning
+                )
+                # Fill masked values with a valid integer before casting
+                filled_values = np.ma.filled(masked_values, fill_value=0)
+                cast_values = filled_values.astype(usedtype)
+                # Recreate the masked array with the original mask
+                maskedvalues = np.ma.masked_array(cast_values, mask=masked_values.mask)
+        else:
+            # For float types, direct cast is fine
+            maskedvalues = masked_values.astype(usedtype)
 
         # there are cases where the RMS API complains on the actual value of the masked
         # array being outside range; hence remedy is to set 'data' value to a usedtype

xtgeo/xyz/_xyz_io.py

@@ -288,15 +288,17 @@ def import_rms_attr(pfile, zname="Z_TVDSS"):
         names=names,
         dtype=dtypes,
     )
+
     for col in dfr.columns[3:]:
         if col in _attrs:
-            # pandas gives a FutureWarning here due to casting what was
-            # previously a string to a float/int.
+            # avoid FutureWarning by not using .replace() for mixed dtypes
             if _attrs[col] == "float":
-                dfr[col] = dfr[col].replace("UNDEF", UNDEF).astype(float)
+                s = dfr[col].mask(dfr[col] == "UNDEF", UNDEF)
+                dfr[col] = pd.to_numeric(s, errors="coerce").astype(float)
             elif _attrs[col] == "int":
-                dfr[col] = dfr[col].replace("UNDEF", UNDEF_INT).astype(int)
-
+                s = dfr[col].mask(dfr[col] == "UNDEF", UNDEF_INT)
+                s = pd.to_numeric(s, errors="coerce").fillna(UNDEF_INT).astype(int)
+                dfr[col] = s
         # cast to numerical if possible
         with contextlib.suppress(ValueError, TypeError):
             dfr[col] = pd.to_numeric(dfr[col])

xtgeo/xyz/points.py

@@ -504,6 +504,7 @@ class Points(XYZ):
             "Direct access to the dataframe property in Points class will be "
             "deprecated in xtgeo 5.0. Use `get_dataframe()` instead.",
             PendingDeprecationWarning,
+            stacklevel=2,
         )
         return self._df
 

{xtgeo-4.12.0.dist-info → xtgeo-4.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xtgeo
-Version: 4.12.0
+Version: 4.13.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>
@@ -50,6 +50,7 @@ Requires-Dist: coverage>=4.1; extra == "dev"
 Requires-Dist: hypothesis; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pandas-stubs; extra == "dev"
+Requires-Dist: psutil; extra == "dev"
 Requires-Dist: pydocstyle; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-benchmark; extra == "dev"

{xtgeo-4.12.0.dist-info → xtgeo-4.13.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-cxtgeo.py,sha256=TdHva0vqjD5B_9jA6kxvev9i2kvZ4Oftc1bQoLdFNXQ,33972
-cxtgeoPYTHON_wrap.c,sha256=E76gd7QM28i3EYkuQEA1V_-3cxzXxsi_b151ZcEszxk,655525
+cxtgeo.py,sha256=LpfocX7SkcH-Mm-gU7vK4ZnVJVGhAaoQVXTt00YOmlA,32678
+cxtgeoPYTHON_wrap.c,sha256=Jqhwcya3gd-D86SRQpO3t0tfguuj2ODX64spcw_HxVg,636863
 xtgeo/__init__.py,sha256=edNCOXuPS5qjutDGX5-2Pz0T2Lpx1GoeG3IoeXUdBw8,5834
-xtgeo/_cxtgeo.cp312-win_amd64.pyd,sha256=VpIuaVWOpWE7QIvE6Zqa58i2iDv7fJ4dYmz3OwavT7I,720896
-xtgeo/_internal.cp312-win_amd64.pyd,sha256=SMvHNjTgIYsZgRWo9-DlE1JCuLZVUlVzDP7blcCxjUk,985600
+xtgeo/_cxtgeo.cp312-win_amd64.pyd,sha256=SsWTB5o7z0Nfdq9Ov_RcYs8pAp55VKzssmIosM9vitI,698368
+xtgeo/_internal.cp312-win_amd64.pyd,sha256=xywygmJ-rjGXQAUfsrLeixYkWeYFVG1bJOxoXMDQXuQ,1122304
 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,18 +12,18 @@ 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=TGPzC91qCIpsmAjdh_1loT2Gs_vjWi5JhetfyITnpsU,748
+xtgeo/common/version.py,sha256=3GfILrgbGmS7LIafEAcI93zYnldfjDfKDxNluh7L6I0,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=NAgm2WCjpiFx5eLUM5G0HqUSf0SKaVb6hVOXMD7x3zs,12956
+xtgeo/cube/_cube_window_attributes.py,sha256=Q1lcyVF5dm-_FfFXOnsR6hrVB6PuOrNFCKJy_g_gkSs,10254
 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
-xtgeo/grid3d/_ecl_inte_head.py,sha256=t2Bft2D75hJTmJkEBrBQWy1-Ex7ipUepLV16EG0zM-s,4773
+xtgeo/grid3d/_ecl_inte_head.py,sha256=zCP4cIM9VuT8vZfMTuAjFSuyP2UHhtT3RZO73m0mxPE,4901
 xtgeo/grid3d/_ecl_logi_head.py,sha256=pioEgigpnLjyDWq07Msp82xS15GCxrBZfSpEd2klEuQ,2735
 xtgeo/grid3d/_ecl_output_file.py,sha256=8IPXV-WMkh37VH78XibmMuVK9zBkmimqwc-uqy_1VCQ,2095
 xtgeo/grid3d/_egrid.py,sha256=S-X1B8vmO_Zmj8dJZuEdVUDDu3noXhTGgg6udB2hHVg,34839
@@ -34,14 +34,14 @@ 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=V8XeVU4-1ZRDOmyDQS3FrU_SY6bZkssvMuV_boR6Uzw,45156
+xtgeo/grid3d/_grid_etc1.py,sha256=DBq1__wemVhjfk42HrADrwwygXbb0DckEvSvYue0yHo,45551
 xtgeo/grid3d/_grid_export.py,sha256=G36va-Kz93W-P2z8Qr-0Dq-o7Abfsd3OC8ESCAFRh2M,7492
-xtgeo/grid3d/_grid_hybrid.py,sha256=4xtZlZSzn0BY8Kl8TY6Su3QtCH16ax-Tf49ItvHaRPk,1666
+xtgeo/grid3d/_grid_hybrid.py,sha256=jMkLIEkab3f9_I8cKAc9wKczZZ3HpBFhwYwyBme6fe4,1305
 xtgeo/grid3d/_grid_import.py,sha256=Y11JDjf5tZkDth69aTtbkMfMjRbVvSnQbV3lt-jCuA8,2672
 xtgeo/grid3d/_grid_import_ecl.py,sha256=WQw0Vr7ftFdM-_Jm1KjhGJ_Ko2PPO0eLgi6lCE98VYo,3554
 xtgeo/grid3d/_grid_import_roff.py,sha256=davWOUvCYPbvSFKm5bDCJJNPR-9uW_bOn4faGBhudUg,4174
 xtgeo/grid3d/_grid_import_xtgcpgeom.py,sha256=ZVqkf1QAvv8iDFZxV-2AhGimUjAdFcMwFml7yqocACU,10577
-xtgeo/grid3d/_grid_refine.py,sha256=W5mDAJuKuCovuWRseaXfrS4Eqku0NbgqwnsuAsQOOlQ,8799
+xtgeo/grid3d/_grid_refine.py,sha256=jjYgBySFOE1qDaZwPshttkawjyVWPbHW1h3dj7qprQI,8816
 xtgeo/grid3d/_grid_roxapi.py,sha256=ixanN3VNGQM3QeVxXLHj_hKZJSiG3cdZwHc2NdXg_ms,9199
 xtgeo/grid3d/_grid_wellzone.py,sha256=5OwMsmksC0Wza5XXfUiDHCzSLWqmV3JbSORDUFPXZho,5951
 xtgeo/grid3d/_gridprop_export.py,sha256=wKYm6UhRCrDwf74V_HuWvdlYKgET6iIm8i1fGpPgbGY,6735
@@ -51,13 +51,13 @@ xtgeo/grid3d/_gridprop_import_roff.py,sha256=vAHfXTjopeFLCVtseQdqlgkLNFfT9aW9I0n
 xtgeo/grid3d/_gridprop_import_xtgcpprop.py,sha256=ToajcbJL4cHo-gV1ab2rPQ0U5DxNnUfetvO1tetafNc,5027
 xtgeo/grid3d/_gridprop_lowlevel.py,sha256=1PBIn2ZMiF5Gj9u2n6xu2PFDiJ6NdrgYaL89lkq3_yo,5257
 xtgeo/grid3d/_gridprop_op1.py,sha256=5es5e-b14OsEnk1xt-C2iuyv0DEYYkC_0Nq7Coe6Tw8,9228
-xtgeo/grid3d/_gridprop_roxapi.py,sha256=4Aa4Vqzmml6RjePuRqyl68WeCxuICYv7p1u6KgL_R94,9262
+xtgeo/grid3d/_gridprop_roxapi.py,sha256=HC__3rEGIi1wq9BkRSpXUtHBcD3eypftjRTHmoFxpM0,9394
 xtgeo/grid3d/_gridprop_value_init.py,sha256=xMAFhTKiZvq3QLcsYuuFRBBWzEQR9gxw7rMuj5ko5P4,4454
 xtgeo/grid3d/_gridprops_import_eclrun.py,sha256=M7hvBazZPjYsKOYBL1SHCcYqztgonARuQtXBQ_hyMdI,11782
 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=d628JbJ5VqM-jiCyyITCNflPbSo-9ESE_v0nGGNJKh0,109596
+xtgeo/grid3d/grid.py,sha256=P-uO-wBiN1wok-RVpcICd49zW3iI86s9QpXwU7BPOT0,110086
 xtgeo/grid3d/grid_properties.py,sha256=OlIyo1PXrTRFHGn8avXdBXNpFM5DJuLjVRB9koayKGQ,24993
 xtgeo/grid3d/grid_property.py,sha256=Wm9H6Nzqs8fSD35eg3NqTb-i6HGThsRmwbynZLg1nMo,45980
 xtgeo/grid3d/types.py,sha256=eaBHJL91zXV0ipaY30K_ZpEdUfjj681CoAbKfvNZ_5Q,290
@@ -81,15 +81,15 @@ xtgeo/surface/_regsurf_gridding.py,sha256=igldvuMznjPxPSNY8vBpKRhV5C4yLq4QrrtIu_
 xtgeo/surface/_regsurf_ijxyz_parser.py,sha256=7pyXWkYUoziDeDx4C2U1ywdXfX9-aa6Fw6OWDCbvN2o,10155
 xtgeo/surface/_regsurf_import.py,sha256=0xGbf2R5R4MYPfieH17d0IxJyb4p2WvqIds2EA3Ppig,10743
 xtgeo/surface/_regsurf_lowlevel.py,sha256=T7-7bU1vteKTb4UUocP8ia5-BkXIZNiplxmXLEsOSYo,3610
-xtgeo/surface/_regsurf_oper.py,sha256=2Gp1_CDUSeA753FtrhzE-nPh3wOH6kOIZi_BVkRNMrM,17807
+xtgeo/surface/_regsurf_oper.py,sha256=mshy54xn-QSDtU-sjWTfznufwcsOZoQjGwbVV9mel6c,14693
 xtgeo/surface/_regsurf_roxapi.py,sha256=fy07kF_BlLQ5ZLRENltsMZEjZxwfiJ6KmLTgaqiuqz0,8718
 xtgeo/surface/_regsurf_utils.py,sha256=IPzvh_Gpfz_oELuMRFmnVQahBw_A2b5H4W_JCLl0rFk,2388
 xtgeo/surface/_surfs_import.py,sha256=6zHTgBkB3g6XRE_OS2W20aFwLYbwU-VU7oEtQhZ1iLw,1283
 xtgeo/surface/_zmap_parser.py,sha256=yhtLOCUEmtdaCGYxDS9Qgw7ne2G7llBZ39B_noTXHlQ,4208
-xtgeo/surface/regular_surface.py,sha256=JcK6WiD_k5qqIbYxA5nf9Cn-q209xFgq7c6mDEi-BvM,110752
+xtgeo/surface/regular_surface.py,sha256=2RyNhXkeLZ38wLJic0F3nRS5bCmUMGady2-4sctIMAc,110556
 xtgeo/surface/surfaces.py,sha256=rlnrp2b-kyvjnVfDNwtazw0nzv6McMbZFGqu5xZB_kY,9639
 xtgeo/well/__init__.py,sha256=T3oOSJaUj3SwSG-YxeFM-oqppIYq2CZqPxBEB5khIys,615
-xtgeo/well/_blockedwell_roxapi.py,sha256=FQbbmUiUWVJeS_NvOny7ZIso6I0v6JlyG73SzeNfSyQ,7710
+xtgeo/well/_blockedwell_roxapi.py,sha256=SzuhJYQhnflx6FN81arg0oPC9YLlLb1QsAa1xmDU6Mo,8662
 xtgeo/well/_blockedwells_roxapi.py,sha256=fyyxfmUJ1JqS6EI9ALxoNxNGSvjl3YToK5h6sjJi_kY,2052
 xtgeo/well/_well_aux.py,sha256=t-36pZ24nbo64kpdRXFlQFsbfuWPgyu-XX59mjSDa-s,851
 xtgeo/well/_well_io.py,sha256=Omq7El3V9LJ0V9UO8QjW4Y3AuvaoEqRjP8fwcv1lY1s,10148
@@ -105,13 +105,13 @@ xtgeo/xyz/__init__.py,sha256=Krd4THP4Wr1iDX6K0NSDgi5RvDtNN3960bzL6NjW6KY,180
 xtgeo/xyz/_polygons_oper.py,sha256=XVPgA0PISy5wKSgX-Nvgja7KN3LV9l0W9hTvGh5hlUM,9618
 xtgeo/xyz/_xyz.py,sha256=mgie8KaZkz6RTkWRLamyB5OKQN7m64VbheNlahX56zo,29150
 xtgeo/xyz/_xyz_data.py,sha256=ZnXqt3HGL2Fz7rQvi25A50xDLwShcnx4X63tibC3PLc,24772
-xtgeo/xyz/_xyz_io.py,sha256=hrGbxZ650pCMb9lAhWvjDwqXNcbix_spyAUeLASBHnE,24597
+xtgeo/xyz/_xyz_io.py,sha256=rV6ostW84JVop5F-0-s4GtcPX0Zj32JtqjejGKQXfKs,24718
 xtgeo/xyz/_xyz_lowlevel.py,sha256=iHYVnDFj5ptpWJ9qNJ_PRO-Y8FM9QLRgP8HrgHT_ErY,1083
 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/points.py,sha256=LObAxc8EC5-wxWFX8HJ9F-ouw0uoHdOpvswd-SIB8KQ,23280
 xtgeo/xyz/polygons.py,sha256=JjvA5BiW0HzaVmuZjnKB55n0OJXZfjOBQHfSNcZBDiA,28791
-xtgeo-4.12.0.dist-info/METADATA,sha256=au9aO7YlUYU5YAt5jB5uAwdsSjIqhAuyWSmIMUt7TYI,5741
-xtgeo-4.12.0.dist-info/WHEEL,sha256=chqeLhPBtPdrOoreR34YMcofSk3yWDQhkrsDJ2n48LU,106
-xtgeo-4.12.0.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-xtgeo-4.12.0.dist-info/RECORD,,
+xtgeo-4.13.0.dist-info/METADATA,sha256=g7Q3-TQzr0JfUPoAFqOJrNDHadbmRe_dqN2HoZChR2U,5779
+xtgeo-4.13.0.dist-info/WHEEL,sha256=chqeLhPBtPdrOoreR34YMcofSk3yWDQhkrsDJ2n48LU,106
+xtgeo-4.13.0.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+xtgeo-4.13.0.dist-info/RECORD,,