Changeset 931

Timestamp:

07/02/19 14:06:51 (5 years ago)

Author:

dubos

Message:

devel/Python : fixed info for Numba

Location:

codes/icosagcm/devel/Python/dynamico/dev

Files:

• meshes.py (modified) (1 diff)
• numba.py (modified) (2 diffs)

codes/icosagcm/devel/Python/dynamico/dev/meshes.py

@@ -6 +6 @@
 from dynamico.dev import unstructured as unst
 from dynamico.dev import numba, parallel
-from dynamico.dev.numba import int32, float64
+from dynamico.dev.numba import int32, int64, float64
 
 class MeshData(numba.NumbaData):
-    signature=(int32,      'primal_num dual_num edge_num',
+    signature=(int64,      'primal_num dual_num edge_num',
                int32[:],   'primal_deg left right',
                int32[:,:], 'primal_edge primal_ne',
-               float64[:], 'le_de le de lon_e lat_e Ai')
+               float64[:], 'le_de le de lon_e lat_e lon_v lat_v Ai Av')
     def to_dynamico(self):
         max_primal_deg, max_dual_deg, max_trisk_deg = [x.shape[1] for x in self.primal_edge, self.dual_edge, self.trisk]

codes/icosagcm/devel/Python/dynamico/dev/numba.py

@@ -3 +3 @@
 
 import numpy as np
-from numba import int32, float64
 import numba
+from numba import int32, int64, float64
 
 class NumbaData(object):
@@ -20 +20 @@
             def __init__(self): pass
         data=JitClass()
-        for name,thetype in spec: setattr(data, name, getattr(self,name))
+        for name,thetype in spec: 
+            print( 'Copying to %s.%s : '%(self.__class__.__name__, name), type(getattr(self,name)))
+            setattr(data, name, getattr(self,name))
         return data