Changeset 984

Timestamp:

10/24/19 18:24:07 (5 years ago)

Author:

dubos

Message:

devel/Python : bugfix dynamico/meshes.py

File:

• codes/icosagcm/devel/Python/dynamico/meshes.py (modified) (2 diffs)

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

@@ -662 +662 @@
         
         # compute_ne(...) and normalize(...) expect indices starting at 1
-        for ind in (trisk, primal_vertex, dual_vertex, primal_edge, dual_edge, left, right, down, up) : ind+=1
+        for ind in (trisk, primal_vertex, dual_vertex, primal_edge, dual_edge) : ind+=1
+        left, right, down, up = left+1, right+1, down+1, up+1 # these ones are subarrays, we need deep copies
 
         # read from mesh file : coordinates, lengths and areas in reference domain
@@ -757 +758 @@
         perm[old]=new
     return perm  # maps old indices to new indices
-
-def toint(x): return np.int32((x+1.)*65536)
-    
-def morton_index(x,y,z):
-    nn, xx, yy, zz = x.size, toint(x), toint(y), toint(z)
-    idx=np.zeros(nn, dtype=np.int64)
-    partition.dynamico_morton_encode(nn, xx,yy,zz, idx)
-    return idx
 
 #-------------------------------------- Mesh partitioning ------------------------------------------#