Changeset 1270 in lmdz_wrf for trunk

Timestamp:

Nov 4, 2016, 4:47:40 PM (9 years ago)

Author:

lfita

Message:

Adding the removing of the file if certain functions fail

File:

• trunk/tools/model_graphics.py (modified) (12 diffs)

trunk/tools/model_graphics.py

@@ -890 +890 @@
                     print 'WRF_toCF('+ values +', ' + ifilen + ')'
                     for s1out in output: print s1out
+                    # Removing file in order to make sure that it will be redone
+                    print '  ' + fname + " removing file '" + ifilen + "' ..."
+                    sub.call('rm ' + ifilen + ' >& /dev/null', shell=True)
                     quit(-1)
                 if db:
@@ -901 +904 @@
                     print 'LMDZ_toCF('+ Tunits +'!since!'+ Tref + ', ' + ifilen + ')'
                     for s1out in output: print s1out
+                    # Removing file in order to make sure that it will be redone
+                    print '  ' + fname + " removing file '" + ifilen + "' ..."
+                    sub.call('rm ' + ifilen + ' >& /dev/null', shell=True)
                     quit(-1)
                 if db:
@@ -949 +955 @@
             print 'time_reset(' + minf.timemodif + ', ' + fileon + ', time)'
             for s1out in output: print s1out
+            # Removing file in order to make sure that it will be redone
+            print '  ' + fname + " removing file '" + fileon + "' ..."
+            sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
             quit(-1)
         if db:
@@ -1158 +1167 @@
             # pinterp: pressure interpolation (to the given $plevels)
             vals=plevels + ',1,1'
-            print fname + '; Lluis vals:', vals, 'plevels:', plevels
             if dofile:
                 try:
@@ -1182 +1190 @@
 
                 # adding CF lon,lat,time in WRF files
-                if minf.name == 'WRF':
+                if minf.name == 'WRF' or minf.name == 'WRF_LMDZ':
                     values = vdnx + ':' + vdny + ':'+ Tref + ':' + Tunits
-                    ncvar.WRF_toCF(values, fileon)
+                    try:
+                        with gen.Capturing() as output:
+                            ncvar.WRF_toCF(values, fileon)
+                    except:
+                        print errmsg
+                        print 'ncvar.WRF_toCF(' + values+ ', ' + fileon + ')'
+                        for s1out in output: print s1out
+                        # Removing file in order to make sure that it will be redone
+                        print '  ' + fname + " removing file '" + fileon + "' ..."
+                        sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
+                        quit(-1)
 
             # vertical interpolation variables are no more needed
@@ -1440 +1458 @@
                 print 'ivars('+fileon+')'
                 for s1out in output: print s1out
+                # Removing file in order to make sure that it will be redone
+                print '  ' + fname + " removing file '" + fileon + "' ..."
+                sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
                 quit(-1)
 
@@ -1452 +1473 @@
                         print errmsg
                         print 'fvaradd(' + prevfile + ',' + CFvn +', '+fileon+')'
+                        ncvar.fvaradd(prevfile+','+CFvn, fileon)
                         for s1out in output: print s1out
+                        # Removing file in order to make sure that it will be redone
+                        print '  ' + fname + " removing file '" + fileon + "' ..."
+                        #sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
                         quit(-1)
 
@@ -1465 +1490 @@
                 print errmsg
                 print 'cleaning_varsfile('+totalvarkeeps+','+fileon+')'
+                ncvar.cleaning_varsfile(totalvarkeeps,fileon)
                 for s1out in output: print s1out
+                # Removing file in order to make sure that it will be redone
+                print '  ' + fname + " removing file '" + fileon + "' ..."
+                sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
                 quit(-1)
 
@@ -3302 +3331 @@
                 print 'ivars('+fileon+')'
                 for s1out in output: print s1out
+                # Removing file in order to make sure that it will be redone
+                print '  ' + fname + " removing file '" + fileon + "' ..."
+                sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
                 quit(-1)
 
@@ -3315 +3347 @@
                         print 'fvaradd(' + prevfile + ',' + CFvn +', ' + fileon + ')'
                         for s1out in output: print s1out
+                        # Removing file in order to make sure that it will be redone
+                        print '  ' + fname + " removing file '" + fileon + "' ..."
+                        sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
                         quit(-1)
 
@@ -3328 +3363 @@
                 print 'cleaning_varsfile('+totalvarkeeps+','+fileon+')'
                 for s1out in output: print s1out
+                # Removing file in order to make sure that it will be redone
+                print '  ' + fname + " removing file '" + fileon + "' ..."
+                sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
                 quit(-1)
 
@@ -3970 +4008 @@
                         print 'ncvar.CDO_toCF(' + ofile + ')'
                         for s1out in output: print s1out
+                        # Removing file in order to make sure that it will be redone
+                        print '  ' + fname + " removing file '" + ofile + "' ..."
+                        sub.call('rm ' + ofile + ' >& /dev/null', shell=True)
                         quit(-1)