Changeset 1506 in lmdz_wrf

Timestamp:

Apr 10, 2017, 4:44:03 PM (9 years ago)

Author:

lfita

Message:

Fixing `check_timestep'

File:

• trunk/tools/generic_tools.py (modified) (3 diffs)

trunk/tools/generic_tools.py

@@ -6284 +6284 @@
     varatrs = otval.ncattrs()
 
-    if not gen.searchInfile(varatrs, 'units'):
+    if not searchInlist(varatrs, 'units'):
         print errormsg
         print '  ' + main+'.'+fname + ": object variable without 'units' attribute!!"
@@ -6290 +6290 @@
         quit(-1)
 
-    tunits = varattrs.units
+    tunits = otval.getncattr('units')
     if tunits.split(' ')[0] == 'timesteps':
         print warnmsg
@@ -6304 +6304 @@
         for Tunit in Tunitssecs:
             attrn = Tunit[0:1]
-            if gen.searchInlist(varatrs,dimvn+'_'+attrn):
+            if searchInlist(varatrs,dimvn+'_'+attrn):
                 CFtu = Tunit + 's'
                 foundCFunits = True
-                Tunitsguess.append(dimvn+'_'+attrn)
                 break
-            attrn = Tunit[0:4]
-            if gen.searchInlist(varatrs,dimvn+'_'+attrn):
+            Tunitsguess.append(dimvn+'_'+attrn)
+            attrn = Tunit[0:3]
+            if searchInlist(varatrs,dimvn+'_'+attrn):
                 CFtu = Tunit + 's'
                 foundCFunits = True
-                Tunitsguess.append(dimvn+'_'+attrn)
                 break
+            Tunitsguess.append(dimvn+'_'+attrn)
             attrn = Tunit
-            if gen.searchInlist(varatrs,dimvn+'_'+attrn):
+            if searchInlist(varatrs,dimvn+'_'+attrn):
                 CFtu = Tunit + 's'
                 foundCFunits = True
-                Tunitsguess.append(dimvn+'_'+attrn)
                 break
+            Tunitsguess.append(dimvn+'_'+attrn)
             attrn = Tunit + 's'
-            if gen.searchInlist(varatrs,dimvn+'_'+attrn):
+            if searchInlist(varatrs,dimvn+'_'+attrn):
                 CFtu = Tunit + 's'
                 foundCFunits = True
-                Tunitsguess.append(dimvn+'_'+attrn)
                 break
+            Tunitsguess.append(dimvn+'_'+attrn)
 
         if not foundCFunits:
             print errormsg
             print '  ' + fname + ": time-variable with units as 'timesteps' does " + \
-              'not have a prepared way:' + Tunitsguess + 'to find its units !!'
+              'not have a prepared way:', Tunitsguess, 'to find its units !!'
             print "    variables' attributes:", varatrs
             quit(-1)
 
         CFtv = otval.getncattr(dimvn+'_'+attrn)
-        newTS = [CFtu] + tunits[1:-1]
+        newTS = [CFtu] + tunits.split(' ')[1:-1]
         newTunits = ' '.join(newTS)
         newTvals = otval[:]*CFtv
+    else:
+        newTunits = tunits
+        newTvals = otval[:]
 
     return newTunits, newTvals
-
 
 def coincident_CFtimes(tvalB, tunitA, tunitB):