Changeset 977 for codes/icosagcm/devel/Python/dynamico/meshes.py

Timestamp:

09/26/19 18:49:01 (5 years ago)

Author:

dubos

Message:

devel/Python : now only dynamico.dev modules require link to DYNAMICO/XIOS shared objects

File:

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

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

@@ -1 +1 @@
 from __future__ import absolute_import     
-
-from dynamico.dev import unstructured as unst
 
 import time
@@ -15 +13 @@
 from dynamico.util import list_stencil, BaseClass, inverse_list
 from dynamico import getargs
-# TODO from dynamico.parmetis import partition_mesh
-from dynamico.dev.unstructured import partition_mesh
+from dynamico.partition import partition_mesh
 
 log_master, log_world = getargs.getLogger(__name__)
@@ -419 +416 @@
                     vertex_lat[cell, ivertex] = vlat
             return vertex_lon, vertex_lat
-        mesh.primal_bounds_lon, mesh.primal_bounds_lat = bounds(mesh.primal_deg, mesh.primal_vertex, mesh.lon_v, mesh.lat_v)
+        mesh.primal_bounds_lon, mesh.primal_bounds_lat = bounds(mesh.primal_own_deg, mesh.primal_vertex, mesh.lon_v, mesh.lat_v)
         mesh.dual_bounds_lon, mesh.dual_bounds_lat = bounds(mesh.dual_deg, mesh.dual_vertex, mesh.lon_i, mesh.lat_i)
 
@@ -766 +763 @@
     nn, xx, yy, zz = x.size, toint(x), toint(y), toint(z)
     idx=np.zeros(nn, dtype=np.int64)
-    unst.ker.dynamico_morton_encode(nn, xx,yy,zz, idx)
+    partition.dynamico_morton_encode(nn, xx,yy,zz, idx)
     return idx