Changeset 890 in lmdz_wrf for trunk

Timestamp:

Jun 18, 2016, 11:22:06 PM (8 years ago)

Author:

lfita

Message:

Adding Oderdictionary for the dimensions in `genericNCvariable'

File:

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

trunk/tools/nc_var_tools.py

@@ -141 +141 @@
       d[x/y/z/t]: dimensions of the variable
       dn[x/y/z/t]: name of the dimensions of the variable
+    >>> variable = genericNCvariable(5,4,3,2,'lon','lat','pres','time')
     """
     def __init__(self,dx,dy,dz,dt,dnx,dny,dnz,dnt):
+        from collections import OrderedDict
         totshape = dt*dz*dy*dx
-        
-        self.values = np.arange((totshape), dtype=np.float).reshape(dt,dz,dy,dx)
-        self.dimensionsdict = {dnt: dt, dnz: dz, dny: dy, dnx: dx}
-        self.dimensions = [dnt, dnz, dny, dnx]
+        dimdict = {dnt: dt, dnz: dz, dny: dy, dnx: dx}
+
+        self.values = np.arange((totshape), dtype=np.float).reshape(dt,dz,dy,dx)        
+        self.dimensions = OrderedDict(sorted(dimdict.items(), key=lambda t: t[0]))
         self.shape = (dt, dz, dy, dx)
         self.standard_name = 'general_var'
@@ -155 +157 @@
     def __getitem__(self, val):
         return self.values[val]
-
-#variable = genericNCvariable(5,4,3,2,'lon','lat','pres','time')
 
 def varinfile(ncf, filen, emsg, vmsg, varn):
@@ -8848 +8848 @@
         mean2, min, sum
     """
-
     fname = 'operation_alongdims'
 
@@ -8965 +8964 @@
     file_oper_alongdims(values, ncfile, varn)
       values= [dimvals],[dimsoper],[opkind],[dimvn]
-        [dimvals]; [dimname1]:[val1]|[dimdname2]:[val2]|[...[dimnameN]:[valN]]
+        [dimvals]; [dimname1]@[val1]|[dimdname2]@[val2]|[...[dimnameN]@[valN]]
           [value]; 
             * [integer]: which value of the dimension
@@ -8987 +8986 @@
         quit()
 
-    dimvals = values.split(',')[0]
+    dimvals = values.split(',')[0].split('@')
     dimsoper = values.split(',')[1]
     operkind = values.split(',')[2]
@@ -9013 +9012 @@
     dimslice = {}
     for dv in dimvals:
-        dnv = dv.slice('|')[0]
-        dvv = dv.slice('|')[1]
+        dnv = dv.split('|')[0]
+        dvv = dv.split('|')[1]
         if dvv.find(':') != -1:
-            beg = int(dvv.slice(':')[0])
-            end = int(dvv.slice(':')[1])
+            beg = int(dvv.split(':')[0])
+            end = int(dvv.split(':')[1])
             dimslice[dnv] = [beg, end, 1]
         else:
@@ -9041 +9040 @@
         tocompute = False
         for vd in ov.dimensions:
-            if searchInlist(dimsoper, vd): tocompute = True
+            if gen.searchInlist(dimsoper, vd): tocompute = True
 
         if tocopmute:
@@ -9116 +9115 @@
 # global attributes
     objnewnc.setncattr('author', 'L. Fita')
-    objnewnc.setncattr('institution', 'Laboratire de Meteorologie Dynamique')
+    newattr = set_attributek(newncobj, 'institution', unicode('Laboratoire de M' +   \
+      unichr(233) + 't' + unichr(233) + 'orologie Dynamique'), 'U')
     objnewnc.setncattr('university', 'Pierre Marie Curie - Jussieu')
     objnewnc.setncattr('center', 'Centre National de Recherches Scientifiques')