xtgeo 4.12.1__cp310-cp310-macosx_11_0_arm64.whl → 4.13.0__cp310-cp310-macosx_11_0_arm64.whl

cxtgeoPYTHON_wrap.c

@@ -14022,152 +14022,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_grd3d_conv_roxapi_grid(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  long arg4 ;
-  int *arg5 = (int *) 0 ;
-  long arg6 ;
-  double *arg7 = (double *) 0 ;
-  long arg8 ;
-  double *arg9 = (double *) 0 ;
-  long arg10 ;
-  double *arg11 = (double *) 0 ;
-  long arg12 ;
-  int *arg13 = (int *) 0 ;
-  long arg14 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  long val4 ;
-  int ecode4 = 0 ;
-  PyArrayObject *array5 = NULL ;
-  int is_new_object5 = 0 ;
-  PyArrayObject *array7 = NULL ;
-  int is_new_object7 = 0 ;
-  PyArrayObject *array9 = NULL ;
-  int i9 = 1 ;
-  PyArrayObject *array11 = NULL ;
-  int i11 = 1 ;
-  PyArrayObject *array13 = NULL ;
-  int i13 = 1 ;
-  PyObject *swig_obj[9] ;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "grd3d_conv_roxapi_grid", 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_conv_roxapi_grid" "', 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_conv_roxapi_grid" "', 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_conv_roxapi_grid" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  ecode4 = SWIG_AsVal_long(swig_obj[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "grd3d_conv_roxapi_grid" "', argument " "4"" of type '" "long""'");
-  } 
-  arg4 = (long)(val4);
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array5 = obj_to_array_contiguous_allow_conversion(swig_obj[4],
-      NPY_INT,
-      &is_new_object5);
-    if (!array5 || !require_dimensions(array5, 1) ||
-      !require_size(array5, size, 1)) SWIG_fail;
-    arg5 = (int*) array_data(array5);
-    arg6 = (long) array_size(array5,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array7 = obj_to_array_contiguous_allow_conversion(swig_obj[5],
-      NPY_DOUBLE,
-      &is_new_object7);
-    if (!array7 || !require_dimensions(array7, 1) ||
-      !require_size(array7, size, 1)) SWIG_fail;
-    arg7 = (double*) array_data(array7);
-    arg8 = (long) array_size(array7,0);
-  }
-  {
-    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_DOUBLE);
-    if (!array11 || !require_dimensions(array11,1) || !require_contiguous(array11)
-      || !require_native(array11)) SWIG_fail;
-    arg11 = (double*) array_data(array11);
-    arg12 = 1;
-    for (i11=0; i11 < array_numdims(array11); ++i11) arg12 *= array_size(array11,i11);
-  }
-  {
-    array13 = obj_to_array_no_conversion(swig_obj[8], NPY_INT);
-    if (!array13 || !require_dimensions(array13,1) || !require_contiguous(array13)
-      || !require_native(array13)) SWIG_fail;
-    arg13 = (int*) array_data(array13);
-    arg14 = 1;
-    for (i13=0; i13 < array_numdims(array13); ++i13) arg14 *= array_size(array13,i13);
-  }
-  {
-    char *err;
-    clear_exception();
-    grd3d_conv_roxapi_grid(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14);
-    if ((err = check_exception())) {
-      PyErr_SetString(PY_XTGeoCLibError, err);
-      return NULL;
-    }
-  }
-  resultobj = SWIG_Py_Void();
-  {
-    if (is_new_object5 && array5)
-    {
-      Py_DECREF(array5); 
-    }
-  }
-  {
-    if (is_new_object7 && array7)
-    {
-      Py_DECREF(array7); 
-    }
-  }
-  return resultobj;
-fail:
-  {
-    if (is_new_object5 && array5)
-    {
-      Py_DECREF(array5); 
-    }
-  }
-  {
-    if (is_new_object7 && array7)
-    {
-      Py_DECREF(array7); 
-    }
-  }
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_grd3d_roff2xtgeo_splitenz(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
@@ -14247,203 +14101,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_grd3d_conv_grid_roxapi(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  double *arg4 = (double *) 0 ;
-  long arg5 ;
-  double *arg6 = (double *) 0 ;
-  long arg7 ;
-  int *arg8 = (int *) 0 ;
-  long arg9 ;
-  double *arg10 = (double *) 0 ;
-  long arg11 ;
-  double *arg12 = (double *) 0 ;
-  long arg13 ;
-  double *arg14 = (double *) 0 ;
-  long arg15 ;
-  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 ;
-  PyArrayObject *array8 = NULL ;
-  int is_new_object8 = 0 ;
-  PyObject *array10 = NULL ;
-  PyObject *array12 = NULL ;
-  PyObject *array14 = NULL ;
-  PyObject *swig_obj[9] ;
-  int result;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "grd3d_conv_grid_roxapi", 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_conv_grid_roxapi" "', 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_conv_grid_roxapi" "', 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_conv_grid_roxapi" "', 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_DOUBLE,
-      &is_new_object6);
-    if (!array6 || !require_dimensions(array6, 1) ||
-      !require_size(array6, size, 1)) SWIG_fail;
-    arg6 = (double*) array_data(array6);
-    arg7 = (long) array_size(array6,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array8 = obj_to_array_contiguous_allow_conversion(swig_obj[5],
-      NPY_INT,
-      &is_new_object8);
-    if (!array8 || !require_dimensions(array8, 1) ||
-      !require_size(array8, size, 1)) SWIG_fail;
-    arg8 = (int*) array_data(array8);
-    arg9 = (long) array_size(array8,0);
-  }
-  {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[6]))
-    {
-      const char* typestring = pytype_string(swig_obj[6]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg11 = (long) PyInt_AsLong(swig_obj[6]);
-    dims[0] = (npy_intp) arg11;
-    array10 = PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-    if (!array10) SWIG_fail;
-    arg10 = (double*) array_data(array10);
-  }
-  {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[7]))
-    {
-      const char* typestring = pytype_string(swig_obj[7]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg13 = (long) PyInt_AsLong(swig_obj[7]);
-    dims[0] = (npy_intp) arg13;
-    array12 = PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-    if (!array12) SWIG_fail;
-    arg12 = (double*) array_data(array12);
-  }
-  {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[8]))
-    {
-      const char* typestring = pytype_string(swig_obj[8]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg15 = (long) PyInt_AsLong(swig_obj[8]);
-    dims[0] = (npy_intp) arg15;
-    array14 = PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-    if (!array14) SWIG_fail;
-    arg14 = (double*) array_data(array14);
-  }
-  {
-    char *err;
-    clear_exception();
-    result = (int)grd3d_conv_grid_roxapi(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
-    if ((err = check_exception())) {
-      PyErr_SetString(PY_XTGeoCLibError, err);
-      return NULL;
-    }
-  }
-  resultobj = SWIG_From_int((int)(result));
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array10);
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array12);
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array14);
-  }
-  {
-    if (is_new_object4 && array4)
-    {
-      Py_DECREF(array4); 
-    }
-  }
-  {
-    if (is_new_object6 && array6)
-    {
-      Py_DECREF(array6); 
-    }
-  }
-  {
-    if (is_new_object8 && array8)
-    {
-      Py_DECREF(array8); 
-    }
-  }
-  return resultobj;
-fail:
-  {
-    if (is_new_object4 && array4)
-    {
-      Py_DECREF(array4); 
-    }
-  }
-  {
-    if (is_new_object6 && array6)
-    {
-      Py_DECREF(array6); 
-    }
-  }
-  {
-    if (is_new_object8 && array8)
-    {
-      Py_DECREF(array8); 
-    }
-  }
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_grd3d_crop_geometry(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
@@ -14745,248 +14402,55 @@ SWIGINTERN PyObject *_wrap_grd3d_reduce_onelayer(PyObject *self, PyObject *args)
     if (!array6 || !require_dimensions(array6,1) || !require_contiguous(array6)
       || !require_native(array6)) SWIG_fail;
     arg6 = (double*) array_data(array6);
-    arg7 = 1;
-    for (i6=0; i6 < array_numdims(array6); ++i6) arg7 *= array_size(array6,i6);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array8 = obj_to_array_contiguous_allow_conversion(swig_obj[5],
-      NPY_INT,
-      &is_new_object8);
-    if (!array8 || !require_dimensions(array8, 1) ||
-      !require_size(array8, size, 1)) SWIG_fail;
-    arg8 = (int*) array_data(array8);
-    arg9 = (long) array_size(array8,0);
-  }
-  {
-    array10 = obj_to_array_no_conversion(swig_obj[6], NPY_INT);
-    if (!array10 || !require_dimensions(array10,1) || !require_contiguous(array10)
-      || !require_native(array10)) SWIG_fail;
-    arg10 = (int*) array_data(array10);
-    arg11 = 1;
-    for (i10=0; i10 < array_numdims(array10); ++i10) arg11 *= array_size(array10,i10);
-  }
-  res12 = SWIG_ConvertPtr(swig_obj[7], &argp12,SWIGTYPE_p_int, 0 |  0 );
-  if (!SWIG_IsOK(res12)) {
-    SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "grd3d_reduce_onelayer" "', argument " "12"" of type '" "int *""'"); 
-  }
-  arg12 = (int *)(argp12);
-  ecode13 = SWIG_AsVal_int(swig_obj[8], &val13);
-  if (!SWIG_IsOK(ecode13)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "grd3d_reduce_onelayer" "', argument " "13"" of type '" "int""'");
-  } 
-  arg13 = (int)(val13);
-  {
-    char *err;
-    clear_exception();
-    result = (int)grd3d_reduce_onelayer(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_object8 && array8)
-    {
-      Py_DECREF(array8); 
-    }
-  }
-  return resultobj;
-fail:
-  {
-    if (is_new_object4 && array4)
-    {
-      Py_DECREF(array4); 
-    }
-  }
-  {
-    if (is_new_object8 && array8)
-    {
-      Py_DECREF(array8); 
-    }
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_grd3d_get_lay_slice(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  int arg1 ;
-  int arg2 ;
-  int arg3 ;
-  double *arg4 = (double *) 0 ;
-  long arg5 ;
-  double *arg6 = (double *) 0 ;
-  long arg7 ;
-  int *arg8 = (int *) 0 ;
-  long arg9 ;
-  int arg10 ;
-  int arg11 ;
-  int arg12 ;
-  double *arg13 = (double *) 0 ;
-  long arg14 ;
-  long *arg15 = (long *) 0 ;
-  long arg16 ;
-  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 ;
-  PyArrayObject *array8 = NULL ;
-  int is_new_object8 = 0 ;
-  int val10 ;
-  int ecode10 = 0 ;
-  int val11 ;
-  int ecode11 = 0 ;
-  int val12 ;
-  int ecode12 = 0 ;
-  PyObject *array13 = NULL ;
-  PyObject *array15 = NULL ;
-  PyObject *swig_obj[11] ;
-  int result;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "grd3d_get_lay_slice", 11, 11, 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_get_lay_slice" "', 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_get_lay_slice" "', 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_get_lay_slice" "', 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_DOUBLE,
-      &is_new_object6);
-    if (!array6 || !require_dimensions(array6, 1) ||
-      !require_size(array6, size, 1)) SWIG_fail;
-    arg6 = (double*) array_data(array6);
-    arg7 = (long) array_size(array6,0);
-  }
-  {
-    npy_intp size[1] = {
-      -1 
-    };
-    array8 = obj_to_array_contiguous_allow_conversion(swig_obj[5],
-      NPY_INT,
-      &is_new_object8);
-    if (!array8 || !require_dimensions(array8, 1) ||
-      !require_size(array8, size, 1)) SWIG_fail;
-    arg8 = (int*) array_data(array8);
-    arg9 = (long) array_size(array8,0);
-  }
-  ecode10 = SWIG_AsVal_int(swig_obj[6], &val10);
-  if (!SWIG_IsOK(ecode10)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "grd3d_get_lay_slice" "', argument " "10"" of type '" "int""'");
-  } 
-  arg10 = (int)(val10);
-  ecode11 = SWIG_AsVal_int(swig_obj[7], &val11);
-  if (!SWIG_IsOK(ecode11)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "grd3d_get_lay_slice" "', argument " "11"" of type '" "int""'");
-  } 
-  arg11 = (int)(val11);
-  ecode12 = SWIG_AsVal_int(swig_obj[8], &val12);
-  if (!SWIG_IsOK(ecode12)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "grd3d_get_lay_slice" "', argument " "12"" of type '" "int""'");
-  } 
-  arg12 = (int)(val12);
-  {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[9]))
-    {
-      const char* typestring = pytype_string(swig_obj[9]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg14 = (long) PyInt_AsLong(swig_obj[9]);
-    dims[0] = (npy_intp) arg14;
-    array13 = PyArray_SimpleNew(1, dims, NPY_DOUBLE);
-    if (!array13) SWIG_fail;
-    arg13 = (double*) array_data(array13);
+    arg7 = 1;
+    for (i6=0; i6 < array_numdims(array6); ++i6) arg7 *= array_size(array6,i6);
   }
   {
-    npy_intp dims[1];
-    if (!PyInt_Check(swig_obj[10]))
-    {
-      const char* typestring = pytype_string(swig_obj[10]);
-      PyErr_Format(PyExc_TypeError,
-        "Int dimension expected.  '%s' given.",
-        typestring);
-      SWIG_fail;
-    }
-    arg16 = (long) PyInt_AsLong(swig_obj[10]);
-    dims[0] = (npy_intp) arg16;
-    array15 = PyArray_SimpleNew(1, dims, NPY_LONG);
-    if (!array15) SWIG_fail;
-    arg15 = (long*) array_data(array15);
+    npy_intp size[1] = {
+      -1 
+    };
+    array8 = obj_to_array_contiguous_allow_conversion(swig_obj[5],
+      NPY_INT,
+      &is_new_object8);
+    if (!array8 || !require_dimensions(array8, 1) ||
+      !require_size(array8, size, 1)) SWIG_fail;
+    arg8 = (int*) array_data(array8);
+    arg9 = (long) array_size(array8,0);
+  }
+  {
+    array10 = obj_to_array_no_conversion(swig_obj[6], NPY_INT);
+    if (!array10 || !require_dimensions(array10,1) || !require_contiguous(array10)
+      || !require_native(array10)) SWIG_fail;
+    arg10 = (int*) array_data(array10);
+    arg11 = 1;
+    for (i10=0; i10 < array_numdims(array10); ++i10) arg11 *= array_size(array10,i10);
+  }
+  res12 = SWIG_ConvertPtr(swig_obj[7], &argp12,SWIGTYPE_p_int, 0 |  0 );
+  if (!SWIG_IsOK(res12)) {
+    SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "grd3d_reduce_onelayer" "', argument " "12"" of type '" "int *""'"); 
   }
+  arg12 = (int *)(argp12);
+  ecode13 = SWIG_AsVal_int(swig_obj[8], &val13);
+  if (!SWIG_IsOK(ecode13)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "grd3d_reduce_onelayer" "', argument " "13"" of type '" "int""'");
+  } 
+  arg13 = (int)(val13);
   {
     char *err;
     clear_exception();
-    result = (int)grd3d_get_lay_slice(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16);
+    result = (int)grd3d_reduce_onelayer(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));
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array13);
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array15);
-  }
   {
     if (is_new_object4 && array4)
     {
       Py_DECREF(array4); 
     }
   }
-  {
-    if (is_new_object6 && array6)
-    {
-      Py_DECREF(array6); 
-    }
-  }
   {
     if (is_new_object8 && array8)
     {
@@ -15001,12 +14465,6 @@ fail:
       Py_DECREF(array4); 
     }
   }
-  {
-    if (is_new_object6 && array6)
-    {
-      Py_DECREF(array6); 
-    }
-  }
   {
     if (is_new_object8 && array8)
     {
@@ -15017,7 +14475,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_grd3d_convert_hybrid(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_grd3d_get_lay_slice(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
   int arg2 ;
@@ -15029,16 +14487,12 @@ SWIGINTERN PyObject *_wrap_grd3d_convert_hybrid(PyObject *self, PyObject *args)
   int *arg8 = (int *) 0 ;
   long arg9 ;
   int arg10 ;
-  double *arg11 = (double *) 0 ;
-  long arg12 ;
-  int *arg13 = (int *) 0 ;
+  int arg11 ;
+  int arg12 ;
+  double *arg13 = (double *) 0 ;
   long arg14 ;
-  double arg15 ;
-  double arg16 ;
-  int arg17 ;
-  int *arg18 = (int *) 0 ;
-  long arg19 ;
-  int arg20 ;
+  long *arg15 = (long *) 0 ;
+  long arg16 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -15053,37 +14507,30 @@ SWIGINTERN PyObject *_wrap_grd3d_convert_hybrid(PyObject *self, PyObject *args)
   int is_new_object8 = 0 ;
   int val10 ;
   int ecode10 = 0 ;
-  PyArrayObject *array11 = NULL ;
-  int i11 = 1 ;
-  PyArrayObject *array13 = NULL ;
-  int i13 = 1 ;
-  double val15 ;
-  int ecode15 = 0 ;
-  double val16 ;
-  int ecode16 = 0 ;
-  int val17 ;
-  int ecode17 = 0 ;
-  PyArrayObject *array18 = NULL ;
-  int is_new_object18 = 0 ;
-  int val20 ;
-  int ecode20 = 0 ;
-  PyObject *swig_obj[14] ;
+  int val11 ;
+  int ecode11 = 0 ;
+  int val12 ;
+  int ecode12 = 0 ;
+  PyObject *array13 = NULL ;
+  PyObject *array15 = NULL ;
+  PyObject *swig_obj[11] ;
+  int result;
   
   (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "grd3d_convert_hybrid", 14, 14, swig_obj)) SWIG_fail;
+  if (!SWIG_Python_UnpackTuple(args, "grd3d_get_lay_slice", 11, 11, 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_convert_hybrid" "', argument " "1"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "grd3d_get_lay_slice" "', 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_convert_hybrid" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "grd3d_get_lay_slice" "', 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_convert_hybrid" "', argument " "3"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "grd3d_get_lay_slice" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   {
@@ -15124,67 +14571,67 @@ SWIGINTERN PyObject *_wrap_grd3d_convert_hybrid(PyObject *self, PyObject *args)
   }
   ecode10 = SWIG_AsVal_int(swig_obj[6], &val10);
   if (!SWIG_IsOK(ecode10)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "grd3d_convert_hybrid" "', argument " "10"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "grd3d_get_lay_slice" "', argument " "10"" of type '" "int""'");
   } 
   arg10 = (int)(val10);
-  {
-    array11 = obj_to_array_no_conversion(swig_obj[7], NPY_DOUBLE);
-    if (!array11 || !require_dimensions(array11,1) || !require_contiguous(array11)
-      || !require_native(array11)) SWIG_fail;
-    arg11 = (double*) array_data(array11);
-    arg12 = 1;
-    for (i11=0; i11 < array_numdims(array11); ++i11) arg12 *= array_size(array11,i11);
-  }
-  {
-    array13 = obj_to_array_no_conversion(swig_obj[8], NPY_INT);
-    if (!array13 || !require_dimensions(array13,1) || !require_contiguous(array13)
-      || !require_native(array13)) SWIG_fail;
-    arg13 = (int*) array_data(array13);
-    arg14 = 1;
-    for (i13=0; i13 < array_numdims(array13); ++i13) arg14 *= array_size(array13,i13);
-  }
-  ecode15 = SWIG_AsVal_double(swig_obj[9], &val15);
-  if (!SWIG_IsOK(ecode15)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode15), "in method '" "grd3d_convert_hybrid" "', argument " "15"" of type '" "double""'");
-  } 
-  arg15 = (double)(val15);
-  ecode16 = SWIG_AsVal_double(swig_obj[10], &val16);
-  if (!SWIG_IsOK(ecode16)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode16), "in method '" "grd3d_convert_hybrid" "', argument " "16"" of type '" "double""'");
+  ecode11 = SWIG_AsVal_int(swig_obj[7], &val11);
+  if (!SWIG_IsOK(ecode11)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "grd3d_get_lay_slice" "', argument " "11"" of type '" "int""'");
   } 
-  arg16 = (double)(val16);
-  ecode17 = SWIG_AsVal_int(swig_obj[11], &val17);
-  if (!SWIG_IsOK(ecode17)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode17), "in method '" "grd3d_convert_hybrid" "', argument " "17"" of type '" "int""'");
+  arg11 = (int)(val11);
+  ecode12 = SWIG_AsVal_int(swig_obj[8], &val12);
+  if (!SWIG_IsOK(ecode12)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "grd3d_get_lay_slice" "', argument " "12"" of type '" "int""'");
   } 
-  arg17 = (int)(val17);
+  arg12 = (int)(val12);
   {
-    npy_intp size[1] = {
-      -1 
-    };
-    array18 = obj_to_array_contiguous_allow_conversion(swig_obj[12],
-      NPY_INT,
-      &is_new_object18);
-    if (!array18 || !require_dimensions(array18, 1) ||
-      !require_size(array18, size, 1)) SWIG_fail;
-    arg18 = (int*) array_data(array18);
-    arg19 = (long) array_size(array18,0);
+    npy_intp dims[1];
+    if (!PyInt_Check(swig_obj[9]))
+    {
+      const char* typestring = pytype_string(swig_obj[9]);
+      PyErr_Format(PyExc_TypeError,
+        "Int dimension expected.  '%s' given.",
+        typestring);
+      SWIG_fail;
+    }
+    arg14 = (long) PyInt_AsLong(swig_obj[9]);
+    dims[0] = (npy_intp) arg14;
+    array13 = PyArray_SimpleNew(1, dims, NPY_DOUBLE);
+    if (!array13) SWIG_fail;
+    arg13 = (double*) array_data(array13);
+  }
+  {
+    npy_intp dims[1];
+    if (!PyInt_Check(swig_obj[10]))
+    {
+      const char* typestring = pytype_string(swig_obj[10]);
+      PyErr_Format(PyExc_TypeError,
+        "Int dimension expected.  '%s' given.",
+        typestring);
+      SWIG_fail;
+    }
+    arg16 = (long) PyInt_AsLong(swig_obj[10]);
+    dims[0] = (npy_intp) arg16;
+    array15 = PyArray_SimpleNew(1, dims, NPY_LONG);
+    if (!array15) SWIG_fail;
+    arg15 = (long*) array_data(array15);
   }
-  ecode20 = SWIG_AsVal_int(swig_obj[13], &val20);
-  if (!SWIG_IsOK(ecode20)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode20), "in method '" "grd3d_convert_hybrid" "', argument " "20"" of type '" "int""'");
-  } 
-  arg20 = (int)(val20);
   {
     char *err;
     clear_exception();
-    grd3d_convert_hybrid(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,arg17,arg18,arg19,arg20);
+    result = (int)grd3d_get_lay_slice(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16);
     if ((err = check_exception())) {
       PyErr_SetString(PY_XTGeoCLibError, err);
       return NULL;
     }
   }
-  resultobj = SWIG_Py_Void();
+  resultobj = SWIG_From_int((int)(result));
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array13);
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj,(PyObject*)array15);
+  }
   {
     if (is_new_object4 && array4)
     {
@@ -15203,12 +14650,6 @@ SWIGINTERN PyObject *_wrap_grd3d_convert_hybrid(PyObject *self, PyObject *args)
       Py_DECREF(array8); 
     }
   }
-  {
-    if (is_new_object18 && array18)
-    {
-      Py_DECREF(array18); 
-    }
-  }
   return resultobj;
 fail:
   {
@@ -15229,12 +14670,6 @@ fail:
       Py_DECREF(array8); 
     }
   }
-  {
-    if (is_new_object18 && array18)
-    {
-      Py_DECREF(array18); 
-    }
-  }
   return NULL;
 }
 
@@ -16218,76 +15653,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_grd3d_collapse_inact(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 val1 ;
-  int ecode1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyArrayObject *array4 = NULL ;
-  int i4 = 1 ;
-  PyArrayObject *array6 = NULL ;
-  int i6 = 1 ;
-  PyObject *swig_obj[5] ;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "grd3d_collapse_inact", 5, 5, 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_collapse_inact" "', 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_collapse_inact" "', 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_collapse_inact" "', argument " "3"" of type '" "int""'");
-  } 
-  arg3 = (int)(val3);
-  {
-    array4 = obj_to_array_no_conversion(swig_obj[3], NPY_DOUBLE);
-    if (!array4 || !require_dimensions(array4,1) || !require_contiguous(array4)
-      || !require_native(array4)) SWIG_fail;
-    arg4 = (double*) array_data(array4);
-    arg5 = 1;
-    for (i4=0; i4 < array_numdims(array4); ++i4) arg5 *= array_size(array4,i4);
-  }
-  {
-    array6 = obj_to_array_no_conversion(swig_obj[4], NPY_INT);
-    if (!array6 || !require_dimensions(array6,1) || !require_contiguous(array6)
-      || !require_native(array6)) SWIG_fail;
-    arg6 = (int*) array_data(array6);
-    arg7 = 1;
-    for (i6=0; i6 < array_numdims(array6); ++i6) arg7 *= array_size(array6,i6);
-  }
-  {
-    char *err;
-    clear_exception();
-    grd3d_collapse_inact(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-    if ((err = check_exception())) {
-      PyErr_SetString(PY_XTGeoCLibError, err);
-      return NULL;
-    }
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_grd3d_midpoint(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   int arg1 ;
@@ -19754,20 +19119,16 @@ static PyMethodDef SwigMethods[] = {
 	 { "grdcp3d_calc_dx", _wrap_grdcp3d_calc_dx, METH_VARARGS, NULL},
 	 { "grdcp3d_calc_dy", _wrap_grdcp3d_calc_dy, METH_VARARGS, NULL},
 	 { "grdcp3d_calc_dz", _wrap_grdcp3d_calc_dz, METH_VARARGS, NULL},
-	 { "grd3d_conv_roxapi_grid", _wrap_grd3d_conv_roxapi_grid, METH_VARARGS, NULL},
 	 { "grd3d_roff2xtgeo_splitenz", _wrap_grd3d_roff2xtgeo_splitenz, METH_VARARGS, NULL},
-	 { "grd3d_conv_grid_roxapi", _wrap_grd3d_conv_grid_roxapi, METH_VARARGS, NULL},
 	 { "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_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_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},
 	 { "grd3d_inact_outside_pol", _wrap_grd3d_inact_outside_pol, METH_VARARGS, NULL},
 	 { "grd3d_setval_poly", _wrap_grd3d_setval_poly, METH_VARARGS, NULL},