Changeset 1176 in lmdz_wrf for trunk/tools/nc_var_tools.py

Timestamp:

Oct 11, 2016, 5:29:14 PM (8 years ago)

Author:

lfita

Message:

Fixing `reproject' and make it wrongly work

File:

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

trunk/tools/nc_var_tools.py

@@ -15817 +15817 @@
     projlatn = values.split(',')[4]
     kind = values.split(',')[5]
-    dimvars = gen.Str_list(values.split(',')[6],':')
-
-    varns = gen.Str_list(variable,',')
+    dimvars = gen.str_list(values.split(',')[6],':')
+
+    varns = gen.str_list(variable,',')
 
     inf = NetCDFFile(filen, 'r')
@@ -15855 +15855 @@
     oprojlat = projf.variables[projlatn]
 
-    inlonvals0 = oinlon[:]
-    inlatvals0 = oinlat[:]
+    ilonvals0 = oinlon[:]
+    ilatvals0 = oinlat[:]
     olonvals0 = oprojlon[:]
     olatvals0 = oprojlat[:]
@@ -15862 +15862 @@
     # Getting 2D longitudes and latitudes
     ilonvals, ilatvals = gen.lonlat2D(ilonvals0, ilatvals0)
-    olonvals, olatvals = gen.lonlat2D(olonvals0, olatvals0)
+    rlonvals, rlatvals = gen.lonlat2D(olonvals0, olatvals0)
 
     if len(ilonvals.shape) != 2:
@@ -15876 +15876 @@
         quit(-1)
 
-    if len(olonvals.shape) != 2:
+    if len(rlonvals.shape) != 2:
         print errormsg
-        print '  ' + fname + ': wrong output longitude rank:', olonvals.shape,       \
+        print '  ' + fname + ': wrong output longitude rank:', rlonvals.shape,       \
           'it must be 2!!'
         quit(-1)
 
-    if len(olatvals.shape) != 2:
+    if len(rlatvals.shape) != 2:
         print errormsg
-        print '  ' + fname + ': wrong output latitude rank:', olatvals.shape,        \
+        print '  ' + fname + ': wrong output latitude rank:', rlatvals.shape,        \
           'it must be 2!!'
         quit(-1)
 
     for i in range(2):
-        if ilonvals[i] != ilatvals[i]:
+        if ilonvals.shape[i] != ilatvals.shape[i]:
             print errormsg
             print '  ' + fname + ': dimension',i,'of input longitude:', ilonvals[i], \
               'differs from latitude:', ilatvals[i], 'they must be the same!!'
             quit(-1)
-        if rlonvals[i] != rlatvals[i]:
+        if rlonvals.shape[i] != rlatvals.shape[i]:
             print errormsg
             print '  ' + fname + ': dimension',i,'of output longitude:', ilonvals[i],\
@@ -15957 +15957 @@
 
         if Nvarind == 2:
-            varout = fin.var2D_IntProj(var2Din=varint, inlonv=inlont, inlatv=inlatt, \
-              projlon=rlont, projlat=rlatt, intkind=kind, idimx=idx, idimy=idy,      \
-              pdimx=rdx, pdimy=rdy)
+            varout = fin.module_forinterpolate.var2d_intproj(var2din=varint,         \
+              inlonv=ilont, inlatv=ilatt, projlon=rlont, projlat=rlatt, intkind=kind,\
+              idimx=idx, idimy=idy, pdimx=rdx, pdimy=rdy)
         elif Nvarind == 3:
-            varout = fin.var3D_IntProj(var3Din=varint, inlonv=inlont, inlatv=inlatt, \
-              projlon=rlont, projlat=rlatt, intkind=kind, idimx=idx, idimy=idy,      \
-              pdimx=rdx, pdimy=rdy, d3=varin.shape[0])
+            varout = fin.module_forinterpolate.var3d_intproj(var3din=varint,         \
+              inlonv=ilont, inlatv=ilatt, projlon=rlont, projlat=rlatt, intkind=kind,\
+              idimx=idx, idimy=idy, pdimx=rdx, pdimy=rdy, d3=varin.shape[0])
         elif Nvarind == 4:
-            varout = fin.var4D_IntProj(var4Din=varint, inlonv=inlont, inlatv=inlatt, \
-              projlon=rlont, projlat=rlatt, intkind=kind, idimx=idx, idimy=idy,      \
-              pdimx=rdx, pdimy=rdy, d3=varin.shape[0], d4=varin.shape[1])
+            varout = fin.module_forinterpolate.var4d_intproj(var4din=varint,         \
+              inlonv=ilont, inlatv=ilatt, projlon=rlont, projlat=rlatt, intkind=kind,\
+              idimx=idx, idimy=idy, pdimx=rdx, pdimy=rdy, d3=varin.shape[0],         \
+              d4=varin.shape[1])
         elif Nvarind == 5:
-            varout = fin.var4D_IntProj(var4Din=varint, inlonv=inlont, inlatv=inlatt, \
-              projlon=rlont, projlat=rlatt, intkind=kind, idimx=idx, idimy=idy,      \
-              pdimx=rdx, pdimy=rdy, d3=varin.shape[0], d4=varin.shape[1],            \
-              d5=varin.shape[2])
+            varout = fin.module_forinterpolate.var5d_intproj(var5din=varint,         \
+              inlonv=ilont, inlatv=ilatt, projlon=rlont, projlat=rlatt, intkind=kind,\
+              idimx=idx, idimy=idy, pdimx=rdx, pdimy=rdy, d3=varin.shape[0],         \
+              d4=varin.shape[1], d5=varin.shape[2])
         else:
             print errormsg
@@ -15979 +15980 @@
     
         # Variable's dimensions and their related variables
-        dimsfile = onewnc.dimensions()
-        for dimn in ovarin.dimensions():
+        vdims = list(ovarin.dimensions)
+        dimsfile = onewnc.dimensions.keys()
+        for dimn in vdims:
             if not gen.searchInlist(dimsfile, dimn):
                 odimn = inf.dimensions[dimn]
@@ -15987 +15989 @@
                 else:
                     newdim = onewnc.createDimension(dimn, len(odimn))
-                if not vardimsn.has_key(dimn):
+                if not vardimns.has_key(dimn):
                     print errormsg
                     print '  ' + fname + ": dimension '" + dimn + "' does not have "+\
                       'assigned any variable !!'
                     print '    assigned pairs (via [dimvars]) _______'
-                    gen.print_dictionary(vardimsn)
+                    gen.print_dictionary(vardimns)
                     quit(-1)
                 else:
-                    add_vars(inf,onewnc,vardimsn[dimn])
+                    add_vars(inf,onewnc,[vardimns[dimn]])
 
         # Interpolated variable
-        vardims = ovarin.dimensions()
+        vardims = list(ovarin.dimensions)
         newvardims = gen.replace_list(vardims,inlonn,'lon')
         newvardims = gen.replace_list(newvardims,inlatn,'lat')
@@ -16018 +16020 @@
 
     # Global attributes
-    add_globalattrs(inf,onewnc,'all')
+    add_globattrs(inf,onewnc,'all')
     onewnc.sync()
 
@@ -17157 +17159 @@
 
     ncvars = ncf.variables.keys()
-    # CFing variables 'lon, lat'
+    print fname + '; Lluis ncvars:', ncvars
     olon2 = ncf.variables['lon2']
     dimslon2 = olon2.dimensions
@@ -17167 +17169 @@
         set_attribute(newvar,attrn,attrv)
 
+    ncf.sync()
+    ncf.sync()
+    ncf.sync()
+    ncf.sync()
+    ncvars = ncf.variables.keys()
     olat2 = ncf.variables['lat2']
     dimslat2 = olat2.dimensions
+    print fname + '; Lluis ncvars after 1st:', ncvars, 'dimslat2:', dimslat2
     newvar = ncf.createVariable('lat','f8',dimslat2)
     newvar[:] = olat2[:]