Changeset 1900 in lmdz_wrf

Timestamp:

Apr 9, 2018, 5:26:45 PM (7 years ago)

Author:

lfita

Message:

Making use of advance_matdate' in CFmorizization'

File:

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

trunk/tools/nc_var_tools.py

@@ -22908 +22908 @@
         dtbnds = quantity * 100 * 365 * 24 * 3600.
         begTBmat = [int(begTmat[0]/100)*100, 1, 1, 0, 0, 0]
-        endTBmat = [int(endTmat[0]/100)*100+100, 1, 1, 0, 0, 0]
+        endTBmat = gen.advance_matDate([int(endTmat[0]/100)*100,1,1,0,0,0],          \
+          [100,0,0,0,0,0])
         dTBmat = [quantity*100, 0, 0, 0, 0, 0]
     elif tunit == 'y':
@@ -22921 +22922 @@
         emo = endTmat[1]
         begTBmat = [begTmat[0], begTmat[1], 1, 0, 0, 0]
+        endTBmat = gen.advance_matDate([endTmat[0],endTmat[1],1,0,0,0], [0,1,0,0,0,0])
         endTBmat = [endTmat[0], endTmat[1]+1, 1, 0, 0, 0]
         dTBmat = [0, quantity, 0, 0, 0, 0]
@@ -22926 +22928 @@
         dtbnds = quantity * 7 * 24 * 3600.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], 0, 0, 0]
-        endTBmat = [endTmat[0], endTmat[1], endTmat[2]+7, 0, 0, 0]
+        endTBmat = gen.advance_matDate([endTmat[0],endTmat[1],endTmat[2],0,0,0],     \
+          [0,0,7,0,0,0])
         dTBmat = [0, 0, quantity*7, 0, 0, 0]
     elif tunit == 'd':
         dtbnds = quantity * 24 * 3600.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], 0, 0, 0]
-        endTBmat = [endTmat[0], endTmat[1], endTmat[2]+1, 0, 0, 0]
+        endTBmat = gen.advance_matDate([endTmat[0],endTmat[1],endTmat[2],0,0,0],     \
+          [0,0,1,0,0,0])
         dTBmat = [0, 0, quantity, 0, 0, 0]
     elif tunit == 'h':
         dtbnds = quantity * 3600.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], begTmat[3], 0, 0]
-        endTBmat = [endTmat[0], endTmat[1], endTmat[2], endTmat[3]+1, 0, 0]
+        endTBmat=gen.advance_matDate([endTmat[0],endTmat[1],endTmat[2],endTmat[3],0, \
+          0], [0,0,0,1,0,0])
         dTBmat = [0, 0, 0, quantity, 0, 0]
     elif tunit == 'i':
         dtbnds = quantity * 60.
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], begTmat[3], begTmat[4], 0]
-        endTBmat = [endTmat[0], endTmat[1], endTmat[2], endTmat[3], endTmat[4]+1, 0]
+        endTBmat = gen.advance_matDate([endTmat[0],endTmat[1],endTmat[2],endTmat[3], \
+          endTmat[4],0], [0,0,0,0,1,0])
         dTBmat = [0, 0, 0, 0, quantity, 0]
     elif tunit == 's':
@@ -22947 +22953 @@
         begTBmat = [begTmat[0], begTmat[1], begTmat[2], begTmat[3], begTmat[4],      \
           begTmat[5]]
-        endTBmat = [endTmat[0], endTmat[1], endTmat[2], endTmat[3], endTmat[4],      \
-          endTmat[5]+1]
+        endTBmat = gen.advance_matDate([endTmat[0],endTmat[1],endTmat[2],endTmat[3], \
+          endTmat[4],endTmat[5]], [0,0,0,0,0,1])
         dTBmat = [0, 0, 0, 0, 0, quantity]
     else: