Changeset 825 for codes/icosagcm/devel/Python/test

Timestamp:

04/30/19 18:14:37 (5 years ago)

Author:

dubos

Message:

devel/Python : moved Fortran bindings and *.pyx to dynamico/dev module + necessary changes to test/py/*.py

Location:

codes/icosagcm/devel/Python/test

Files:

• py/Baroclinic_3D_ullrich.py (modified) (1 diff)
• py/RSW2_MPAS_W02.py (modified) (1 diff)
• py/dump_partition.py (modified) (4 diffs)
• py/partition.py (modified) (4 diffs)
• py/write_Cartesian_mesh.py (modified) (1 diff)
• python.sh (modified) (2 diffs)

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

@@ -30 +30 @@
 INFO, DEBUG, DEBUG_ALL, ERROR = log_master.info, log_master.debug, log_world.debug, log_world.error
 
-from dynamico import unstructured as unst
+from dynamico.dev import unstructured as unst
+from dynamico.dev import meshes
+from dynamico.dev import xios
+from dynamico.dev import precision as prec
 from dynamico import dyn
 from dynamico import time_step
 from dynamico import DCMIP
-from dynamico import meshes
 from dynamico import maps
-from dynamico import xios
-from dynamico import precision as prec
 from dynamico.kernels import grad, curl, div, KE
 from dynamico.LAM import Davies

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

@@ -25 +25 @@
 
 INFO('Loading DYNAMICO modules ...')
-from dynamico import unstructured as unst
+from dynamico.dev import unstructured as unst
 from dynamico.dev.meshes import MPAS_Format, Unstructured_PMesh as PMesh, Local_Mesh as Mesh
 from dynamico.dev import meshes

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

@@ -16 +16 @@
 
 args = getargs.parse()
+for arg in vars(args): print arg, getattr(args, arg)
 
 log_master, log_world = getargs.getLogger()
@@ -29 +30 @@
 
 INFO('Loading DYNAMICO modules ...')
-from dynamico import unstructured as unst
+from dynamico.dev import unstructured as unst
 from dynamico.dev.meshes import MPAS_Format, Unstructured_PMesh as PMesh, Local_Mesh as Mesh
 from dynamico.dev import meshes
@@ -140 +141 @@
                     ("primal_own_deg","f8",self._mesh.primal_own_deg),
                     ("primal_own_glo","f8",self._mesh.primal_own_glo),
-                    ("primal_own_loc","f8",self._mesh.primal_own_loc),
-                    ("dual_own_loc","f8",self._mesh.dual_own_loc) ])
+                    ("primal_own_loc","f8",self._mesh.primal_own_loc) ])
     
         self.create_vars(f,("primal_cell","primal_edge_or_vertex"),
@@ -156 +156 @@
                     ("lat_v","f8",self._mesh.lat_v),
                     ("ref_lat_v","f8",self._mesh.ref_lat_v),
-                    ("vertices_V1","f8",self._mesh.vertices_V1) ])
+                    ("vertices_V1","f8",self._mesh.vertices_V1),
+                    ("dual_own_loc","f8",self._mesh.dual_own_loc)  ])
     
         self.create_vars(f,("dual_cell","dual_edge_or_vertex"),

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

@@ -1 +1 @@
 print 'Starting'
+
+from dynamico import meshes
+from dynamico import parallel
+from dynamico.dev import unstructured as unst
+from dynamico import maps
+from dynamico.parmetis import partition_graph
 
 from mpi4py import MPI
@@ -7 +13 @@
 
 #from dynamico import partition
-from dynamico import parallel, meshes
-from dynamico import unstructured as unst
 
 import math as math
@@ -46 +50 @@
     part = 0*xadj_loc[0:-1];
 
-    unst.ker.dynamico_partition_graph(mpi_rank, mpi_size, vtxdist, xadj_loc, adjncy_loc, 4, part)
+#    unst.ker.dynamico_partition_graph(mpi_rank, mpi_size, vtxdist, xadj_loc, adjncy_loc, 4, part)
+    partition_graph(comm, vtxdist, xadj_loc, adjncy_loc, part, nparts=4)
 
-#    for i in range(len(part)):
-#        print 'vertex', i+idx_start, 'proc', part[i]
+    for i in range(len(part)):
+        print 'vertex', i+idx_start, 'proc', part[i]
 
 #-----------------------------------------------------------------------------#
@@ -84 +89 @@
 def coriolis(lon,lat): return 0.*lat
 llm, nqdyn, radius = 1,1,1.
-lmesh = meshes.Local_Mesh(pmesh, llm, nqdyn, radius, coriolis)
+planet = maps.SphereMap(radius, 0.)
+lmesh = meshes.Local_Mesh(pmesh, llm, nqdyn, planet)
 
 (primal_deg, primal_vertex, dim_vertex, dim_cell, cell_owner, 

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

@@ -14 +14 @@
 
 args = getargs.parse()
+for arg in vars(args): print arg, getattr(args, arg)
 
-from dynamico.meshes import zeros
 from dynamico import meshes
 import numpy as np

codes/icosagcm/devel/Python/test/python.sh

@@ -21 +21 @@
     shift
     rm -f xios_client*.*
-    mpirun -np $NB_MPI python -u $* 2>&1 | tee dynamico.log
+    mpirun --mca mpi_warn_on_fork 0 -np $NB_MPI python -u $* 2>&1 | tee dynamico.log
 }
 
@@ -29 +29 @@
 cd $DYNAMICO_ROOT
 
-cp -i -u -r Python/dynamico/* lib/dynamico/
+cp -i -u Python/dynamico/*.py lib/dynamico/
+cp -i -u Python/dynamico/dev/*.py lib/dynamico/dev/
 
 . arch.env