Merge pull request #307 from jcrivenaes/zcorn-etc-as-numpies-primarely

Zcorn etc as numpies primarely

Author: jcrivenaes

docs/datamodels.rst

@@ -162,8 +162,8 @@ a corner-point grid (Grid class), and a number of assosiated properties
 (GridProperty class):
 
 * The geometry is stored as pointers to C arrays; hence the geometry itself is not
-  directly accessible in Python. The C arrays are usually named p_coord_v, p_zcorn_v,
-  and p_actnum_v. They are one dimensionial arrays.
+  directly accessible in Python. The C arrays are usually named coordsv, zcornsv,
+  and actnumsv. They are one dimensionial arrays.
 
 * The grid dimensions are given by ``ncol * nrow * nlay``
 

src/xtgeo/clib/cxtgeo.i

@@ -99,6 +99,14 @@ import_array();
 %apply (double* IN_ARRAY1, long DIM1) {(double *swig_np_dbl_in_v4,
                                         long n_swig_np_dbl_in_v4)};
 
+// IN float64 / double no 5
+%apply (double* IN_ARRAY1, long DIM1) {(double *swig_np_dbl_in_v5,
+                                        long n_swig_np_dbl_in_v5)};
+
+// IN float64 / double no 6
+%apply (double* IN_ARRAY1, long DIM1) {(double *swig_np_dbl_in_v6,
+                                        long n_swig_np_dbl_in_v6)};
+
 // INPLACE int no 1
 %apply (int* INPLACE_ARRAY1, long DIM1) {(int *swig_np_int_inplace_v1,
                                           long n_swig_np_int_inplace_v1)};

src/xtgeo/clib/etc/ctests/test_eclgridprop.c

@@ -12,8 +12,8 @@ int main () {
     int    nx, ny, nz, ptype, ncodes;
     double xori, yori, xinc, yinc, rot;
     int    mode, debug, ndef, nklist, ndates;
-    double *p_double_v, *p_zcorn_v, *p_coord_v;
-    int    *p_actnum_v;
+    double *p_double_v, *zcornsv, *coordsv;
+    int    *actnumsv;
     char   *p_codenames_v;
     int    *p_int_v, *p_codevalues_v;
     int    *day, *mon, *year, *nktype, *dsuccess, *norder, nklist3;
@@ -43,14 +43,14 @@ int main () {
     /*     		    file, debug); */
 
 
-    /* p_coord_v = calloc((nx+1)*(ny+1)*2*3, 8); */
-    /* p_zcorn_v = calloc(nx*ny*(nz+1)*4, 8); */
-    /* p_actnum_v = calloc(nx*ny*nz, 4); */
+    /* coordsv = calloc((nx+1)*(ny+1)*2*3, 8); */
+    /* zcornsv = calloc(nx*ny*(nz+1)*4, 8); */
+    /* actnumsv = calloc(nx*ny*nz, 4); */
 
     /* grd3d_import_ecl_egrid (0, nx, ny, nz, */
     /*     		    &ndef, */
-    /*     		    p_coord_v, p_zcorn_v, */
-    /*     		    p_actnum_v, file, debug); */
+    /*     		    coordsv, zcornsv, */
+    /*     		    actnumsv, file, debug); */
 
 
     /* printf("%d\n",nx); */
@@ -92,7 +92,7 @@ int main () {
 
     /* grd3d_import_ecl_prop(5, */
     /* 			  nx*ny*nz, */
-    /* 			  p_actnum_v, */
+    /* 			  actnumsv, */
     /* 			  nklist, */
     /* 			  useprops, */
     /* 			  ndates, */

src/xtgeo/clib/etc/ctests/test_grd3d_onelayer.c

@@ -15,9 +15,9 @@ int main () {
     double xstep, ystep, xori, xmin, xmax, yori, ymin, ymax, zmin, zmax;
     double *zval_v, *zval2_v;
     int    numact, numsubs, nx, ny, nz, nactive, status;
-    int    *p_actnum_v, *p_subgrd_v;
+    int    *actnumsv, *p_subgrd_v;
     int    *p_actnum2_v, *p_subgrd2_v;
-    double *p_coord_v, *p_zcorn_v, *p_zcorn2_v;
+    double *coordsv, *zcornsv, *p_zcorn2_v;
 
 
     xtgverbose(debug);
@@ -38,19 +38,19 @@ int main () {
     nz=14;
 
     /* allocate */
-    p_coord_v = calloc((nx+1)*(ny+1)*2*3,sizeof(double));
-    p_zcorn_v = calloc(nx*ny*(nz+1)*4,sizeof(double));
-    p_actnum_v = calloc(nx*ny*nz,sizeof(int));
+    coordsv = calloc((nx+1)*(ny+1)*2*3,sizeof(double));
+    zcornsv = calloc(nx*ny*(nz+1)*4,sizeof(double));
+    actnumsv = calloc(nx*ny*nz,sizeof(int));
     p_subgrd_v = calloc(1,sizeof(int));
 
 
     printf("Reading grid\n");
-    grd3d_import_roff_grid(&numact, &numsubs, p_coord_v, p_zcorn_v,
-			   p_actnum_v, p_subgrd_v, 1, file, debug);
+    grd3d_import_roff_grid(&numact, &numsubs, coordsv, zcornsv,
+			   actnumsv, p_subgrd_v, 1, file, debug);
 
     printf("Reading grid done\n");
 
-    ok(p_actnum_v[33]==1, "ACTNUM of location 33");
+    ok(actnumsv[33]==1, "ACTNUM of location 33");
 
 
     p_zcorn2_v = calloc(nx*ny*(1+1)*4,sizeof(double));
@@ -62,9 +62,9 @@ int main () {
 			  nx,
 			  ny,
 			  nz,
-			  p_zcorn_v,
+			  zcornsv,
 			  p_zcorn2_v,
-			  p_actnum_v,
+			  actnumsv,
 			  p_actnum2_v,
 			  &nactive,
 			  0,
@@ -88,7 +88,7 @@ int main () {
 			    450000,
 			    6700000,
 			    0,
-			    p_coord_v,
+			    coordsv,
 			    p_zcorn2_v,
 			    p_actnum2_v,
 			    p_subgrd2_v,
@@ -102,7 +102,7 @@ int main () {
 			 nx,
 			 ny,
 			 1,
-			 p_coord_v,
+			 coordsv,
 			 p_zcorn2_v,
 			 p_actnum2_v,
 			 file,

src/xtgeo/clib/etc/ctests/test_point_in_cell_profiling.c

@@ -8,8 +8,8 @@ int main () {
     int ib, ier, inside, i;
     double nvector[4], line_v[6], point_v[3], c[24], myz;
     int    debug=1, nx, ny, nz, numact, numsubs;
-    int    *p_actnum_v, *p_subgrd_v, ns;
-    double *p_coord_v, *p_zcorn_v;
+    int    *actnumsv, *p_subgrd_v, ns;
+    double *coordsv, *zcornsv;
     char file[70];
     double x, y, z, zadd;
     int  ibstart;
@@ -28,15 +28,15 @@ int main () {
     nz=14;
 
     /* allocate */
-    p_coord_v = calloc((nx+1)*(ny+1)*2*3,sizeof(double));
-    p_zcorn_v = calloc(nx*ny*(nz+1)*4,sizeof(double));
-    p_actnum_v = calloc(nx*ny*nz,sizeof(int));
+    coordsv = calloc((nx+1)*(ny+1)*2*3,sizeof(double));
+    zcornsv = calloc(nx*ny*(nz+1)*4,sizeof(double));
+    actnumsv = calloc(nx*ny*nz,sizeof(int));
     p_subgrd_v = calloc(1,sizeof(int));
 
 
     printf("Reading grid\n");
-    grd3d_import_roff_grid(&numact, &numsubs, p_coord_v, p_zcorn_v,
-			   p_actnum_v, p_subgrd_v, 1, file, debug);
+    grd3d_import_roff_grid(&numact, &numsubs, coordsv, zcornsv,
+			   actnumsv, p_subgrd_v, 1, file, debug);
 
     printf("Reading grid done\n");
 
@@ -57,9 +57,9 @@ int main () {
     /*     		       nx, */
     /*     		       ny, */
     /*     		       nz, */
-    /*     		       p_coord_v, */
-    /*     		       p_zcorn_v, */
-    /*     		       p_actnum_v, */
+    /*     		       coordsv, */
+    /*     		       zcornsv, */
+    /*     		       actnumsv, */
     /*     		       5, */
     /*     		       1, */
     /*     		       &ns, */

src/xtgeo/clib/etc/extra/attic/grd3d_adj_z_local.c.unfinished

@@ -21,9 +21,9 @@ void grd3d_adj_z_local (
 			     int nx,
 			     int ny,
 			     int nz,
-			     double *p_coord_v,
-			     double *p_zcorn_v,
-			     int *p_actnum_v,
+			     double *coordsv,
+			     double *zcornsv,
+			     int *actnumsv,
 			     int iuse,
 			     int juse,
 			     int kuse,
@@ -43,7 +43,7 @@ void grd3d_adj_z_local (
 
     xtg_speak(s,2,"Entering <grd3d_adj_z_local>");
     xtg_speak(s,3,"Using IFLAG: %d", iflag);
-    
+
     xtg_speak(s,3,"NX NY NZ: %d %d %d", nx, ny, nz);
 
 
@@ -56,24 +56,24 @@ void grd3d_adj_z_local (
 			    nx,
 			    ny,
 			    nz,
-			    p_zcorn_v,
-			    p_actnum_v,
+			    zcornsv,
+			    actnumsv,
 			    0.001,
 			    debug
 			    );
 
     kstart=1;
     kstop=nz;
-   
-    /* Adjust all values along pillar: */	
-    if (iflag==0) {			
+
+    /* Adjust all values along pillar: */
+    if (iflag==0) {
 	for (k = 1; k <= nz+1; k+=1) {
 	    ib=x_ijk2ib(i,j,k,nx,ny,nz+1,0);
-	    p_zcorn_v[4*ib + 1*ic - 1] = 
-		p_zcorn_v[4*ib + 1*ic - 1] + zadj;		    
+	    zcornsv[4*ib + 1*ic - 1] =
+		zcornsv[4*ib + 1*ic - 1] + zadj;
 	}
     }
-    
+
 
 
 
@@ -88,15 +88,12 @@ void grd3d_adj_z_local (
 			    nx,
 			    ny,
 			    nz,
-			    p_zcorn_v,
-			    p_actnum_v,
+			    zcornsv,
+			    actnumsv,
 			    0.001,
 			    debug
 			    );
 
     xtg_speak(s,1,"Adjusting grid to map ... DONE!");
     xtg_speak(s,2,"Exiting <grd3d_adj_z_from_map>");
 }
-
-
-