Changeset 675 in lmdz_wrf for trunk

Timestamp:

Jan 18, 2016, 5:03:06 PM (9 years ago)

Author:

lfita

Message:

Fixing different sort of errors and updating `fvaradd':

• Changing ':' to ','
• Including use of `fname'

File:

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

trunk/tools/nc_var_tools.py

@@ -1993 +1993 @@
 def fvaradd(values, ncfile):
   """ Adding variable (and all its attributes and dimensions) from a reference file to a file
-  values = [netCDFref]:[varnref]
+  values = [netCDFref],[varnref]
     netCDFref = netCDF file name as reference for the variable to add
     varnref = name of the variable from [netCDFref] to be added
@@ -2006 +2006 @@
       quit()
 
-  refnc = values.split(':')[0]
-  refvar = values.split(':')[1]
+  refnc = values.split(',')[0]
+  refvar = values.split(',')[1]
 
   if not os.path.isfile(ncfile):
     print errormsg
-    print '    fvaradd: File "' + ncfile + '" does not exist !!'
+    print '  ' + fname + ': File "' + ncfile + '" does not exist !!'
     print errormsg
     quit(-1)    
@@ -2017 +2017 @@
   if not os.path.isfile(refnc):
     print errormsg
-    print '    fvaradd: Reference file "' + refnc + '" does not exist !!'
+    print '   ' + fname + ': Reference file "' + refnc + '" does not exist !!'
     print errormsg
     quit(-1)    
@@ -2029 +2029 @@
   else:
       print errormsg
-      print '    fvaradd: File "' + refnc + '" does not have variable: ' + refvar
+      print '   ' + fname + ': File "' + refnc + '" does not have variable: ' + refvar
       ncf.close()
       ncref.close()
@@ -2043 +2043 @@
   for rdim in vardims:
       if not searchInlist(newdims, rdim):
-          print '      fvaradd: Adding dimension ' + rdim
+          print '    ' + fname + ': Adding dimension ' + rdim
           ncf.close()
           ncref.close()
@@ -2057 +2057 @@
       varfil = False
 
-  print '      fvaradd: Adding refvar:', refvar, 'shape: ', refvarv.shape
+  print '    ' + fname + ': Adding refvar:', refvar, 'shape: ', refvarv.shape
   var = ncf.createVariable(refvar, vartype, vardims, fill_value=varfil)
 
@@ -2078 +2078 @@
       else:
           print errormsg
-          print '  fvaradd: variable size ',Nvars,' is not ready!!!!'
+          print '  ' + ': variable size ',Nvars,' is not ready!!!!'
 
 # Allocating all the necessary memory (just in case)
@@ -2120 +2120 @@
   ncref.close()
 
+  return
+
 def fdimadd(values, ncfile):
   """ Adding dimension from another reference file 
@@ -2300 +2302 @@
   for varn in ncvars:
       if not varn == var:
-           fvaradd(ncfile + ':' + varn, 'tmp_py.nc')
+           fvaradd(ncfile + ',' + varn, 'tmp_py.nc')
 
   fgaddattr(ncfile, 'tmp_py.nc')
@@ -3551 +3553 @@
   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')
@@ -3739 +3741 @@
   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')
@@ -5025 +5027 @@
   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')
@@ -5489 +5491 @@
   ncfo.close()
 
-  fvaradd(ncfile + ':lon', ofile)
-  fvaradd(ncfile + ':lat', ofile)
+  fvaradd(ncfile , ':lon', ofile)
+  fvaradd(ncfile , ':lat', ofile)
 
   fgaddattr(ncfile, ofile)
@@ -6598 +6600 @@
     for varns in ncf.variables:
         if not varns == varn:
-            fvaradd(filename + ':' + varns, ofile)
+            fvaradd(filename + ',' + varns, ofile)
 
     ncfnew = NetCDFFile(ofile,'a')
@@ -8018 +8020 @@
     for varns in ncf.variables:
         if not varns == varn:
-            fvaradd(filename + ':' + varns, ofile)
+            fvaradd(filename + ',' + varns, ofile)
         elif varns == oldlon:
-            fvaradd(newprojectionfile + ':' + newlon, ofile)
+            fvaradd(newprojectionfile + ',' + newlon, ofile)
         elif varns == oldlat:
-            fvaradd(newprojectionfile + ':' + newlat, ofile)
+            fvaradd(newprojectionfile + ',' + newlat, ofile)
 
     chvarname(oldlon, ofile, newlon)
@@ -17199 +17201 @@
     else:
         print warnmsg
-        print '  ' + fname + ": Any  1D variables with dimension '" + dname + "' !!"
+        print '  ' + fname + ": Any 1D variables with dimension '" + dname + "' !!"
+        return
 
 # Dpouble precision