xtgeo 4.7.0__cp39-cp39-win_amd64.whl → 4.8.0__cp39-cp39-win_amd64.whl

xtgeo/common/log.py

@@ -39,6 +39,7 @@ def functimer(
     func: Optional[Callable] = None,
     *,
     output: Literal["debug", "info", "print"] = "debug",
+    comment: str = "",
 ) -> Callable:
     """A decorator function to measure the execution time of a function.
 
@@ -47,7 +48,7 @@ def functimer(
 
     Usage is simple, just add the decorator to the function you want to measure:
 
-    @functimer(output="print")
+    @functimer(output="print", comment="My function took a while to run")
     def my_function():
         pass
 
@@ -61,7 +62,7 @@ def functimer(
     if func is None:
 
         def decorator(func: Callable) -> Callable:
-            return functimer(func, output=output)
+            return functimer(func, output=output, comment=comment)
 
         return decorator
 
@@ -73,16 +74,20 @@ def functimer(
         result = func(*args, **kwargs)  # Execute the function
         end_time = time.perf_counter()  # End the timer
         elapsed_time = f"{end_time - start_time: .5f}"
+
+        # Build message with optional comment
+        message = f"Function {func.__name__} executed in {elapsed_time} seconds"
+        if comment:
+            message += f" - {comment}"
+
+        # Output according to specified method
         if output == "print":
-            print(f"Function {func.__name__} executed in {elapsed_time} seconds")
+            print(message)
         elif output == "info":
-            logger.info(
-                "Function %s executed in %s seconds", func.__name__, elapsed_time
-            )
+            logger.info(message)
         else:
-            logger.debug(
-                "Function %s executed in %s seconds", func.__name__, elapsed_time
-            )
+            logger.debug(message)
+
         return result
 
     return wrapper

xtgeo/common/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.7.0'
-__version_tuple__ = version_tuple = (4, 7, 0)
+__version__ = version = '4.8.0'
+__version_tuple__ = version_tuple = (4, 8, 0)

xtgeo/grid3d/_grid_etc1.py

@@ -69,6 +69,7 @@ def create_box(
     )
 
     cubecpp = _internal.cube.Cube(cube)
+    logger.debug("Calling CPP internal 'create_grid_from_cube'...")
     coordsv, zcornsv, actnumsv = _internal.grid3d.create_grid_from_cube(
         cubecpp, oricenter, flip
     )

xtgeo/grid3d/grid.py

@@ -1293,7 +1293,10 @@ class Grid(_Grid3D):
         for izone in range(minzone, maxzone + 1):
             mininzn = int(kval[zprval == izone].min())  # 1 base
             maxinzn = int(kval[zprval == izone].max())  # 1 base
-            newd["zone" + str(izone)] = range(mininzn, maxinzn + 1)
+
+            newd[zoneprop.codes.get(izone, "zone" + str(izone))] = range(
+                mininzn, maxinzn + 1
+            )
 
         self.subgrids = newd  # type: ignore
 

xtgeo/surface/_regsurf_export.py

@@ -71,8 +71,10 @@ def export_irap_ascii(self: RegularSurface, mfile: FileWrapper) -> None:
         # Find the nearest factorization
         for i in range(start, 1, -1):
             if size % i == 0:
-                return (size // i, i)
-        return (vals, 1)
+                return (int(size // i), int(i))  # Ensure integers are returned
+
+        # If we can't find a perfect divisor, return a valid shape
+        return (int(size), 1)
 
     buffer = io.StringIO()
 

xtgeo/well/_well_io.py

@@ -196,7 +196,6 @@ def _check_special_logs(dfr, mdlogname, zonelogname, strict, wname):
 
 def export_rms_ascii(self, wfile, precision=4):
     """Export to RMS well format."""
-
     with open(wfile, "w", encoding="utf-8") as fwell:
         print("1.0", file=fwell)
         print("Unknown", file=fwell)
@@ -225,7 +224,7 @@ def export_rms_ascii(self, wfile, precision=4):
     # make the disc as is np.int
     for lname in self.wlogtypes:
         if self.wlogtypes[lname] == _AttrType.DISC.value:
-            tmpdf[[lname]] = tmpdf[[lname]].astype(int)
+            tmpdf[[lname]] = tmpdf[[lname]].fillna(-999).astype(int)
 
     cformat = "%-." + str(precision) + "f"
     tmpdf.to_csv(
@@ -234,7 +233,7 @@ def export_rms_ascii(self, wfile, precision=4):
         header=False,
         index=False,
         float_format=cformat,
-        escapechar=" ",
+        escapechar="\\",
         mode="a",
     )
 

{xtgeo-4.7.0.dist-info → xtgeo-4.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xtgeo
-Version: 4.7.0
+Version: 4.8.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>
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries

{xtgeo-4.7.0.dist-info → xtgeo-4.8.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
 cxtgeo.py,sha256=opPeIg7PX9RbxankrAbw2ycZ3fxWOxa87rdJscQTnKg,34954
 cxtgeoPYTHON_wrap.c,sha256=yBRHvZLcTNwiImhStko5ahviRGu1taefRm0BHwb2XLg,672064
 xtgeo/__init__.py,sha256=edNCOXuPS5qjutDGX5-2Pz0T2Lpx1GoeG3IoeXUdBw8,5834
-xtgeo/_cxtgeo.cp39-win_amd64.pyd,sha256=z4OaClp8JxGTsOmNMMWFnLHqt-zDItxGlYnyYm95A1k,528384
-xtgeo/_internal.cp39-win_amd64.pyd,sha256=4yZIe5sXPMCXV7W1GpC5zFPfmSZcUtRY5Rq431LRJyM,297984
+xtgeo/_cxtgeo.cp39-win_amd64.pyd,sha256=KWsf0-C5XNCIv9X2nZeSsHsHDMETHBR-dupfBDpOD3I,528384
+xtgeo/_internal.cp39-win_amd64.pyd,sha256=22MuEwMosAGzUTNh5XEcetsTkyg4l3g_6Yrwq7vTl9g,421888
 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
 xtgeo/common/calc.py,sha256=3By6HO_njSOj-WV3qodkVDHx_O67zIvzHubmrNDwfcQ,10530
 xtgeo/common/constants.py,sha256=Ug_Vk4daedpu3wooPNGUITBuK71gKDFTDVWcG3e74CI,779
 xtgeo/common/exceptions.py,sha256=OZyU9C8cS4NhCnjQyREfuoVy9mdvGCiccd4nC9yn_N4,1217
-xtgeo/common/log.py,sha256=A0tCGNR8RmQNm13DmJiv-erTgxTb1D7U__6ddcZQW-w,2742
+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=POrJu57bns0zn35etmXpuOqDrLqJ4s2ikAYVvABaahg,532
+xtgeo/common/version.py,sha256=ye9ffrOKBgVeC9SOGaIK_EyHNMwBDSzSxcj5u4screQ,532
 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
@@ -34,7 +34,7 @@ xtgeo/grid3d/_grid3d.py,sha256=rTqfhwK4dNX1A5M-xUC-9hWwfxrkX6_TVgwc79KCXCI,769
 xtgeo/grid3d/_grid3d_fence.py,sha256=LGxNMbmRq1BigXOVu2g_gNlfpMwbxd_F5UaahsCW-qs,6177
 xtgeo/grid3d/_grid3d_utils.py,sha256=VBbdzah_D8yeaMU4vMQRYTFRKq95QaGqPk4oXYBWdHw,7477
 xtgeo/grid3d/_grid_boundary.py,sha256=xNumtMeOfjmwS5vzv1Nl_yZpGiDEQXk896pXzugdUVs,2384
-xtgeo/grid3d/_grid_etc1.py,sha256=rZZFSwQkGA4yUUojDeVx_WVtfzJDE5s0nkyi5B8GoZM,44212
+xtgeo/grid3d/_grid_etc1.py,sha256=pxyvb0dAAKDWPa7WSGTByLghY_b7R4Z9BzxhpEtWZyY,44281
 xtgeo/grid3d/_grid_export.py,sha256=MRnkVoq7zjj2QvfKeAwmWd75Jjv5KCuDgsROLcdQGQY,7383
 xtgeo/grid3d/_grid_hybrid.py,sha256=38ZAj4INR3i735ew7rNWoyn5ZrrzS_ZgBScVOWcu2x0,1662
 xtgeo/grid3d/_grid_import.py,sha256=Y11JDjf5tZkDth69aTtbkMfMjRbVvSnQbV3lt-jCuA8,2672
@@ -57,7 +57,7 @@ xtgeo/grid3d/_gridprops_import_eclrun.py,sha256=M7hvBazZPjYsKOYBL1SHCcYqztgonARu
 xtgeo/grid3d/_gridprops_import_roff.py,sha256=fCCMwa8OgLXk9zMvFpr4nfsKLkmBFKKLSfLwUHenyTA,2550
 xtgeo/grid3d/_roff_grid.py,sha256=rrovt4qDmbOIZrcoXYYf1HzYULxw6S-6PYpg2j0FpOk,17648
 xtgeo/grid3d/_roff_parameter.py,sha256=9gVlFMyT2QbwUvm_FCJG0hTvJPrK2Y86kbeljs2eCbc,11376
-xtgeo/grid3d/grid.py,sha256=mBcsAxpmpDW4BOPx3QNPMcnUdL7BM1oeKcIvBJ5TgR8,95007
+xtgeo/grid3d/grid.py,sha256=JuILdUZzzbD-IrQqMuR1IbSiMADP355t7Q-q8rLAhRQ,95068
 xtgeo/grid3d/grid_properties.py,sha256=OlIyo1PXrTRFHGn8avXdBXNpFM5DJuLjVRB9koayKGQ,24993
 xtgeo/grid3d/grid_property.py,sha256=UIJog6ZWBjjOPsI1-ORsaLt4kWtH_MkhEBuW2yINbUE,46834
 xtgeo/grid3d/types.py,sha256=eaBHJL91zXV0ipaY30K_ZpEdUfjj681CoAbKfvNZ_5Q,290
@@ -75,7 +75,7 @@ xtgeo/surface/_regsurf_cube.py,sha256=k7ypQ-86fxQi3eaRZzaxH3e4Md1yizA_8mHs7JzYap
 xtgeo/surface/_regsurf_cube_window.py,sha256=Y52wkVEALEZarIOZYnYTAFme1H7dhTNM0fgpanVAU_Q,10728
 xtgeo/surface/_regsurf_cube_window_v2.py,sha256=whh9qqErjtg2vArJg5S3YkMbppSq4RJn7u5Zxzqwl1I,6462
 xtgeo/surface/_regsurf_cube_window_v3.py,sha256=E6eIFHv7B3IfLDjjq_u9fp8RmySuSkh7Bi7eV6OVAFs,11171
-xtgeo/surface/_regsurf_export.py,sha256=1nQ1YLZffkk80eeiMn5Fiy8o_3cEk7ExaWmqurT2ih4,10738
+xtgeo/surface/_regsurf_export.py,sha256=udxqAlVRyW-dMscTtIGeFnqjpFpjZ3o69YlFGe2eGA4,10855
 xtgeo/surface/_regsurf_grid3d.py,sha256=1UhbHJoMZgs8FUKIYLFsbEVh-CZP8j4eYFxVjhJz9xw,9359
 xtgeo/surface/_regsurf_gridding.py,sha256=igldvuMznjPxPSNY8vBpKRhV5C4yLq4QrrtIu_fe9eY,10559
 xtgeo/surface/_regsurf_ijxyz_parser.py,sha256=7pyXWkYUoziDeDx4C2U1ywdXfX9-aa6Fw6OWDCbvN2o,10155
@@ -92,7 +92,7 @@ xtgeo/well/__init__.py,sha256=T3oOSJaUj3SwSG-YxeFM-oqppIYq2CZqPxBEB5khIys,615
 xtgeo/well/_blockedwell_roxapi.py,sha256=FQbbmUiUWVJeS_NvOny7ZIso6I0v6JlyG73SzeNfSyQ,7710
 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=zc2puNVtaskoNwWbHISMUwWz6u1oJvSQ-elypEbg7xo,10136
+xtgeo/well/_well_io.py,sha256=Omq7El3V9LJ0V9UO8QjW4Y3AuvaoEqRjP8fwcv1lY1s,10148
 xtgeo/well/_well_oper.py,sha256=pIYF98CwocPv4boBQEuLV51LCVSyWsXSe5cbZqOXTPc,19236
 xtgeo/well/_well_roxapi.py,sha256=92Oj_SOsU46iP4I_2gf7XW8DoGMWflpvcCSepAMeTjs,9734
 xtgeo/well/_wellmarkers.py,sha256=zpYgPrFF0dZV3sBz7FFBA5PMuGrkL6Sk3qE6PFUU__I,14608
@@ -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=r5-oC8HWO43vMHr1Jh4fM9JcwWbiz7FqwZNWU8l1w_0,22664
 xtgeo/xyz/polygons.py,sha256=-VUQ-6TUuN6b_cXyWzWWfTnJwYfyBwLRlqgw5ER_7OM,27978
-xtgeo-4.7.0.dist-info/METADATA,sha256=QY2qRWUakZjVOZcCgDW-wtQ-WmGi-X9SEA87nDND4i8,5714
-xtgeo-4.7.0.dist-info/WHEEL,sha256=k3r5zLv1t8z7JCqYC2-rKkfvrw2hvjPkH6-V2Jw00vI,104
-xtgeo-4.7.0.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-xtgeo-4.7.0.dist-info/RECORD,,
+xtgeo-4.8.0.dist-info/METADATA,sha256=NXRjNnj7ECi_X4xU1U6ZA4XyQ3ZyPfqRGT8iOrJoIak,5765
+xtgeo-4.8.0.dist-info/WHEEL,sha256=k3r5zLv1t8z7JCqYC2-rKkfvrw2hvjPkH6-V2Jw00vI,104
+xtgeo-4.8.0.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+xtgeo-4.8.0.dist-info/RECORD,,