Changeset 869 for codes/icosagcm/devel/Python/test/py

Timestamp:

05/17/19 13:20:04 (5 years ago)

Author:

dubos

Message:

devel/Python : write cell bounds into mesh file / partition file

Location:

codes/icosagcm/devel/Python/test/py

Files:

• dump_partition.py (modified) (4 diffs)
• write_Cartesian_mesh.py (modified) (2 diffs)

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

@@ -107 +107 @@
     def create_vars(self,f,dimname, info):
         for vname, vtype, vdata in info:
+            vdata = np.asarray(vdata)
+            print('creating variable %s with shape %s.' %(vname, vdata.shape))
             var = f.createVariable(vname,vtype,dimname)
             var[:] = vdata
     
     def meshwrite(self,name):
+        mesh = self._mesh
         """ Writing Mesh information to disk for Fortran segment"""
     
@@ -124 +127 @@
     
         #----------------DEFINING DIMENSIONS--------------------
+        max_primal_deg = mesh.primal_deg.max()
+        max_dual_deg = mesh.dual_deg.max()
+        max_trisk_deg = mesh.trisk_deg.max()
+        def crop(dim, *data) : return [ x[:,0:dim] for x in data ]
+        mesh.primal_edge, mesh.primal_ne, mesh.primal_vertex = crop(max_primal_deg, mesh.primal_edge, mesh.primal_ne, mesh.primal_vertex)
+        mesh.dual_edge, mesh.dual_ne = crop(max_dual_deg, mesh.dual_edge, mesh.dual_ne)
+        mesh.trisk, mesh.wee = crop(max_trisk_deg, mesh.trisk, mesh.wee)
+
         for dimname, dimsize in [("primal_cell", self._mesh.primal_deg.size),
                                     ("dual_cell", self._mesh.dual_deg.size),
@@ -144 +155 @@
     
         self.create_vars(f,("primal_cell","primal_edge_or_vertex"),
-                    [("primal_vertex","i4",self._mesh.primal_vertex),
-                    ("primal_edge","i4",self._mesh.primal_edge),
-                    ("primal_ne","i4",self._mesh.primal_ne) ])
-    
+                         [("primal_vertex","i4",self._mesh.primal_vertex),
+                          ("primal_bounds_lon","f8",self._mesh.primal_bounds_lon),
+                          ("primal_bounds_lat","f8",self._mesh.primal_bounds_lat),
+                          ("primal_edge","i4",self._mesh.primal_edge),
+                          ("primal_ne","i4",self._mesh.primal_ne) ])
+        
         self.create_vars(f,"dual_cell",
                     [("dual_deg","i4",self._mesh.dual_deg),
@@ -161 +174 @@
         self.create_vars(f,("dual_cell","dual_edge_or_vertex"),
                     [("dual_edge","i4",self._mesh.dual_edge),
-                    ("dual_vertex","i4",self._mesh.dual_vertex),
-                    ("dual_ne","i4",self._mesh.dual_ne),
-                    ("Riv2","f8",self._mesh.Riv2)])
+                     ("dual_vertex","i4",self._mesh.dual_vertex),
+                     ("dual_bounds_lon","f8",self._mesh.dual_bounds_lon),
+                     ("dual_bounds_lat","f8",self._mesh.dual_bounds_lat),
+                     ("dual_ne","i4",self._mesh.dual_ne),
+                     ("Riv2","f8",self._mesh.Riv2)])
     
         self.create_vars(f,"edge",

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

@@ -1 +1 @@
 from dynamico import getargs
-getargs.add("--nx", type=int,
-                    default=64, choices=None,
-                    help="number of x points")
-getargs.add("--ny", type=int,
-                    default=64, choices=None,
-                    help="number of y points")
-getargs.add("--Lx", type=float,
-                    default=8., choices=None,
-                    help="Lx")
-getargs.add("--Ly", type=float,
-                    default=8., choices=None,
-                    help="Ly")
+getargs.add("--nx", type=int, default=64, 
+                    help="number of points along the x axis")
+getargs.add("--ny", type=int, default=0,
+                    help="number of points along the y axis, defaults to nx")
+getargs.add("--Lx", type=float, default=0., 
+                    help="domain size along x, defaults to nx")
+getargs.add("--Ly", type=float, default=0., 
+                    help="domain size along y, defaults to ny")
 
 args = getargs.parse()
@@ -22 +18 @@
 
 nx, ny, Lx, Ly, llm, nqdyn = args.nx, args.ny,args.Lx, args.Ly, 1, 1
+if ny==0 : ny=nx
+if Lx==0. : Lx=nx
+if Ly==0. : Ly=ny
 
 dx,dy=Lx/nx,Ly/ny