Changeset 643

Timestamp:

12/19/17 16:27:19 (6 years ago)

Author:

dubos

Message:

devel/unstructured : workaround cython bug

File:

• codes/icosagcm/devel/Python/src/unstructured.pyx (modified) (3 diffs)

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

@@ -2 +2 @@
 import math
 import numpy as np
+cimport numpy as np
 import dynamico.wrap as wrap
 from ctypes import c_void_p, c_int, c_double, c_bool
 
-from libc.time cimport time as ctime, time_t
-cimport numpy as np
+#from libc.time cimport time as ctime, time_t
+from numpy cimport ndarray
 
 #------------- direct Cython interface to DYNAMICO routines -------------#
@@ -93 +94 @@
     return data
 
-cdef check_ptr(name, dbl_ptr p, np.ndarray data):
+cdef check_ptr(name, dbl_ptr p, ndarray data):
     if p != ptr(data) : print name, 'p <> ptr(data) !!'
         
@@ -105 +106 @@
     cdef dbl_ptr p_dPhi_fast, p_dPhi_slow, p_dW_fast, p_dW_slow                # tendencies
     # allocated arrays, must remain referenced or segfault
-    cdef readonly np.ndarray mass, theta_rhodz, u, geopot, W
-    cdef readonly np.ndarray mass_col, dmass_col, ps, theta, pk, hflux, qv
-    cdef readonly np.ndarray drhodz, dtheta_rhodz, du_fast, du_slow
-    cdef readonly np.ndarray dPhi_fast, dPhi_slow, dW_fast, dW_slow
+    cdef readonly ndarray mass, theta_rhodz, u, geopot, W
+    cdef readonly ndarray mass_col, dmass_col, ps, theta, pk, hflux, qv
+    cdef readonly ndarray drhodz, dtheta_rhodz, du_fast, du_slow
+    cdef readonly ndarray dPhi_fast, dPhi_slow, dW_fast, dW_slow
 
     def __init__(self,mesh,time_scheme, nstep):