Changeset 672

Timestamp:

01/30/18 17:58:02 (6 years ago)

Author:

dubos

Message:

devel/unstructured : Fix partitioning

Location:

codes/icosagcm/devel/Python

Files:

• dynamico/meshes.py (modified) (1 diff)
• test/py/RSW_MPAS_W02.py (modified) (1 diff)
• test/py/partition.py (modified) (10 diffs)

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

@@ -5 +5 @@
 import matplotlib.tri as tri
 import matplotlib.pyplot as plt
-from unstructured import init_mesh
+from unstructured import init_mesh, list_stencil
 
 radian=180/math.pi

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

@@ +1 @@
+print 'Loading DYNAMICO modules ...'
+from dynamico import unstructured as unst
+from dynamico.meshes import MPAS_Mesh as Mesh
+from dynamico import time_step
+print '...Done'
+
 print 'Loading modules ...'
 import math as math
 import matplotlib.pyplot as plt
 import numpy as np
-print '...Done'
-
-print 'Loading DYNAMICO modules ...'
-from dynamico import unstructured as unst
-from dynamico.meshes import MPAS_Mesh as Mesh
-from dynamico import time_step
 print '...Done'
 

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

@@ -6 +6 @@
 print '%d/%d starting'%(mpi_rank,mpi_size)
 
-import sys
+#from dynamico import partition
+from dynamico import parallel, meshes
+from dynamico import unstructured as unst
+
 import math as math
 import numpy as np
@@ -15 +18 @@
 from matplotlib.collections import PatchCollection
 
-#from dynamico import partition
-from dynamico import parallel
-from dynamico import unstructured as unst
-from dynamico.unstructured import list_stencil, reindex
-
 print 'Done loading modules'
-
-sys.stdout.flush()
 
 #----------------- partition hand-written 15-cell mesh ------------------#
@@ -90 +86 @@
     mydegree, mybounds = [get_mycells(x) for x in nEdgesOnCell, verticesOnCell]
     print '%d : len(mydegree)=%d'%(mpi_rank, len(mydegree))
-    vertex_list = sorted(set(list_stencil(mydegree,mybounds))) 
+    vertex_list = sorted(set(unst.list_stencil(mydegree,mybounds))) 
     print '%d : len(vertex_list))=%d'%(mpi_rank, len(vertex_list))
     get_myvertices = parallel.Get_Indices(dim_vertex, vertex_list)
     mylon, mylat = [get_myvertices(x)*180./math.pi for x in lonVertex, latVertex]
     vertex_dict = parallel.inverse_list(vertex_list)
-    reindex(vertex_dict, mydegree, mybounds)
+    meshes.reindex(vertex_dict, mydegree, mybounds)
     return vertex_list, mydegree, mybounds, mylon, mylat
 
@@ -104 +100 @@
 #grid = 'x4.163842'
 print 'Reading MPAS file %s ...'%grid
-sys.stdout.flush()
 
 nc = cdf.Dataset('grids/%s.grid.nc'%grid, "r")
@@ -127 +122 @@
           cellsOnEdge, edgesOnEdge, verticesOnEdge) : x.data = x.data-1
 edge2cell, cell2edge, edge2vertex, vertex2edge, cell2cell, edge2edge = [
-    unst.Stencil_glob(a,b) for a,b in 
+    meshes.Stencil_glob(a,b) for a,b in 
     (edge_degree, cellsOnEdge), (nEdgesOnCell, edgesOnCell),
     (edge_degree, verticesOnEdge), (vertex_degree, edgesOnVertex),
@@ -135 +130 @@
 
 print 'Partitioning ...'
-sys.stdout.flush()
 
 edge_owner = unst.partition_mesh(nEdgesOnEdge, edgesOnEdge, mpi_size)
 edge_owner = parallel.LocPArray1D(dim_edge, edge_owner)
-cell_owner = unst.partition_from_stencil(edge_owner, nEdgesOnCell, edgesOnCell)
+cell_owner = meshes.partition_from_stencil(edge_owner, nEdgesOnCell, edgesOnCell)
 cell_owner = parallel.LocPArray1D(dim_cell, cell_owner)
 
@@ -145 +139 @@
 
 print 'Constructing halos ...'
-sys.stdout.flush()
 
 def chain(start, links):
@@ -152 +145 @@
         yield start
 
-edges_E0 = unst.find_my_cells(edge_owner)
+edges_E0 = meshes.find_my_cells(edge_owner)
 cells_C0, edges_E1, vertices_V1, edges_E2, cells_C1 = chain(
     edges_E0, ( edge2cell, cell2edge, edge2vertex, vertex2edge, edge2cell) )
 
-edges_E0, edges_E1, edges_E2 = unst.progressive_list(edges_E0, edges_E1, edges_E2)
-cells_C0, cells_C1 = unst.progressive_list(cells_C0, cells_C1)
+edges_E0, edges_E1, edges_E2 = meshes.progressive_list(edges_E0, edges_E1, edges_E2)
+cells_C0, cells_C1 = meshes.progressive_list(cells_C0, cells_C1)
 
 print 'E2,E1,E0 ; C1,C0 : ', map(len, (edges_E2, edges_E1, edges_E0, cells_C1, cells_C0))
-sys.stdout.flush()
 
 #com_edges = parallel.Halo_Xchange(24, dim_edge, edges_E2, dim_edge.get(edges_E2, edge_owner))
@@ -172 +164 @@
 comm.Reduce(local_num, total_num, op=MPI.SUM, root=0)
 if(mpi_rank==0): print 'total num :', total_num[0], dim_cell.n
-sys.stdout.flush()
 
 #---------------------------- plot -----------------------------#
@@ -178 +169 @@
 if True:
     print 'Plotting ...'
-    sys.stdout.flush()
 
     halo_vertex_list, mydegree, mybounds, mylon, mylat = local_mesh(com_cells.get_all)