Changeset 986

Timestamp:

10/24/19 18:27:01 (5 years ago)

Author:

dubos

Message:

devel/Python : update reorder.py and fix C syntax of partition.h

Location:

codes/icosagcm/devel/Python

Files:

• dynamico/partition.h (modified) (3 diffs)
• dynamico/partition.pyx (modified) (4 diffs)
• test/py/reorder.py (modified) (2 diffs)

codes/icosagcm/devel/Python/dynamico/partition.h

@@ -11 +11 @@
   idx_t options[]={0}, wgtflag=0, numflag=0, ncon=1;
   real_t tpwgts[2*nparts], ubvec[]={1.05};
-
+  int i;
   /* int ParMETIS V3 PartKway (
      idx t *vtxdist, idx t *xadj, idx t *adjncy, idx t *vwgt, idx t *adjwgt, 
@@ -22 +22 @@
   printf("partition_graph : %d %d %d\n", mpi_rank, mpi_size, nparts); 
   printf("vtxdist : \n"); 
-  for(int i=0; i<mpi_size+1; i++) printf("%d %d %d\n", mpi_rank, i, vtxdist[i]); */
+  for(i=0; i<mpi_size+1; i++) printf("%d %d %d\n", mpi_rank, i, vtxdist[i]); */
       
-  for(int i=0; i<2*nparts; i++) tpwgts[i] = 1./nparts;
+  for(i=0; i<2*nparts; i++) tpwgts[i] = 1./nparts;
   ParMETIS_V3_PartKway(vtxdist, xadj_loc, adjncy_loc, NULL, NULL, 
                        &wgtflag, &numflag, &ncon, &nparts, 
@@ -51 +51 @@
 static inline void dynamico_morton_encode(int n, const int *x, const int *y, const int *z, uint64_t *m)
 {
-  for(int i=0; i<n; i++)
+  int i;
+  for(i=0; i<n; i++)
     m[i]=mortonEncode_magicbits(x[i],y[i],z[i]);
 }

codes/icosagcm/devel/Python/dynamico/partition.pyx

@@ -1 @@
-
 from ctypes import c_void_p, c_int, c_double, c_float, c_bool
 from numpy cimport ndarray
@@ -6 +5 @@
 
 ctypedef int idx_t
+ctypedef unsigned long uint64_t
 
 cdef extern from "partition.h":
@@ -11 +11 @@
                      idx_t vtxdist[], idx_t xadj_loc[], idx_t adjncy_loc[],
                      idx_t nparts, idx_t part[])
+    void dynamico_morton_encode(int n, const int *x, const int *y, const int *z, long *m)
 
 
@@ -51 +52 @@
     dynamico_partition_graph(mpi_rank, mpi_size, &vtxdist[0], &xadj_loc[0], &adjncy_loc[0], nparts, &owner[0])
     return owner
+
+#-------------------------------- Space-filling (Morton) ordering ------------------------#
+
+def toint(x): return np.int32((x+1.)*65536)
+
+def morton_index(x,y,z):
+    cdef int nn
+    cdef int[::1] xx,yy,zz
+    cdef long[::1] idx_
+    nn, xx, yy, zz = x.size, toint(x), toint(y), toint(z)
+    idx=np.zeros(nn, dtype=np.int64)
+    idx_=idx
+    dynamico_morton_encode(nn, &xx[0],&yy[0],&zz[0], &idx_[0])
+    return idx

codes/icosagcm/devel/Python/test/py/reorder.py

@@ +1 @@
+#------------ Read command-line arguments ----------#
+from dynamico import getargs
+getargs.add("--grid", type=int, default=2562,
+                    help="number of primal cells in MPAS mesh")
+args = getargs.parse()
+grid = args.grid
+
+#------------- Start --------------#
 print 'Loading DYNAMICO modules ...'
-from dynamico.meshes import morton_index, key_to_perm, reorder_indices, reorder_values, MPAS_Format, Unstructured_Mesh
+from dynamico.meshes import key_to_perm, reorder_indices, reorder_values, MPAS_Format, Unstructured_Mesh
+from dynamico.partition import morton_index
 print '...Done'
 import numpy as np
@@ -7 +16 @@
 import time
 
-#------------ Read command-line arguments ----------#
-
-import argparse
-parser = argparse.ArgumentParser()
-parser.add_argument("-n", type=int, default=2562,
-                    help="number of primal cells in MPAS mesh")
-args = parser.parse_args()
-grid = args.n
 
 #-------------- read MPAS mesh ----------------#