pyicon/view/pyicon_view_xr.py: Try to identify grid first by uuidOfHGrid,...

pyicon/view/pyicon_view_xr.py: Try to identify grid first by uuidOfHGrid, allow for specifying coordinates to enable plotting vertex variables, allow for plev (pressure levels) dimension.

pyicon/view/pyicon_view_xr.py

@@ -91,6 +91,7 @@ class hplot_xr(object):
     do_mask_big_triangles=False,
     title='auto',
     do_mask_zeros=True,
+    coordinates='clat clon',
     ):
     """
     Parameters
@@ -124,6 +125,8 @@ class hplot_xr(object):
     do_mask_zeros: bool
         If set to 'True' then all data values which are exactly zero are masked. This is helpful for 
         plotting ocean data where land values are always zero.
+    coordinates: str 
+        Specify whether variable is defined on cell centers (default: 'clat clon'), on edges ('elat elon') or on vertices ('vlat vlon')
       
     """
     # ------------------------------------------------------------ 
@@ -137,6 +140,7 @@ class hplot_xr(object):
     self.var = self.varnames[0]
     self.title = title
     self.do_mask_zeros = do_mask_zeros
+    self.coordinates = coordinates
     # --- location
     self.iz = 0
     self.step_snap = 0
@@ -150,7 +154,11 @@ class hplot_xr(object):
       self.use_tgrid = True
     else:
       self.use_tgrid = False
-    Dgrid = pyic.identify_grid(path_grid, self.ds)
+    try:
+      uuidOfHGrid = ds.attrs['uuidOfHGrid']
+    except:
+      uuidOfHGrid = 'none'
+    Dgrid = pyic.identify_grid(path_grid, self.ds, uuidOfHGrid=uuidOfHGrid)
     self.Dgrid = Dgrid
     if fpath_ckdtree=='auto':
       if 'res0.30_180W-180E_90S-90N' in Dgrid['Drectgrids'].keys():
@@ -169,8 +177,8 @@ class hplot_xr(object):
     else:
       self.fpath_tgrid = fpath_tgrid
     self.do_mask_big_triangles = do_mask_big_triangles
-    #if self.use_tgrid:
-    if True:
+    if self.use_tgrid:
+    #if True:
       #self.make_triangulation()
       ds_tgrid = xr.open_dataset(self.fpath_tgrid)
       self.ind_reg, self.Tri = pyic.triangulation(
@@ -345,6 +353,9 @@ class hplot_xr(object):
     elif 'height_2' in arr.dims:
       arr = arr.isel(height_2=self.iz)
       self.lev_name = 'height_2'
+    elif 'plev' in arr.dims:
+      arr = arr.isel(plev=self.iz)
+      self.lev_name = 'plev'
     else:
       self.lev_name = 'none'
     # --- mask land values (necessary for ocean data)
@@ -356,7 +367,7 @@ class hplot_xr(object):
     if self.grid_type=='igrid':
       self.diag_out('interp_to_rectgrid')
       try:
-        arr = pyic.interp_to_rectgrid_xr(arr, self.fpath_ckdtree, lon_reg=self.lon_reg, lat_reg=self.lat_reg)
+        arr = pyic.interp_to_rectgrid_xr(arr, self.fpath_ckdtree, lon_reg=self.lon_reg, lat_reg=self.lat_reg, coordinates=self.coordinates)
         self.diag_out('no error with interpolation')
       except:
         self.diag_out('error with interpolation')