Changeset 1907 in lmdz_wrf for trunk

Timestamp:

Apr 16, 2018, 12:56:07 AM (7 years ago)

Author:

lfita

Message:

Agregatting new possible time-units on `compute_time_bnds'

File:

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

trunk/tools/nc_var_tools.py

@@ -22905 +22905 @@
 
     # Quantity of time_bnds
-    availtunits = ['c', 'y', 'm', 'd', 'h', 'i', 's']
-    if tunit == 'c':
+    availtunits = ['c', 'ce', 'y', 'yr', 'm', 'mo', 'w', 'we', 'd', 'da', 'h', 'hr', \
+      'i', 'mi', 's', 'se']
+    if tunit == 'c' or tunit == 'ce':
         dtbnds = quantity * 100 * 365 * 24 * 3600.
         begTBmat = [int(begTmat[0]/100)*100, 1, 1, 0, 0, 0]
@@ -22912 +22913 @@
           [100,0,0,0,0,0])
         dTBmat = [quantity*100, 0, 0, 0, 0, 0]
-    elif tunit == 'y':
+    elif tunit == 'y' or tunit == 'yr':
         dtbnds = quantity * 365 * 24 * 3600.
         begTBmat = [begTmat[0], 1, 1, 0, 0, 0]
         endTBmat = [endTmat[0]+1, 1, 1, 0, 0, 0]
         dTBmat = [quantity, 0, 0, 0, 0, 0]
-    elif tunit == 'm':
+    elif tunit == 'm' or tunit == 'mo':
         iyr = begTmat[0]
         imo = begTmat[1]
@@ -22926 +22927 @@
         endTBmat = [endTmat[0], endTmat[1]+1, 1, 0, 0, 0]
         dTBmat = [0, quantity, 0, 0, 0, 0]
-    elif tunit == 'w':
+    elif tunit == 'w' or tunit == 'we':
         dtbnds = quantity * 7 * 24 * 3600.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], 0, 0, 0]
@@ -22932 +22933 @@
           [0,0,7,0,0,0])
         dTBmat = [0, 0, quantity*7, 0, 0, 0]
-    elif tunit == 'd':
+    elif tunit == 'd' or tunit == 'da':
         dtbnds = quantity * 24 * 3600.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], 0, 0, 0]
@@ -22938 +22939 @@
           [0,0,1,0,0,0])
         dTBmat = [0, 0, quantity, 0, 0, 0]
-    elif tunit == 'h':
+    elif tunit == 'h' or tunit == 'hr':
         dtbnds = quantity * 3600.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], begTmat[3], 0, 0]
@@ -22944 +22945 @@
           0], [0,0,0,1,0,0])
         dTBmat = [0, 0, 0, quantity, 0, 0]
-    elif tunit == 'i':
+    elif tunit == 'i' or tunit == 'mi':
         dtbnds = quantity * 60.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], begTmat[3], begTmat[4], 0]
@@ -22950 +22951 @@
           endTmat[4],0], [0,0,0,0,1,0])
         dTBmat = [0, 0, 0, 0, quantity, 0]
-    elif tunit == 's':
+    elif tunit == 's' or tunit == 'se':
         dtbnds = quantity * 1.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], begTmat[3], begTmat[4],      \
@@ -24373 +24374 @@
 
     if np.mod(secfreq, 100 * 365 * 24 * 3600.) == 0.:
-        Sfreq = str(int(secfreq/(100 * 365 * 24 * 3600.))) + ',C'
+        Sfreq = str(int(secfreq/(100 * 365 * 24 * 3600.))) + ',ce'
     elif np.mod(secfreq, 365 * 24 * 3600.) == 0.: 
-        Sfreq = str(int(secfreq/(365 * 24 * 3600.))) + ',Y'
+        Sfreq = str(int(secfreq/(365 * 24 * 3600.))) + ',yr'
     elif np.mod(secfreq, 7 * 24 * 3600.) == 0.: 
-        Sfreq = str(int(secfreq/(7 * 24 * 3600.))) + ',W'
+        Sfreq = str(int(secfreq/(7 * 24 * 3600.))) + ',we'
     elif np.mod(secfreq, 24 * 3600.) == 0.:
-        Sfreq = str(int(secfreq/(24.*3600.))) + ',D'
+        Sfreq = str(int(secfreq/(24.*3600.))) + ',da'
     elif np.mod(secfreq,3600.) == 0.: 
-        Sfreq = str(int(secfreq/3600.)) + ',H'
+        Sfreq = str(int(secfreq/3600.)) + ',hr'
     elif np.mod(secfreq,60.) == 0.:
-        Sfreq = str(int(secfreq/60.)) + ',M'
+        Sfreq = str(int(secfreq/60.)) + ',mi'
     else:
         print '  ' + fname + ": data from file does not conform "+\
@@ -24395 +24396 @@
         print '      minute:', secfreq/(60.)
         print '      second:', secfreq
+        quit(-1)
     print 'diff_conform:', Sfreq