Changeset 2349 in lmdz_wrf

Timestamp:

Feb 18, 2019, 8:30:27 PM (6 years ago)

Author:

lfita

Message:

Changing minor details in `compute_slices_stats_areaweighted':

• Multiple slicing name separated by '-'

File:

• trunk/tools/nc_var_tools.py (modified) (6 diffs)

trunk/tools/nc_var_tools.py

@@ -28661 +28661 @@
              dn, vu)
             anewvar.setncattr('coordinates',' '.join(Spgrid[::-1]))
-            anewvar[:] = areas[0:Ngridsinmax,...]
 
             aanewvar = onewnc.createVariable(dn+'area','f',tuple(Srgrid),            \
@@ -28700 +28699 @@
                           gridsin[:,0:Ngridsin[j,i],j,i]
                         pnewvar[0:Ngridsin[j,i],j,i]= percens[0:Ngridsin[j,i],j,i]
+                        anewvar[0:Ngridsin[j,i],j,i]= areas[0:Ngridsin[j,i],j,i]
                         slicearea = 0.
                         aa = 0.
@@ -28706 +28706 @@
                             ix = gridsin[1,iv,j,i]
                             iy = gridsin[0,iv,j,i]
-                            apolygon[:,0] = xdimvarbnds2D[:,iy,ix]
-                            apolygon[:,1] = ydimvarbnds2D[:,iy,ix]
-                            ag = np.abs(fsci.module_scientific.shoelace_area_polygon(nvertex=4, poly=apolygon))
-                            slicearea = slicearea + ag*percens[iv,j,i]
+#                            apolygon[:,0] = xdimvarbnds2D[:,iy,ix]
+#                            apolygon[:,1] = ydimvarbnds2D[:,iy,ix]
+#                            ag = np.abs(fsci.module_scientific.shoelace_area_polygon(nvertex=4, poly=apolygon))
+                            # Filtering zero areas?
+                            if areas[iv,j,i] == 0.:
+                                anewvar[iv,j,i] = 0.
+                                pnewvar[iv,j,i] = 0.
+                                areas[iv,j,i] = 0.
+                                percens[iv,j,i] = 0.
+
+                            slicearea = slicearea + areas[iv,j,i]*percens[iv,j,i]
                             aa = aa + areas[iv,j,i]
                             pp = pp + percens[iv,j,i]
@@ -28738 +28745 @@
     Nnewslcs = len(newslcvarns)
 
-    dn = newslcvarns[0] + '_' + newslcvarns[1]
+    dn = newslcvarns[0] + '-' + newslcvarns[1]
     
     osliceNA = onewnc.variables[newslcvarns[0] + 'Ngrid']
@@ -28884 +28891 @@
         islc == 2
         prevdn = dn
-        dn = prevdn + '_' + newslcvarns[islc]
+        dn = prevdn + '-' + newslcvarns[islc]
 
         osliceNAB = onewnc.variables[prevdn + 'Ngrid']
@@ -29183 +29190 @@
     idd = 0
     for dnn in Ndims:
-        scvv = slicesinf[dnn.split('_')[1]]
+        scvv = slicesinf[dnn.split('-')[1]]
         sccvvv = scvv[3]
         slicesvals.append(sccvvv[chijk[idd]])