Changeset 630

Timestamp:

12/12/17 16:03:39 (6 years ago)

Author:

dubos

Message:

devel/Python : more cythonic interface to XIOS

Location:

codes/icosagcm/devel/Python/src

Files:

• functions.h (modified) (1 diff)
• xios.pyx (modified) (3 diffs)

codes/icosagcm/devel/Python/src/functions.h

@@ -12 +12 @@
 void cxios_context_finalize(void);
 void cxios_finalize(void);
+
+void cxios_write_data_k81(char*, int, double*, int);
+void cxios_write_data_k82(char*, int, double*, int, int);
+void cxios_write_data_k83(char*, int, double*, int, int, int);

codes/icosagcm/devel/Python/src/xios.pyx

@@ -8 +8 @@
 
 cdef extern from "functions.h":
-     cpdef void context_close_definition "cxios_context_close_definition"()
-     cpdef void context_finalize "cxios_context_finalize"()
-     cpdef void finalize "cxios_finalize"()
+     cdef void cxios_context_close_definition()
+     cdef void cxios_context_finalize()
+     cdef void cxios_finalize()
+     cdef void cxios_write_data_k81(char*, int, double*, int)
+     cdef void cxios_write_data_k82(char*, int, double*, int,int)
+     cdef void cxios_write_data_k83(char*, int, double*, int,int,int)
+
+def context_close_definition(): cxios_context_close_definition()
+def context_finalize(): cxios_context_finalize()
+def finalize(): cxios_finalize()
+
+cdef send_field1(char* id, int idlen, double[:] data):     cxios_write_data_k81(id, idlen, &data[0],     data.shape[0])
+cdef send_field2(char* id, int idlen, double[:,:] data):   cxios_write_data_k82(id, idlen, &data[0,0],   data.shape[0],data.shape[1])
+cdef send_field3(char* id, int idlen, double[:,:,:] data): cxios_write_data_k83(id, idlen, &data[0,0,0], data.shape[0],data.shape[1],data.shape[2])
+
+def send_field(bytes id, data):
+    cdef char* idptr = id
+    cdef int idlen = len(id)
+    print 'cxios.write_data', id, data.shape
+    ndim=data.ndim
+    if ndim==1: send_field1(idptr,idlen,data)
+    if ndim==2: send_field2(idptr,idlen,data)
+    if ndim==3: send_field3(idptr,idlen,data)
 
 # -------------------------------------------------------- #
@@ -75 +95 @@
     cats=['axis','domain','domaingroup','field','fieldgroup'] # XIOS categories
     cxios.import_funs([
-#                       ['finalize','context_finalize','context_close_definition', None],
                        [cat+'_handle_create' for cat in cats]+[c_void_pp,c_char_p,c_int],
                        ['get_current_'+'calendar_wrapper',c_void_pp],
@@ -87 +106 @@
     import_set_attr(['calendar_wrapper'], [Duration,'timestep'])
 
-    cxios.import_funs([['write_data_k80', c_char_p, c_int, c_void_p],
-                       ['write_data_k81', c_char_p, c_int, c_void_p, c_int],
-                       ['write_data_k82', c_char_p, c_int, c_void_p, c_int, c_int],
-                       ['write_data_k83', c_char_p, c_int, c_void_p, c_int, c_int, c_int]])
-
-def send_field(id, data):
-    if type(data) is np.ndarray:
-        shp=data.shape
-        print 'cxios.write_data', id, shp
-        ndim=len(shp)
-        if ndim==1:
-            lib.write_data_k81(id, c_int(len(id)), data, shp[0])
-        if ndim==2:
-            lib.write_data_k82(id, c_int(len(id)), data, shp[0], shp[1]) # reverse order of dimensions ??
-        if ndim==3:
-            lib.write_data_k83(id, c_int(len(id)), data, shp[0], shp[1], shp[2])
-    else:
-        print id, type(data)
-        raise(TypeError)
-
 import_cxios_functions()