xtgeo 4.7.1__cp39-cp39-win_amd64.whl → 4.9.0__cp39-cp39-win_amd64.whl

cxtgeo.py

@@ -478,9 +478,6 @@ def grd3d_reduce_onelayer(nx, ny, nz, swig_np_dbl_in_v1, swig_np_dbl_inplace_v1,
 def grd3d_get_lay_slice(nx, ny, nz, swig_np_dbl_in_v1, swig_np_dbl_in_v2, swig_np_int_in_v1, kslice, koption, actonly, swig_np_dbl_aout_v1, swig_np_lng_aout_v1):
     return _cxtgeo.grd3d_get_lay_slice(nx, ny, nz, swig_np_dbl_in_v1, swig_np_dbl_in_v2, swig_np_int_in_v1, kslice, koption, actonly, swig_np_dbl_aout_v1, swig_np_lng_aout_v1)
 
-def grd3d_refine_vert(nx, ny, nz, swig_np_dbl_in_v2, swig_np_int_in_v1, nzref, swig_np_dbl_inplace_v2, swig_np_int_inplace_v1, rfac):
-    return _cxtgeo.grd3d_refine_vert(nx, ny, nz, swig_np_dbl_in_v2, swig_np_int_in_v1, nzref, swig_np_dbl_inplace_v2, swig_np_int_inplace_v1, rfac)
-
 def grd3d_convert_hybrid(nx, ny, nz, swig_np_dbl_in_v1, swig_np_dbl_in_v2, swig_np_int_in_v1, nzhyb, swig_np_dbl_inplace_v1, swig_np_int_inplace_v1, toplevel, botlevel, ndiv, swig_np_int_in_v2, region):
     return _cxtgeo.grd3d_convert_hybrid(nx, ny, nz, swig_np_dbl_in_v1, swig_np_dbl_in_v2, swig_np_int_in_v1, nzhyb, swig_np_dbl_inplace_v1, swig_np_int_inplace_v1, toplevel, botlevel, ndiv, swig_np_int_in_v2, region)
 
@@ -499,9 +496,6 @@ def grd3d_point_val_crange(x, y, z, nx, ny, nz, p_coor_v, zcornsv, actnumsv, p_v
 def grd3d_point_in_cell(ibstart, kzonly, x, y, z, nx, ny, nz, p_coor_v, zcornsv, actnumsv, maxrad, sflag, nradsearch, option):
     return _cxtgeo.grd3d_point_in_cell(ibstart, kzonly, x, y, z, nx, ny, nz, p_coor_v, zcornsv, actnumsv, maxrad, sflag, nradsearch, option)
 
-def grd3d_points_ijk_cells(swig_np_dbl_in_v1, swig_np_dbl_in_v2, swig_np_dbl_in_v3, mcol, mrow, xori, yori, xinc, yinc, rotation, yflip, maptopi, maptopj, mapbasi, mapbasj, nx, ny, nz, swig_np_dbl_in_v4, swig_np_dbl_in_v5, swig_np_int_in_v1, swig_np_dbl_in_v6, actnumoption, swig_np_int_aout_v1, swig_np_int_aout_v2, swig_np_int_aout_v3):
-    return _cxtgeo.grd3d_points_ijk_cells(swig_np_dbl_in_v1, swig_np_dbl_in_v2, swig_np_dbl_in_v3, mcol, mrow, xori, yori, xinc, yinc, rotation, yflip, maptopi, maptopj, mapbasi, mapbasj, nx, ny, nz, swig_np_dbl_in_v4, swig_np_dbl_in_v5, swig_np_int_in_v1, swig_np_dbl_in_v6, actnumoption, swig_np_int_aout_v1, swig_np_int_aout_v2, swig_np_int_aout_v3)
-
 def grd3d_get_randomline(swig_np_dbl_in_v1, swig_np_dbl_in_v2, zmin, zmax, nzsam, mcol, mrow, xori, yori, xinc, yinc, rotation, yflip, maptopi, maptopj, mapbasi, mapbasj, nx, ny, nz, swig_np_dbl_in_v3, swig_np_dbl_in_v4, swig_np_int_in_v1, p_val_v, swig_np_dbl_in_v5, swig_np_int_in_v2, swig_np_dbl_aout_v1):
     return _cxtgeo.grd3d_get_randomline(swig_np_dbl_in_v1, swig_np_dbl_in_v2, zmin, zmax, nzsam, mcol, mrow, xori, yori, xinc, yinc, rotation, yflip, maptopi, maptopj, mapbasi, mapbasj, nx, ny, nz, swig_np_dbl_in_v3, swig_np_dbl_in_v4, swig_np_int_in_v1, p_val_v, swig_np_dbl_in_v5, swig_np_int_in_v2, swig_np_dbl_aout_v1)
 

cxtgeoPYTHON_wrap.c

@@ -15017,149 +15017,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_grd3d_refine_vert(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  double *arg4 = (double *) 0 ;
-  long arg5 ;
-  int *arg6 = (int *) 0 ;
-  long arg7 ;
-  int arg8 ;
-  double *arg9 = (double *) 0 ;
-  long arg10 ;
-  int *arg11 = (int *) 0 ;
-  long arg12 ;
-  int *arg13 = (int *) 0 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyArrayObject *array4 = NULL ;
-  int is_new_object4 = 0 ;
-  PyArrayObject *array6 = NULL ;
-  int is_new_object6 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  PyArrayObject *array9 = NULL ;
-  int i9 = 1 ;
-  PyArrayObject *array11 = NULL ;
-  int i11 = 1 ;
-  void *argp13 = 0 ;
-  int res13 = 0 ;
-  PyObject *swig_obj[9] ;
-  int result;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "grd3d_refine_vert", 9, 9, swig_obj)) SWIG_fail;
-  ecode1 = SWIG_AsVal_int(swig_obj[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "grd3d_refine_vert" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "grd3d_refine_vert" "', argument " "2"" of type '" "int""'");
-  } 
-  arg2 = (int)(val2);
-  ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "grd3d_refine_vert" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array4 = obj_to_array_contiguous_allow_conversion(swig_obj[3],
-      NPY_DOUBLE,
-      &is_new_object4);
-    if (!array4 || !require_dimensions(array4, 1) ||
-      !require_size(array4, size, 1)) SWIG_fail;
-    arg4 = (double*) array_data(array4);
-    arg5 = (long) array_size(array4,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array6 = obj_to_array_contiguous_allow_conversion(swig_obj[4],
-      NPY_INT,
-      &is_new_object6);
-    if (!array6 || !require_dimensions(array6, 1) ||
-      !require_size(array6, size, 1)) SWIG_fail;
-    arg6 = (int*) array_data(array6);
-    arg7 = (long) array_size(array6,0);
-  }
-  ecode8 = SWIG_AsVal_int(swig_obj[5], &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "grd3d_refine_vert" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  {
-    array9 = obj_to_array_no_conversion(swig_obj[6], NPY_DOUBLE);
-    if (!array9 || !require_dimensions(array9,1) || !require_contiguous(array9)
-      || !require_native(array9)) SWIG_fail;
-    arg9 = (double*) array_data(array9);
-    arg10 = 1;
-    for (i9=0; i9 < array_numdims(array9); ++i9) arg10 *= array_size(array9,i9);
-  }
-  {
-    array11 = obj_to_array_no_conversion(swig_obj[7], NPY_INT);
-    if (!array11 || !require_dimensions(array11,1) || !require_contiguous(array11)
-      || !require_native(array11)) SWIG_fail;
-    arg11 = (int*) array_data(array11);
-    arg12 = 1;
-    for (i11=0; i11 < array_numdims(array11); ++i11) arg12 *= array_size(array11,i11);
-  }
-  res13 = SWIG_ConvertPtr(swig_obj[8], &argp13,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res13)) {
-    SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "grd3d_refine_vert" "', argument " "13"" of type '" "int *""'"); 
-  }
-  arg13 = (int *)(argp13);
-  {
-    char *err;
-    clear_exception();
-    result = (int)grd3d_refine_vert(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13);
-    if ((err = check_exception())) {
-      PyErr_SetString(PY_XTGeoCLibError, err);
-      return NULL;
-    }
-  }
-  resultobj = SWIG_From_int((int)(result));
-  {
-    if (is_new_object4 && array4)
-    {
-      Py_DECREF(array4); 
-    }
-  }
-  {
-    if (is_new_object6 && array6)
-    {
-      Py_DECREF(array6); 
-    }
-  }
-  return resultobj;
-fail:
-  {
-    if (is_new_object4 && array4)
-    {
-      Py_DECREF(array4); 
-    }
-  }
-  {
-    if (is_new_object6 && array6)
-    {
-      Py_DECREF(array6); 
-    }
-  }
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_grd3d_convert_hybrid(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
@@ -15968,419 +15825,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_grd3d_points_ijk_cells(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  double *arg1 = (double *) 0 ;
-  long arg2 ;
-  double *arg3 = (double *) 0 ;
-  long arg4 ;
-  double *arg5 = (double *) 0 ;
-  long arg6 ;
-  int arg7 ;
-  int arg8 ;
-  double arg9 ;
-  double arg10 ;
-  double arg11 ;
-  double arg12 ;
-  double arg13 ;
-  int arg14 ;
-  double *arg15 = (double *) 0 ;
-  double *arg16 = (double *) 0 ;
-  double *arg17 = (double *) 0 ;
-  double *arg18 = (double *) 0 ;
-  int arg19 ;
-  int arg20 ;
-  int arg21 ;
-  double *arg22 = (double *) 0 ;
-  long arg23 ;
-  double *arg24 = (double *) 0 ;
-  long arg25 ;
-  int *arg26 = (int *) 0 ;
-  long arg27 ;
-  double *arg28 = (double *) 0 ;
-  long arg29 ;
-  int arg30 ;
-  int *arg31 = (int *) 0 ;
-  long arg32 ;
-  int *arg33 = (int *) 0 ;
-  long arg34 ;
-  int *arg35 = (int *) 0 ;
-  long arg36 ;
-  PyArrayObject *array1 = NULL ;
-  int is_new_object1 = 0 ;
-  PyArrayObject *array3 = NULL ;
-  int is_new_object3 = 0 ;
-  PyArrayObject *array5 = NULL ;
-  int is_new_object5 = 0 ;
-  int val7 ;
-  int ecode7 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
-  double val9 ;
-  int ecode9 = 0 ;
-  double val10 ;
-  int ecode10 = 0 ;
-  double val11 ;
-  int ecode11 = 0 ;
-  double val12 ;
-  int ecode12 = 0 ;
-  double val13 ;
-  int ecode13 = 0 ;
-  int val14 ;
-  int ecode14 = 0 ;
-  void *argp15 = 0 ;
-  int res15 = 0 ;
-  void *argp16 = 0 ;
-  int res16 = 0 ;
-  void *argp17 = 0 ;
-  int res17 = 0 ;
-  void *argp18 = 0 ;
-  int res18 = 0 ;
-  int val19 ;
-  int ecode19 = 0 ;
-  int val20 ;
-  int ecode20 = 0 ;
-  int val21 ;
-  int ecode21 = 0 ;
-  PyArrayObject *array22 = NULL ;
-  int is_new_object22 = 0 ;
-  PyArrayObject *array24 = NULL ;
-  int is_new_object24 = 0 ;
-  PyArrayObject *array26 = NULL ;
-  int is_new_object26 = 0 ;
-  PyArrayObject *array28 = NULL ;
-  int is_new_object28 = 0 ;
-  int val30 ;
-  int ecode30 = 0 ;
-  PyObject *array31 = NULL ;
-  PyObject *array33 = NULL ;
-  PyObject *array35 = NULL ;
-  PyObject *swig_obj[26] ;
-  int result;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "grd3d_points_ijk_cells", 26, 26, swig_obj)) SWIG_fail;
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array1 = obj_to_array_contiguous_allow_conversion(swig_obj[0],
-      NPY_DOUBLE,
-      &is_new_object1);
-    if (!array1 || !require_dimensions(array1, 1) ||
-      !require_size(array1, size, 1)) SWIG_fail;
-    arg1 = (double*) array_data(array1);
-    arg2 = (long) array_size(array1,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array3 = obj_to_array_contiguous_allow_conversion(swig_obj[1],
-      NPY_DOUBLE,
-      &is_new_object3);
-    if (!array3 || !require_dimensions(array3, 1) ||
-      !require_size(array3, size, 1)) SWIG_fail;
-    arg3 = (double*) array_data(array3);
-    arg4 = (long) array_size(array3,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array5 = obj_to_array_contiguous_allow_conversion(swig_obj[2],
-      NPY_DOUBLE,
-      &is_new_object5);
-    if (!array5 || !require_dimensions(array5, 1) ||
-      !require_size(array5, size, 1)) SWIG_fail;
-    arg5 = (double*) array_data(array5);
-    arg6 = (long) array_size(array5,0);
-  }
-  ecode7 = SWIG_AsVal_int(swig_obj[3], &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "grd3d_points_ijk_cells" "', argument " "7"" of type '" "int""'");
-  } 
-  arg7 = (int)(val7);
-  ecode8 = SWIG_AsVal_int(swig_obj[4], &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "grd3d_points_ijk_cells" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = (int)(val8);
-  ecode9 = SWIG_AsVal_double(swig_obj[5], &val9);
-  if (!SWIG_IsOK(ecode9)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "grd3d_points_ijk_cells" "', argument " "9"" of type '" "double""'");
-  } 
-  arg9 = (double)(val9);
-  ecode10 = SWIG_AsVal_double(swig_obj[6], &val10);
-  if (!SWIG_IsOK(ecode10)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "grd3d_points_ijk_cells" "', argument " "10"" of type '" "double""'");
-  } 
-  arg10 = (double)(val10);
-  ecode11 = SWIG_AsVal_double(swig_obj[7], &val11);
-  if (!SWIG_IsOK(ecode11)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "grd3d_points_ijk_cells" "', argument " "11"" of type '" "double""'");
-  } 
-  arg11 = (double)(val11);
-  ecode12 = SWIG_AsVal_double(swig_obj[8], &val12);
-  if (!SWIG_IsOK(ecode12)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "grd3d_points_ijk_cells" "', argument " "12"" of type '" "double""'");
-  } 
-  arg12 = (double)(val12);
-  ecode13 = SWIG_AsVal_double(swig_obj[9], &val13);
-  if (!SWIG_IsOK(ecode13)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "grd3d_points_ijk_cells" "', argument " "13"" of type '" "double""'");
-  } 
-  arg13 = (double)(val13);
-  ecode14 = SWIG_AsVal_int(swig_obj[10], &val14);
-  if (!SWIG_IsOK(ecode14)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "grd3d_points_ijk_cells" "', argument " "14"" of type '" "int""'");
-  } 
-  arg14 = (int)(val14);
-  res15 = SWIG_ConvertPtr(swig_obj[11], &argp15,SWIGTYPE_p_double, 0 |  0 );
-  if (!SWIG_IsOK(res15)) {
-    SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "grd3d_points_ijk_cells" "', argument " "15"" of type '" "double *""'"); 
-  }
-  arg15 = (double *)(argp15);
-  res16 = SWIG_ConvertPtr(swig_obj[12], &argp16,SWIGTYPE_p_double, 0 |  0 );
-  if (!SWIG_IsOK(res16)) {
-    SWIG_exception_fail(SWIG_ArgError(res16), "in method '" "grd3d_points_ijk_cells" "', argument " "16"" of type '" "double *""'"); 
-  }
-  arg16 = (double *)(argp16);
-  res17 = SWIG_ConvertPtr(swig_obj[13], &argp17,SWIGTYPE_p_double, 0 |  0 );
-  if (!SWIG_IsOK(res17)) {
-    SWIG_exception_fail(SWIG_ArgError(res17), "in method '" "grd3d_points_ijk_cells" "', argument " "17"" of type '" "double *""'"); 
-  }
-  arg17 = (double *)(argp17);
-  res18 = SWIG_ConvertPtr(swig_obj[14], &argp18,SWIGTYPE_p_double, 0 |  0 );
-  if (!SWIG_IsOK(res18)) {
-    SWIG_exception_fail(SWIG_ArgError(res18), "in method '" "grd3d_points_ijk_cells" "', argument " "18"" of type '" "double *""'"); 
-  }
-  arg18 = (double *)(argp18);
-  ecode19 = SWIG_AsVal_int(swig_obj[15], &val19);
-  if (!SWIG_IsOK(ecode19)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode19), "in method '" "grd3d_points_ijk_cells" "', argument " "19"" of type '" "int""'");
-  } 
-  arg19 = (int)(val19);
-  ecode20 = SWIG_AsVal_int(swig_obj[16], &val20);
-  if (!SWIG_IsOK(ecode20)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode20), "in method '" "grd3d_points_ijk_cells" "', argument " "20"" of type '" "int""'");
-  } 
-  arg20 = (int)(val20);
-  ecode21 = SWIG_AsVal_int(swig_obj[17], &val21);
-  if (!SWIG_IsOK(ecode21)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode21), "in method '" "grd3d_points_ijk_cells" "', argument " "21"" of type '" "int""'");
-  } 
-  arg21 = (int)(val21);
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array22 = obj_to_array_contiguous_allow_conversion(swig_obj[18],
-      NPY_DOUBLE,
-      &is_new_object22);
-    if (!array22 || !require_dimensions(array22, 1) ||
-      !require_size(array22, size, 1)) SWIG_fail;
-    arg22 = (double*) array_data(array22);
-    arg23 = (long) array_size(array22,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array24 = obj_to_array_contiguous_allow_conversion(swig_obj[19],
-      NPY_DOUBLE,
-      &is_new_object24);
-    if (!array24 || !require_dimensions(array24, 1) ||
-      !require_size(array24, size, 1)) SWIG_fail;
-    arg24 = (double*) array_data(array24);
-    arg25 = (long) array_size(array24,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array26 = obj_to_array_contiguous_allow_conversion(swig_obj[20],
-      NPY_INT,
-      &is_new_object26);
-    if (!array26 || !require_dimensions(array26, 1) ||
-      !require_size(array26, size, 1)) SWIG_fail;
-    arg26 = (int*) array_data(array26);
-    arg27 = (long) array_size(array26,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array28 = obj_to_array_contiguous_allow_conversion(swig_obj[21],
-      NPY_DOUBLE,
-      &is_new_object28);
-    if (!array28 || !require_dimensions(array28, 1) ||
-      !require_size(array28, size, 1)) SWIG_fail;
-    arg28 = (double*) array_data(array28);
-    arg29 = (long) array_size(array28,0);
-  }
-  ecode30 = SWIG_AsVal_int(swig_obj[22], &val30);
-  if (!SWIG_IsOK(ecode30)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode30), "in method '" "grd3d_points_ijk_cells" "', argument " "30"" of type '" "int""'");
-  } 
-  arg30 = (int)(val30);
-  {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[23]))
-    {
-      const char* typestring = pytype_string(swig_obj[23]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg32 = (long) PyInt_AsLong(swig_obj[23]);
-    dims[0] = (npy_intp) arg32;
-    array31 = PyArray_SimpleNew(1, dims, NPY_INT);
-    if (!array31) SWIG_fail;
-    arg31 = (int*) array_data(array31);
-  }
-  {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[24]))
-    {
-      const char* typestring = pytype_string(swig_obj[24]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg34 = (long) PyInt_AsLong(swig_obj[24]);
-    dims[0] = (npy_intp) arg34;
-    array33 = PyArray_SimpleNew(1, dims, NPY_INT);
-    if (!array33) SWIG_fail;
-    arg33 = (int*) array_data(array33);
-  }
-  {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[25]))
-    {
-      const char* typestring = pytype_string(swig_obj[25]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg36 = (long) PyInt_AsLong(swig_obj[25]);
-    dims[0] = (npy_intp) arg36;
-    array35 = PyArray_SimpleNew(1, dims, NPY_INT);
-    if (!array35) SWIG_fail;
-    arg35 = (int*) array_data(array35);
-  }
-  {
-    char *err;
-    clear_exception();
-    result = (int)grd3d_points_ijk_cells(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19,arg20,arg21,arg22,arg23,arg24,arg25,arg26,arg27,arg28,arg29,arg30,arg31,arg32,arg33,arg34,arg35,arg36);
-    if ((err = check_exception())) {
-      PyErr_SetString(PY_XTGeoCLibError, err);
-      return NULL;
-    }
-  }
-  resultobj = SWIG_From_int((int)(result));
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array31);
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array33);
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array35);
-  }
-  {
-    if (is_new_object1 && array1)
-    {
-      Py_DECREF(array1); 
-    }
-  }
-  {
-    if (is_new_object3 && array3)
-    {
-      Py_DECREF(array3); 
-    }
-  }
-  {
-    if (is_new_object5 && array5)
-    {
-      Py_DECREF(array5); 
-    }
-  }
-  {
-    if (is_new_object22 && array22)
-    {
-      Py_DECREF(array22); 
-    }
-  }
-  {
-    if (is_new_object24 && array24)
-    {
-      Py_DECREF(array24); 
-    }
-  }
-  {
-    if (is_new_object26 && array26)
-    {
-      Py_DECREF(array26); 
-    }
-  }
-  {
-    if (is_new_object28 && array28)
-    {
-      Py_DECREF(array28); 
-    }
-  }
-  return resultobj;
-fail:
-  {
-    if (is_new_object1 && array1)
-    {
-      Py_DECREF(array1); 
-    }
-  }
-  {
-    if (is_new_object3 && array3)
-    {
-      Py_DECREF(array3); 
-    }
-  }
-  {
-    if (is_new_object5 && array5)
-    {
-      Py_DECREF(array5); 
-    }
-  }
-  {
-    if (is_new_object22 && array22)
-    {
-      Py_DECREF(array22); 
-    }
-  }
-  {
-    if (is_new_object24 && array24)
-    {
-      Py_DECREF(array24); 
-    }
-  }
-  {
-    if (is_new_object26 && array26)
-    {
-      Py_DECREF(array26); 
-    }
-  }
-  {
-    if (is_new_object28 && array28)
-    {
-      Py_DECREF(array28); 
-    }
-  }
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_grd3d_get_randomline(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   double *arg1 = (double *) 0 ;
@@ -20316,14 +19760,12 @@ static PyMethodDef SwigMethods[] = {
 	 { "grd3d_crop_geometry", _wrap_grd3d_crop_geometry, METH_VARARGS, NULL},
 	 { "grd3d_reduce_onelayer", _wrap_grd3d_reduce_onelayer, METH_VARARGS, NULL},
 	 { "grd3d_get_lay_slice", _wrap_grd3d_get_lay_slice, METH_VARARGS, NULL},
-	 { "grd3d_refine_vert", _wrap_grd3d_refine_vert, METH_VARARGS, NULL},
 	 { "grd3d_convert_hybrid", _wrap_grd3d_convert_hybrid, METH_VARARGS, NULL},
 	 { "grd3d_make_z_consistent", _wrap_grd3d_make_z_consistent, METH_VARARGS, NULL},
 	 { "grd3d_translate", _wrap_grd3d_translate, METH_VARARGS, NULL},
 	 { "grd3d_reverse_jrows", _wrap_grd3d_reverse_jrows, METH_VARARGS, NULL},
 	 { "grd3d_point_val_crange", _wrap_grd3d_point_val_crange, METH_VARARGS, NULL},
 	 { "grd3d_point_in_cell", _wrap_grd3d_point_in_cell, METH_VARARGS, NULL},
-	 { "grd3d_points_ijk_cells", _wrap_grd3d_points_ijk_cells, METH_VARARGS, NULL},
 	 { "grd3d_get_randomline", _wrap_grd3d_get_randomline, METH_VARARGS, NULL},
 	 { "grd3d_collapse_inact", _wrap_grd3d_collapse_inact, METH_VARARGS, NULL},
 	 { "grd3d_midpoint", _wrap_grd3d_midpoint, METH_VARARGS, NULL},

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.1'
-__version_tuple__ = version_tuple = (4, 7, 1)
+__version__ = version = '4.9.0'
+__version_tuple__ = version_tuple = (4, 9, 0)