Changeset 804 for codes

Timestamp:

02/07/19 12:27:38 (5 years ago)

Author:

dubos

Message:

devel/Python : introduced Python/dynamico/dev/ subdirectory

Location:

codes/icosagcm/devel/Python

Files:

• dynamico/dev (added)
• dynamico/dev/__init__.py (added)
• dynamico/dev/meshes.py (added)
• dynamico/dev/numba.py (added)
• dynamico/meshes.py (modified) (3 diffs)
• dynamico/util.py (modified) (1 diff)
• test/fig_Godunov (added)
• test/py/Godunov.py (added)
• test/python.sh (modified) (1 diff)

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

@@ -442 +442 @@
         # get positions, lengths, surfaces and weights
         le,de,Ai,Av,wee,Riv2 = getvars('le','de','Ai','Av','wee','Riv2')
+        le_de = le/de
         lat_i,lon_i,lat_v,lon_v = getvars('lat_i','lon_i','lat_v','lon_v')
         lat_e,lon_e,angle_e = getvars('lat_e','lon_e','angle_e')
@@ -465 +466 @@
                          'primal_num', 'dual_num', 'edge_num', 'primal_deg', 'primal_vertex', 'primal_ne',
                          'lat_i', 'lon_i', 'lat_v', 'lon_v', 'lat_e', 'lon_e', 'angle_e',
-                         'Ai', 'Av', 'fv', 'le', 'de',
-                         'trisk_deg', 'trisk', 'wee', 'Riv2', 'dual_ne')
+                         'Ai', 'Av', 'fv', 'le', 'de', 'le_de',
+                         'trisk_deg', 'trisk', 'wee', 'Riv2', 'dual_ne',
+                         'left', 'right',
+                         'primal_edge')
         gridfile.normalize(self)
         max_primal_deg, max_dual_deg, max_trisk_deg = [ x.shape[1] for x in primal_edge, dual_edge, trisk]
@@ -474 +477 @@
                   dual_deg,dual_edge,dual_ne,dual_vertex,
                   left,right,down,up,trisk_deg,trisk,
-                  self.Ai,self.Av,self.fv,le/de,Riv2,wee)
+                  self.Ai,self.Av,self.fv,le_de,Riv2,wee)
         self.primal  = tri.Triangulation(lon_i*radian, lat_i*radian)
         self.dual    = tri.Triangulation(lon_v*radian, lat_v*radian)

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

@@ -9 +9 @@
                 
 
-class Base_class:
+class Base_class(object):
     def set_members(self, loc, *names):
         for name in names :

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

@@ -29 +29 @@
 cd $DYNAMICO_ROOT
 
-cp -i -u Python/dynamico/* lib/dynamico/
+cp -i -u -r Python/dynamico/* lib/dynamico/
 
 . arch.env