Changeset 1100 in lmdz_wrf

Timestamp:

Sep 12, 2016, 11:18:53 AM (8 years ago)

Author:

lfita

Message:

Adding `week' in 'period_information'

File:

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

trunk/tools/generic_tools.py

@@ -325 +325 @@
     check_arguments(fname,str(idate)+','+str(edate)+','+str(totunits),expectargs,',')
 
+    readyT = ['year','month','week','day','hour','minute','second']
+
 # Checking length
     Lidate = len(idate)
@@ -416 +418 @@
 # Looking for number of months tacking exact beginning of the units [iYYYY][iMM]01000000, [eYYYY][eMM+1]01000000
 ##
-    if totunits == 'month':
+    elif totunits == 'month':
         itime = int(iyrS)*100 + int(imoS)
         if edate[6:15] != '01000000':
@@ -451 +453 @@
         oinf = oinf + ',' + str(Nmonths) + ',' + ExactMonths
 
+# Looking for number of days tacking exact beginning of the units [iYYYY][iMM][iDD]000000, [eYYYY][eMM][eDD+7]000000
+##
+    elif totunits == 'week':
+        itime = dt.datetime(int(iyrS),int(imoS),int(idaS),0,0,0)
+        if edate[8:15] != '000000':
+            etime = dt.datetime(int(eyrS), int(emoS), int(edaS)+7,0,0,0)
+        else:
+            etime = edateT
+
+        Ndays = 1
+        ExactDays = itime.strftime("%Y%m%d%H%M%S")
+        it = itime
+        while it + dt.timedelta(days=7) <= etime:
+            it = it + dt.timedelta(days=7)
+            Ndays = Ndays + 7
+            ExactDays = ExactDays + '@' + it.strftime("%Y%m%d%H%M%S")
+
+        oinf = oinf + ',' + str(Ndays) + ',' + ExactDays
+
 # Looking for number of days tacking exact beginning of the units [iYYYY][iMM][iDD]000000, [eYYYY][eMM][eDD+1]000000
 ##
-    if totunits == 'day':
+    elif totunits == 'day':
         itime = dt.datetime(int(iyrS),int(imoS),int(idaS),0,0,0)
         if edate[8:15] != '000000':
@@ -472 +493 @@
 # Looking for number of hours tacking exact beginning of the units [iYYYY][iMM][iDD][iHH]0000, [eYYYY][eMM][eDD][iHH+1]0000
 ##
-    if totunits == 'hour':
+    elif totunits == 'hour':
         itime = dt.datetime(int(iyrS),int(imoS),int(idaS),int(ihoS),0,0)
         if edate[10:15] != '0000':
@@ -491 +512 @@
 # Looking for number of minutes tacking exact beginning of the units [iYYYY][iMM][iDD][iHH][iMI]00, [eYYYY][eMM][eDD][iHH][iMI+1]00
 ##
-    if totunits == 'minute':
+    elif totunits == 'minute':
         itime = dt.datetime(int(iyrS),int(imoS),int(idaS),int(ihoS),int(imiS),0)
         if edate[12:15] != '00':
@@ -511 +532 @@
 #   [eYYYY][eMM][eDD][iHH][iMI][iSE+1]
 ##
-    if totunits == 'second':
+    elif totunits == 'second':
         itime = dt.datetime(int(iyrS),int(imoS),int(idaS),int(ihoS),int(imiS),int(iseS))
         if edate[12:15] != '00':
@@ -527 +548 @@
     
         oinf = oinf + ',' + str(Nseconds) + ',' + ExactSeconds
+
+    else:
+        print errormsg
+        print '  '+ fname + ": totalunits '" + totunits + "' not ready !!"
+        print '    total time units ready:', readyT
+        quit(-1)
 
     return oinf
@@ -8687 +8714 @@
         [12 13]]
     """
-    fname = 'dimoper_matrix'
+    fname = 'oper_submatrix'
 
     operations = ['sumc', 'subc', 'mulc', 'divc', 'lowthres', 'upthres']
     matype = mat.dtype
+
+    print fname + '; Lluis: matype:', matype,'shape:',mat.shape,'opdims:',opdims
 
     if oper.find(',') != -1:
@@ -8721 +8750 @@
     Ndop = len(opdims)
     Ntotdims = np.prod(ldimop)
+    print fname + '; Lluis ldimop:', ldimop, 'Ntotdims:', Ntotdims
 
     # Checking for coincidence in shapes