Changeset 2212 in lmdz_wrf for trunk/tools/diagnostics.py

Timestamp:

Nov 2, 2018, 7:01:51 PM (6 years ago)

Author:

lfita

Message:

Addding the `range_faces' with all its glory...

File:

• trunk/tools/diagnostics.py (modified) (5 diffs)

trunk/tools/diagnostics.py

@@ -101 +101 @@
 
 # Variables not to check
-NONcheckingvars = ['accum', 'cllmh', 'deaccum', 'face:WE', 'face:SN', 'TSrhs',       \
+NONcheckingvars = ['accum', 'cllmh', 'deaccum', 'face', 'TSrhs',                     \
   'TStd', 'TSwds', 'TSwss',                                                          \
   'WRFbils',                                                                         \
@@ -415 +415 @@
             if depvars[0] == 'accum': diagn='accum'
             for depv in depvars:
+                # Checking without extra arguments of a depending variable (':', separated)
+                if depv.find(':') != -1: depv=depv.split(':')[0]
                 if not ncobj.variables.has_key(depv) and not                         \
                   gen.searchInlist(NONcheckingvars, depv) and                        \
@@ -679 +681 @@
         ncvar.insert_variable(ncobj, 'hurs', diagout, diagoutd, diagoutvd, newnc)
 
-# range_faces: LON, LAT, HGT, 'face:['WE'/'SN']'
+# range_faces: LON, LAT, HGT, 'face:['WE'/'SN']:[Nptfilt]'
     elif diagn == 'range_faces':
             
@@ -685 +687 @@
         var1 = ncobj.variables[depvars[1]][:]
         var2 = ncobj.variables[depvars[2]][:]
-        var3 = depvars[3].split(':')[1]
-
+        face = depvars[3].split(':')[1]
+        Nptfilt = depvars[3].split(':')[2]
+
+        dnamesvar = list(ncobj.variables[depvars[0]].dimensions)
+        dvnamesvar = ncvar.var_dim_dimv(dnamesvar,dnames,dvnames)
         lon, lat = gen.lonlat2D(var0, var1)
         if len(var2.shape) == 3:
@@ -692 +697 @@
             print '  ' + diagn + ": shapping to 2D variable '" + depvars[2] + "' !!"
             hgt = var2[0,:,:]
+            dnamesvar.pop(0)
+            dvnamesvar.pop(0)            
         else:
             hgt = var2[:]
 
-        dnamesvar = list(ncobj.variables[depvars[0]].dimensions)
-        dvnamesvar = ncvar.var_dim_dimv(dnamesvar,dnames,dvnames)
-
-        diagout, diagoutd, diagoutvd = diag.Forcompute_range_faces(lon, lat, hgt,    \
-          var3, dnamesvar, dvnamesvar)
-
-        # Removing the nonChecking variable-dimensions from the initial list
-        varsadd = []
-        diagoutvd = list(dvnames)
-        for nonvd in NONchkvardims:
-            if gen.searchInlist(dvnames,nonvd): diagoutvd.remove(nonvd)
-            varsadd.append(nonvd)
-        ncvar.insert_variable(ncobj, 'range_faces', diagout, diagoutd, diagoutvd,    \
+        dhgt, peaks, valleys, origfaces, diagout, diagoutd, diagoutvd =              \
+          diag.Forcompute_range_faces(lon, lat, hgt, face, Nptfilt, dnamesvar,       \
+          dvnamesvar)
+
+        # Removing the nonChecking variable-dimensions from the initial list
+        varsadd = []
+        diagoutvd = list(dvnames)
+        for nonvd in NONchkvardims:
+            if gen.searchInlist(dvnames,nonvd): diagoutvd.remove(nonvd)
+            varsadd.append(nonvd)
+
+        ncvar.insert_variable(ncobj, 'hgtderivdeg', dhgt, diagoutd, diagoutvd,       \
           newnc)
+        ovar = newnc.variables['orogderivdeg']
+        if face == 'WE': axis = 'lon'
+        elif face == 'SN': axis = 'lat'
+        ncvar.set_attribute(ovar, 'deriv', axis)
+
+        ncvar.insert_variable(ncobj, 'peak', peaks, diagoutd, diagoutvd, newnc)
+        ncvar.insert_variable(ncobj, 'valley', valleys, diagoutd, diagoutvd, newnc)
+
+        ncvar.insert_variable(ncobj, 'rangefaces', diagout, diagoutd, diagoutvd,    \
+          newnc)
+        newnc.renameVariable('rangefaces', 'rangefacesfilt')
+        ovar = newnc.variables['rangefacesfilt']
+        ncvar.set_attribute(ovar, 'face', face)
+        ncvar.set_attributek(ovar, 'grid_points_filter', Nptfilt, 'I')
+
+        ncvar.insert_variable(ncobj, 'rangefaces', origfaces, diagoutd, diagoutvd,  \
+          newnc)
+        ovar = newnc.variables['rangefaces']
+        ncvar.set_attribute(ovar, 'face', face)
 
 # mrso: total soil moisture SMOIS, DZS