xtgeo 4.12.1__cp313-cp313-macosx_11_0_arm64.whl → 4.13.0__cp313-cp313-macosx_11_0_arm64.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.1.dist-info → xtgeo-4.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xtgeo
-Version: 4.12.1
+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.1.dist-info → xtgeo-4.13.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-cxtgeo.py,sha256=MjY_SfwNrahCXED08vVn7OsQPQPU7rsKwxSp2GY5WKI,33396
-cxtgeoPYTHON_wrap.c,sha256=jdx6wYGtLu7KKXcEHC9XqRTEMkYc4x4D07FPmYKSjPE,635145
-xtgeo-4.12.1.dist-info/RECORD,,
-xtgeo-4.12.1.dist-info/WHEEL,sha256=RKB2kgklE3rgz0xlIuKYm-O5gcSzEoMvCOiEOfbYfDs,141
-xtgeo-4.12.1.dist-info/METADATA,sha256=_bQC78VJmRcAEiNh0saCXL7wAfj0v0NO0NorLX8PaRk,5741
-xtgeo-4.12.1.dist-info/licenses/LICENSE.md,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-xtgeo/_cxtgeo.cpython-313-darwin.so,sha256=0SZPNNTIaYpi9OqxA8OqSkgjet0FbZ8OXB-_BtTaR2k,414912
+cxtgeo.py,sha256=vVbmG3Ae1xGPT4paiuNUlAevkhMM8Mr65GROxpEoATs,32114
+cxtgeoPYTHON_wrap.c,sha256=3RWeyNmSHVKggroTUZRSgiAxXYb_RkzhQMuwT8YVJ4k,617122
+xtgeo-4.13.0.dist-info/RECORD,,
+xtgeo-4.13.0.dist-info/WHEEL,sha256=RKB2kgklE3rgz0xlIuKYm-O5gcSzEoMvCOiEOfbYfDs,141
+xtgeo-4.13.0.dist-info/METADATA,sha256=g7Q3-TQzr0JfUPoAFqOJrNDHadbmRe_dqN2HoZChR2U,5779
+xtgeo-4.13.0.dist-info/licenses/LICENSE.md,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+xtgeo/_cxtgeo.cpython-313-darwin.so,sha256=Bb_QzZ5eV0x1FHV3SkteGRrrGULeJEiCXSaWs6cRcvE,398128
 xtgeo/__init__.py,sha256=-p6vKOv7EfAt1S-7CmWHfN8iHjFHQ--5UwhIysS_gRQ,5588
-xtgeo/_internal.cpython-313-darwin.so,sha256=4GuQO8vZywyhU1Yk1GdUsPMPZnL8QNBm_XAAImUo7sU,731840
+xtgeo/_internal.cpython-313-darwin.so,sha256=aR57M4otrWyQvg-Z5FiWh3EiGDymM80r7Lt21W4yWYE,814560
 xtgeo/well/_wells_utils.py,sha256=hjJEBdtILtK87sbCYWHJ7aEgqgKkak6ihfOcxSixNPo,4945
-xtgeo/well/_blockedwell_roxapi.py,sha256=G0IEChtCF7SPV_nXDIYsJ5L601HjA9QdWU7cNoyJyus,7489
+xtgeo/well/_blockedwell_roxapi.py,sha256=J17-lKccvTZBuW5_aUz5lfa5W5lW7pYIw1MvGeQ9lQ0,8421
 xtgeo/well/_well_io.py,sha256=CHvLfuIVNoX_4PQd7sCWg5xvyCd1L73J5dkmV2uaJqU,9821
 xtgeo/well/well1.py,sha256=gUODmEw-QOQtDHVI-qPUhK8RnglASso1l2EIvQvaOng,51125
 xtgeo/well/__init__.py,sha256=2OjMYXXBSTZmsJgF0TrKMX01hMwT3dt2yLXhz5gL3D4,591
@@ -36,13 +36,13 @@ 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=hzKS9W51pgWl6WKHgykqpVyyo11pLGmHF4nTgpe0pm8,106706
+xtgeo/grid3d/grid.py,sha256=QoUEqCh4sXyoIVzJEafh1CN6BKG83IYP_jom0aVYXa4,107189
 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=llGUYpBeLhj3A7bf3EcMe2kz-OiW_O-Y6JCjsqVM-e0,8967
+xtgeo/grid3d/_gridprop_roxapi.py,sha256=Z2A0Xv7Y_umy8joI__5YL7GsZ6NctaBakfn6serGks4,9093
 xtgeo/grid3d/_gridprop_op1.py,sha256=o0JemRzyECX0qzUpj9OXGB9nb1IOZ8-5Gs-1i_a302g,8956
 xtgeo/grid3d/_grid_import_roff.py,sha256=UViMnU44b75x4EfgnEmUYLFTK0R33lS9wAw0aBgzVzw,4039
-xtgeo/grid3d/_grid_hybrid.py,sha256=e-wj_RKknOSqPMU3wMBG_0maYJLEqJnv1_zp5eG55MY,1600
+xtgeo/grid3d/_grid_hybrid.py,sha256=N7l2l96AGnKNLvaqhuVUMX0Nhk4rTy2v0V9cj_FSbuA,1255
 xtgeo/grid3d/_grid3d_fence.py,sha256=XdIY-TlSgoTuRtRyRNqLvXLoR9F1QTEkFJO-rgKlqwE,9217
 xtgeo/grid3d/_grid3d.py,sha256=eM6842v2Q1Sb75zM3KynCITeV57OlXcusGEa_NWLPSU,740
 xtgeo/grid3d/_ecl_output_file.py,sha256=WPb7VGPyt89MpKtxL2jLoSKwn04jIfNsB11L-9wMhSY,2014
@@ -52,7 +52,7 @@ xtgeo/grid3d/_roff_grid.py,sha256=Or-QR92AB_oE-6lbMVhQjXC_E1HAcxZjFlbep3cFo6w,17
 xtgeo/grid3d/__init__.py,sha256=k6T-xKWIBey_WMjWDnYZfvCsLQGokCL9RjqBZNvbUq0,332
 xtgeo/grid3d/types.py,sha256=s4iR1hmpZ_mF7xLXqujZaT2Sa6RK0uA48ZywBmkjoD0,275
 xtgeo/grid3d/_grid_export.py,sha256=2Idg_5OGwS3Swu992RqYovDHBxfakjphN6ozKnDU1V0,7270
-xtgeo/grid3d/_ecl_inte_head.py,sha256=F22CT5VOpIYED2tMgmR5_FWtwq843S5vV3IbYvTehHM,4625
+xtgeo/grid3d/_ecl_inte_head.py,sha256=yz8oQXCPzITNYNguZe9pUYVM2UbI6ZBy_e7VAEYJ8vU,4749
 xtgeo/grid3d/_gridprop_import_eclrun.py,sha256=k1SjOp4PmZ3nIcDM6N-2FDvDx3jMPf7rea3IGOrgo88,5096
 xtgeo/grid3d/_grid3d_utils.py,sha256=zIQZpWqAf33nVpC2aDqquPhd7Tqr-rRZvAaXPF-kxG0,7249
 xtgeo/grid3d/_ecl_grid.py,sha256=f12-cvxZblUZSAGIxKxJ438akK5gBFYebgSbVxZP6Jc,25905
@@ -62,7 +62,7 @@ xtgeo/grid3d/_grdecl_format.py,sha256=Nrp-dUh8p6G0WgDiWRfY_otxPwS_wUaUpReXVoj-U_
 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=Yt5AjeXJ6xPbUlIbzer6N37_Cv53NVkxO2nnhY2uVWU,43571
+xtgeo/grid3d/_grid_etc1.py,sha256=B51LeL6IJpr5K2xuSRZyOnoaWbp-5HMm1R6C_pFSIgQ,43957
 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=i4aukBXCeoYYIVJytG8ObjA1KyDGQqsQr2XukSSbZYg,6533
@@ -76,18 +76,18 @@ 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=Ld4cGYQnN-jEu1m2CROWu6uCVbBIhr9TDv2G3pJSEFc,12607
+xtgeo/cube/_cube_window_attributes.py,sha256=MvD5pCjoJQ43EFKEfvOV6gCF7b3rwk2BluLe9wt59bo,9981
 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
 xtgeo/cube/cube1.py,sha256=WTUGu_A4-SL2-9X-xLFjXIrmSmZy63Ebxt29R0g8VBM,34841
-xtgeo/xyz/points.py,sha256=MDpGQU8O6dsvIa2cASdHU2v8OlPe0wPRY7ZHrNTEyHo,22556
+xtgeo/xyz/points.py,sha256=UdgFmBtsHSyzTwV27XvhQNDAOgeWbG6PU_HNqRpJ9qU,22582
 xtgeo/xyz/_xyz_data.py,sha256=YRap9It2oYz7-_YGwNPXe4lxiXi45CCLpYQshQQXXI0,24126
 xtgeo/xyz/polygons.py,sha256=fIh3DNfhj-uZnMTmB1w2AcRi_r_eoMxA-Ytm3QkLJUg,27964
 xtgeo/xyz/__init__.py,sha256=yoBAADZ8lpnr_IY7txqpHIXQ_6atwxQckopaEgVkx-E,174
 xtgeo/xyz/_xyz_oper.py,sha256=P8b2rGDZGDh8k7Jwg_SI-Jw6NaAF6I1LfhhybOTIcXw,19445
 xtgeo/xyz/_xyz_roxapi.py,sha256=tP29S1cy4Il8wExScgmgrBKu6WO2MMbRCr-YjSARnUQ,25819
-xtgeo/xyz/_xyz_io.py,sha256=HHwe1iA6js9D3IWrUZkjnEAG4rZt3zVrIWbpjZB_jpk,23862
+xtgeo/xyz/_xyz_io.py,sha256=5wL6ibpQwi3MSR7H09sdrubiVTkIhA8goHSIlDWQjLk,23981
 xtgeo/xyz/_xyz_lowlevel.py,sha256=xEB_GVyNgI_0uxkl5DJ-rAUVtQ7_zNauiouUf18OmBc,1041
 xtgeo/xyz/_xyz.py,sha256=AcFZMmZj05WNtLHGoYNm8jGphABp2I7WpPvoH12_UCo,28392
 xtgeo/xyz/_polygons_oper.py,sha256=Fe5o7acA72DsOMhOw49xA_uZWuagsyrtSaRIADsy764,9346
@@ -99,7 +99,7 @@ xtgeo/surface/_regsurf_gridding.py,sha256=aP2BIbk-NXQ-VDaS-HK3KuinaXkOJ3eLXQvdA4
 xtgeo/surface/_regsurf_ijxyz_parser.py,sha256=QPBdR5_jltx9VFw2kzvRtuaz-XaHD6xb7YeGAh2JYAA,9877
 xtgeo/surface/surfaces.py,sha256=exrkUPRRF4FMpxPFEW-Otcvi4rWI33IsgSYMyIIDesA,9363
 xtgeo/surface/_regsurf_grid3d.py,sha256=Fr9nqNtXiSNFUwwFGWpngg9OWB9Io-_0grat85z3U3E,9164
-xtgeo/surface/regular_surface.py,sha256=18JAhAujScLYS6Zot3iHibGLZ9m_WcRjZ_f-FBNCFmA,107785
+xtgeo/surface/regular_surface.py,sha256=-OTifN9Xhqjut9qMRCv5NuZPJ3LX0iEAZU-MR4Mk2VA,107594
 xtgeo/surface/_surfs_import.py,sha256=bPnGgwHFbill_EyLAQb2mTAlFEbUQZ3Qj11JnE1hNjU,1240
 xtgeo/surface/_regsurf_roxapi.py,sha256=gBjsX5Q_P7tCeykw1mLXnZvZgtgF0rksfyt0hl6DPCA,8477
 xtgeo/surface/__init__.py,sha256=jo6r3XXD1A6ZTWW57u77Ivu7SQqvXNPaY9BGZOmNqow,362
@@ -108,12 +108,12 @@ xtgeo/surface/_regsurf_export.py,sha256=rYLuIQBx8pbEe-AEoEN8332smU3UanrZKJ4jVpvD
 xtgeo/surface/_regsurf_cube_window_v3.py,sha256=WElPWT9zha94gfY82IufF2YiApIefg8hEhWi0x55Pk8,10811
 xtgeo/surface/_regsurf_boundary.py,sha256=iEBSy-Jww1yn5Tam1p5-zy4wP0jhwa9So3xYdSPVtwQ,784
 xtgeo/surface/_regsurf_cube_window_v2.py,sha256=m1-bw8zbn6eEscKd2Q7VLXlnwhIP0ClPFFFzyA0b3UU,6165
-xtgeo/surface/_regsurf_oper.py,sha256=S2R3Rw65k2h6aIfu8wmVNlTnT-CuCC3m-kwjvH3N2XE,17176
+xtgeo/surface/_regsurf_oper.py,sha256=lGtV7AZ_T1GFfsEhbnREa6lRGIKczTp4lKbVh2fJ4GA,14155
 xtgeo/surface/_regsurf_cube.py,sha256=xZXIE418guB3rG8iscI9xQ0deAtJ_auu1XDe3ml9GBM,4952
 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=2O2wY2SWIqA5uRiQW5SoPKR83a3fWIokUR1A5gARznI,714
+xtgeo/common/version.py,sha256=fo5FTSJNV84l6Q3ubJmy4MqW5j2bG12o2yco_PgFMlE,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 +123,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=-h2otA_71Xwh0tJk6GWOWLbZclTUqpS32X-Dp8K1Wbk,163432
-xtgeo/lib/pkgconfig/fmt.pc,sha256=pdiIKyM5zXKRv3erJxPKDTOhwX9_9PUg-44JGvsbm5o,353
+xtgeo/lib/libfmt.a,sha256=urv43-0Yg273cW9Q9GFhF3PtS8mxoYRWw_iXTcZqEXM,163432
+xtgeo/lib/pkgconfig/fmt.pc,sha256=B2yvj0iLY829f9c27iK9xXxvska29Q0LMim239Vzny0,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