Changeset 1695 in lmdz_wrf

Timestamp:

Dec 7, 2017, 8:35:22 PM (7 years ago)

Author:

lfita

Message:

Improving and fixing `addvals'

File:

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

trunk/tools/nc_var_tools.py

@@ -968 +968 @@
     attrvalue = value of the attribute
     """
+    fname = 'set_attribute'
 
     attvar = ncv.ncattrs()
@@ -4608 +4609 @@
     addval=values.split(':')[3]
 
-    filexist(filename, errormsg, 'add values')
+    gen.filexist(filename, errormsg, 'add values')
     ncfa = NetCDFFile(filename,'r')
 
@@ -4644 +4645 @@
     else:
         addvaln = addval
-    addvalv=typemod(addvaln, str(varinf.dtype))
+    addvalv = gen.typemod(addvaln, str(varinf.dtype))
 
     newnc = NetCDFFile(newf,'w')
@@ -4669 +4670 @@
 
         varattrs = var.ncattrs()
-        if searchInlist(varattrs, '_FillValue'):
+        if gen.searchInlist(varattrs, '_FillValue'):
             fillval = var.getncattr('_FillValue')
             newvarobj = newnc.createVariable(vname, vkind, vdims, fill_value=fillval)
@@ -4676 +4677 @@
         else:
             newvarobj = newnc.createVariable(vname, vkind, vdims)
-         
+
         varobj=ncfa.variables[vname]
         vals = varobj[:]
 
         if vname == varN:
-             for ival in range(Nvals):
-##                 print '      ' + fname + ': adding',ival+1,' values'
-                 newvar = np.insert(vals, pos, addvalv, axis=dimension)
-                 vals=newvar.copy()
-             newvarobj[:] = newvar
+            for ival in range(Nvals):
+                newvar = np.insert(vals, pos, addvalv, axis=dimension)
+                vals=newvar.copy()
+            newvarobj[:] = newvar
         else:
             if vname == dmodname:
@@ -4710 +4710 @@
             else:
                 vardims=list(var.dimensions)
-                if searchInlist(vardims,varinf.dimns[dimension]):
+                if gen.searchInlist(vardims,varinf.dimns[dimension]):
 ##                    print '    ' + fname + ' variable ' + vname + ' has also the increased dimension!'
                     vardim=vardims.index(varinf.dimns[dimension])
@@ -4720 +4720 @@
                 else:
                     newvarobj[:] = vals
-
         for vattr in varobj.ncattrs():
             if not vattr == '_FillValue':
-                vattrval = var.getncattr(vattr)
-                newvarobj = set_attribute(newvarobj, vattr, vattrval)
+                vattrval = varobj.getncattr(vattr)
+                newattr = set_attribute(newvarobj, vattr, vattrval)
 
 # Global attributes
@@ -4730 +4729 @@
     for gattr in ncfa.ncattrs():
         gattrval = ncfa.getncattr(gattr)
-        newnc = set_attribute(newnc, gattr, gattrval)
+        newattr = set_attribute(newnc, gattr, gattrval)
 
     newnc.sync()