Changeset 676 in lmdz_wrf

Timestamp:

Jan 18, 2016, 5:35:22 PM (9 years ago)

Author:

lfita

Message:

Fixing existence of variable in the output file in `fvaradd'

File:

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

trunk/tools/nc_var_tools.py

@@ -1172 +1172 @@
         else:
             print errormsg
-            print '  fvaradd: variable size ',Nvars,' is not ready!!!!'
+            print '  ' + fname + ': variable size ',Nvars,' is not ready!!!!'
 
 # Allocating all the necessary memory (just in case)
@@ -2057 +2057 @@
       varfil = False
 
-  print '    ' + fname + ': Adding refvar:', refvar, 'shape: ', refvarv.shape
-  var = ncf.createVariable(refvar, vartype, vardims, fill_value=varfil)
-
-  varshape = refvarv.shape
-  Nvars = len(varshape)
+  if not ncf.variables.has_key(refvar):
+      print '    ' + fname + ': Adding refvar:', refvar, 'shape: ', refvarv.shape
+      var = ncf.createVariable(refvar, vartype, vardims, fill_value=varfil)
+
+      varshape = refvarv.shape
+      varvals = np.zeros(tuple(varshape), dtype=vartype)      
+      Nvars = len(varshape)
    
-  if not Nvars == 0:
-      if Nvars == 1:
-          varvals = np.zeros(varshape[0], dtype=vartype) 
-      elif Nvars == 2:
-          varvals = np.zeros((varshape[0], varshape[1]), dtype=vartype)
-      elif Nvars == 3:
-          varvals = np.zeros((varshape[0], varshape[1], varshape[2]), dtype=vartype)
-      elif Nvars == 4:
-          varvals = np.zeros((varshape[0], varshape[1], varshape[2], varshape[3]), dtype=vartype) 
-      elif Nvars == 5:
-          varvals = np.zeros((varshape[0], varshape[1], varshape[2], varshape[3], varshape[4]), dtype=vartype)
-      elif Nvars == 6:
-          varvals = np.zeros((varshape[0], varshape[1], varshape[2], varshape[3], varshape[4], varshape[5]), dtype=vartype)
-      else:
-          print errormsg
-          print '  ' + ': variable size ',Nvars,' is not ready!!!!'
-
 # Allocating all the necessary memory (just in case)
       var[:] = varvals
@@ -2109 +2094 @@
                           var[i,j,k,l,:,:] = varvals[i,j,k,l,:,:]
 
-  newvar = ncf.variables[refvar]
-  for attr in varattr:
-      newvarattrs = newvar.ncattrs()
-      attrv = refvarv.getncattr(attr)
-      if not searchInlist(newvarattrs, attr):     
-          newvar.setncattr(attr, attrv)
-
-  ncf.sync()
+      newvar = ncf.variables[refvar]
+      for attr in varattr:
+          newvarattrs = newvar.ncattrs()
+          attrv = refvarv.getncattr(attr)
+          if not searchInlist(newvarattrs, attr):     
+              newvar.setncattr(attr, attrv)
+
+      ncf.sync()
   ncf.close()
   ncref.close()
@@ -3553 +3538 @@
   ncfo.close()
   fattradd('time', ncfile + ':time', ofile)
-  fvaradd(ncfile , ':lon', ofile)
-  fvaradd(ncfile , ':lat', ofile)
+  fvaradd(ncfile + ',lon', ofile)
+  fvaradd(ncfile + ',lat', ofile)
 
   ncfo = NetCDFFile(ofile,'a')
@@ -3741 +3726 @@
   ncfo.close()
   fattradd('time', ncfile + ':time', ofile)
-  fvaradd(ncfile , ':lon', ofile)
-  fvaradd(ncfile , ':lat', ofile)
+  fvaradd(ncfile + ',lon', ofile)
+  fvaradd(ncfile + ',lat', ofile)
 
   ncfo = NetCDFFile(ofile,'a')
@@ -5027 +5012 @@
   ncfo.close()
   fattradd('time', ncfile + ':time', ofile)
-  fvaradd(ncfile , ':lon', ofile)
-  fvaradd(ncfile , ':lat', ofile)
+  fvaradd(ncfile + ',lon', ofile)
+  fvaradd(ncfile + ',lat', ofile)
 
   ncfo = NetCDFFile(ofile,'a')
@@ -5491 +5476 @@
   ncfo.close()
 
-  fvaradd(ncfile , ':lon', ofile)
-  fvaradd(ncfile , ':lat', ofile)
+  fvaradd(ncfile + ',lon', ofile)
+  fvaradd(ncfile + ',lat', ofile)
 
   fgaddattr(ncfile, ofile)