Changeset 1409 in lmdz_wrf

Timestamp:

Jan 16, 2017, 4:20:52 PM (9 years ago)

Author:

lfita

Message:

Adding no-sliced variables (by absence of one of the dimensions in the slice) from `curve_section'

Location:

trunk/tools

Files:

• generic_tools.py (modified) (1 diff)
• nc_var_tools.py (modified) (3 diffs)

trunk/tools/generic_tools.py

@@ -11078 +11078 @@
             exctcurvloc[icv,0] = np.float(exctcurvloc[icv,0]) + curveweights[icv,ipy,ipx]*(ipy-1.)
             exctcurvloc[icv,1] = np.float(exctcurvloc[icv,1]) + curveweights[icv,ipy,ipx]*(ipx-1.)
-            print '    ' + fname + 'ip:', ip, 'ipy:', ipy-1., 'wgt:', curveweights[icv,ipy,ipx], \
-              'exctcurv:', exctcurvloc[icv,0]
-        print '  ' + fname + ' icv:', icv, 'curve:', curve[icv,:], 'ijloc:', ijloc, \
-          'cwgt:', curveweights[icv,:,:], 'exctloc:', exctcurvloc[icv,:]
+            #print '    ' + fname + 'ip:', ip, 'ipy:', ipy-1., 'wgt:', curveweights[icv,ipy,ipx], \
+            #  'exctcurv:', exctcurvloc[icv,0]
+        #print '  ' + fname + ' icv:', icv, 'curve:', curve[icv,:], 'ijloc:', ijloc, \
+        #  'cwgt:', curveweights[icv,:,:], 'exctloc:', exctcurvloc[icv,:]
 #    quit()
 

trunk/tools/nc_var_tools.py

@@ -18579 +18579 @@
         print '  ' + fname + ": file '" + ncfile + "' does not have dimension '" +   \
           xdimn + "' !!"
-        print '    available dimensions:', onc.dimensions
+        print '    available dimensions:', onc.dimensions.keys()
         onc.close() 
         quit(-1)
@@ -18587 +18587 @@
         print '  ' + fname + ": file '" + ncfile + "' does not have dimension '" +   \
           ydimn + "' !!"
-        print '    available dimensions:', onc.dimensions
+        print '    available dimensions:', onc.dimensions.keys()
         onc.close() 
         quit(-1)
@@ -18748 +18748 @@
             print '    ' + fname + ": adding section of '" + vn + "' ..."
             dimvar = list(ovar.dimensions)
-            if gen.searchInlist(dimvar, xdimn): dimvar.remove(xdimn)
-            if gen.searchInlist(dimvar, ydimn): dimvar.remove(ydimn)
-
-            varcurve = interp_curve(ovar, xdimn, ydimn, loccurve, curvewgts, Nwgts, \
-              curveloc3x3)
-
-            # Writing values of variable along the curve
-            add_dims(onc,newnc,dimvar)
-
-            newvar = newnc.createVariable(vn+'curve', 'f4', tuple(dimvar+['curve']))
-            newvar[:] = varcurve[:]
-            add_varattrs(onc,newnc,[vn],[vn+'curve'])
-            set_attribute(newvar,'along','xcurve,ycurve')
-            set_attribute(newvar,'curve',curvetype)
+            # Look if variable has the dimension along the curve
+            foundxdim = False
+            foundydim = False
+            if gen.searchInlist(dimvar, xdimn): 
+                foundxdim = True
+            if gen.searchInlist(dimvar, ydimn): 
+                foundydim = True
+
+            if foundxdim and foundydim:
+                dimvar.remove(xdimn)
+                dimvar.remove(ydimn)
+                varcurve = interp_curve(ovar, xdimn, ydimn, loccurve, curvewgts,     \
+                  Nwgts, curveloc3x3)
+                # Writing values of variable along the curve
+                add_dims(onc,newnc,dimvar)
+
+                newvar = newnc.createVariable(vn+'curve', 'f4', tuple(dimvar+['curve']))
+                newvar[:] = varcurve[:]
+                add_varattrs(onc,newnc,[vn],[vn+'curve'])
+                set_attribute(newvar,'along','xcurve,ycurve')
+                set_attribute(newvar,'curve',curvetype)
+                newnc.sync()
+
+            else:
+                print warnmsg
+                print '  ' + fname + ": variable '" + vn + "' does not have curve "+ \
+                  " dimensions '", xdimn, "' and '", ydimn, "' !!"
+                print '    keeping as it is in output file'
+
+                # Writing values of variable along the curve
+                add_dims(onc,newnc,dimvar)
+
+                newvar = newnc.createVariable(vn, nctype(ovar.dtype), tuple(dimvar))
+                print '    Lluis shapes newvar:', newvar.shape, 'ovar:', ovar.shape
+                newvar[:] = ovar[:]
+
             newnc.sync()