Changeset 1887 in lmdz_wrf for trunk

Timestamp:

Apr 4, 2018, 2:22:43 AM (7 years ago)

Author:

lfita

Message:

Fixing 'CFmorzization' (but not finished!)

Location:

trunk/tools

Files:

• CFvariables.dat (modified) (1 diff)
• generic_tools.py (modified) (2 diffs)
• nc_var_tools.py (modified) (9 diffs)
• variables_values.dat (modified) (1 diff)

trunk/tools/CFvariables.dat

@@ -14 +14 @@
 uas new_z_dim height height 10.
 vas new_z_dim height height 10.
-hus new_z_dim pressure pressure 'FROMfile,press'
-ta new_z_dim pressure pressure 'FROMfile,press'
-ua new_z_dim pressure pressure 'FROMfile,press'
-va new_z_dim pressure pressure 'FROMfile,press'
-wa new_z_dim pressure pressure 'FROMfile,press'
-zg new_z_dim pressure pressure 'FROMfile,press'
+hus new_z_dim pressure pressure FROMfile,pres
+ta new_p_dim pressure pressure FROMfile,pres
+ua new_p_dim pressure pressure FROMfile,pres
+va new_p_dim pressure pressure FROMfile,pres
+wa new_p_dim pressure pressure FROMfile,pres
+zg new_p_dim pressure pressure FROMfile,pres
 

trunk/tools/generic_tools.py

@@ -12734 +12734 @@
       'axis': 'Y', '_CoordinateAxisType': 'Lat',                                     \
       'maxrank':  2, 'length': 0}
-    CFpress= {'dimn': 'pressure', 'vdimn': 'pressure',                               \
+    CFpress= {'dimn': 'pres', 'vdimn': 'pres',                                       \
       'stdn': 'pressure', 'longname': 'Pressure', 'units': 'Pa',                     \
       'axis': 'Z', '_CoordinateAxisType': 'Pres', 'positive': 'down',                \
@@ -12748 +12748 @@
 
     # names to search for
-    lonn = ['lon', 'X', 'Longitude', 'longitude', 'x']
-    latn = ['lat', 'Y', 'Latitude', 'latitude', 'y']
-    pressn = ['press', 'P', 'Press', 'Pressure', 'pressure', 'p']
+    lonn = ['lon', 'X', 'Longitude', 'longitude', 'x', 'west_east']
+    latn = ['lat', 'Y', 'Latitude', 'latitude', 'y', 'south_north']
+    pressn = ['pres', 'press', 'P', 'Press', 'Pressure', 'pressure', 'p']
     heightn = ['height', 'Z', 'Height', 'z']
     timen = ['time', 'T', 'Time', 'TIME', 't']

trunk/tools/nc_var_tools.py

@@ -22966 +22966 @@
       listoc= list of NetCDF file objects
     """
-    fname = 'getvar_listonc'
+    fname = 'getdim_listonc'
 
     allfs = {}
@@ -23273 +23273 @@
     fname = 'CFvars'
 
-    availactions = ['new_p_dim','new_z_dim']
+    availactions = ['new_p_dim', 'new_z_dim']
 
     folder = os.path.dirname(os.path.realpath(__file__))
@@ -23307 +23307 @@
                 newvvar = np.float(CFactions[3])
             else:
-                vn = CFactinos[3].split[0]
+                vn = CFactions[3].split(',')[1]
                 if not innc.variables.has_key(vn):
                     print errormsg
@@ -23316 +23316 @@
                 ovar = innc.variables[vn]
                 # Assuming all the same value!
-                var1D = ovar.flatten()
+                var1D = ovar[:].flatten()
                 newvvar = var1D[0]
             outnc.createDimension(newdim, 1)
@@ -23354 +23354 @@
                 newvvar = np.float(CFactions[3])
             else:
-                vn = CFactinos[3].split[0]
+                vn = CFactions[3].split(',')[1]
                 if not innc.variables.has_key(vn):
                     print errormsg
@@ -23633 +23633 @@
 
         # CF values of axis
-        CFdimvalues = gen.CFcorValues(axn)
+        CFdimvalues = gen.CFcorValues(dimn)
         #print '  ' + axn + " ..."
         #print '    dimension in file:', dimn, ' variable in file:', vardimn
@@ -23670 +23670 @@
                     if dn == dimn and CFdimvalues['length'] != -1:
                         CFdimvalues['length'] = len(oaxisd)
-            axsiv = oaxisv[tuple(varslice)]
+            axisv = oaxisv[tuple(varslice)]
         else:
             print errormsg
@@ -23737 +23737 @@
 
         CFdimvals[axn] = CFdimvalues
-        filedimvals[axn] = axsiv[:]
+        filedimvals[axn] = axisv[:]
         CFaxisvardimvals[axn] = CFvardimvalues
 
@@ -23911 +23911 @@
                     varv = np.where(varv == fill_value, gen.fillValueF, varv)
             else:
+                print 'Lluis: ', newVdims
                 newvar=onewnc.createVariable(cfvarn, 'f4', tuple(newVdims),          \
                   fill_value=gen.fillValueF)

trunk/tools/variables_values.dat

@@ -304 +304 @@
 LPR_CON_L, prcl, convective_liquid_precipitation_flux, 0., 0.003, convective|liquid|precipitation|flux, kgm-2s-1, Blues, $prcl$, prcl
 plev, plev, air_pressure, 0., 103000., air|pressure, Pa, Blues, $plev$, plev
-presnivs, pres, air_pressure, 0., 103000., air|pressure, Pa, Blues, $press$, press
-pres, plev, air_pressure, 0., 103000., air|pressure, Pa, Blues, $press$, press
-lpres, plev, air_pressure, 0., 103000., air|pressure, Pa, Blues, $press$, press
-LPRES, plev, air_pressure, 0., 103000., air|pressure, Pa, Blues, $press$, press
-PRES, plev, air_pressure, 0., 103000., air|pressure, Pa, Blues, $press$, press
-WRFp, plev, air_pressure, 0., 103000., air|pressure, Pa, Blues, $press$, press
+presnivs, pres, air_pressure, 0., 103000., air|pressure, Pa, Blues, $pres$, pres
+pres, pres, air_pressure, 0., 103000., air|pressure, Pa, Blues, $pres$, pres
+lpres, pres, air_pressure, 0., 103000., air|pressure, Pa, Blues, $pres$, pres
+LPRES, pres, air_pressure, 0., 103000., air|pressure, Pa, Blues, $pres$, pres
+PRES, pres, air_pressure, 0., 103000., air|pressure, Pa, Blues, $pres$, pres
+WRFp, pres, air_pressure, 0., 103000., air|pressure, Pa, Blues, $pres$, pres
 p_base, p_base, air_pressure_base, 0., 103000., air|pressure|base|state, Pa, Blues, $press^{base}$, press_base
 PB, p_base, air_pressure_base, 0., 103000., air|pressure|base|state, Pa, Blues, $press^{base}$, press_base