Changeset 2480 in lmdz_wrf for trunk/tools

Timestamp:

Apr 29, 2019, 5:25:58 PM (7 years ago)

Author:

lfita

Message:

Working version of CFfile_fixTime' and from360d_reg' with negative time values

Location:

trunk/tools

Files:

• generic_tools.py (modified) (2 diffs)
• nc_var_tools.py (modified) (5 diffs)

trunk/tools/generic_tools.py

@@ -16627 +16627 @@
             # Getting year, month and day
             Nyears = int(tvals[it] / dyear)
-            yd = int(refdate[0] + Nyears)
-            jd = tvals[it] - Nyears*dyear
+            if tvals[it] >  0.:
+                yd = int(refdate[0] + Nyears)
+                jd = tvals[it] - Nyears*dyear
+            else:
+                yd = int(refdate[0] + Nyears) - 1
+                jd = 360 + (tvals[it] - Nyears*dyear)
+
             md = int(jd/30) + 1
             dd = int(jd - (md-1)*30)
-
             # Getting hour, minute, second
             tt = jd - int(jd)
+
             tsecs = tt*24.*3600.
             hh = int(tsecs/(3600.))
@@ -16642 +16647 @@
             Nd_regmon = days_month(yd,md)
             dd = int(dd*Nd_regmon/30.)
-            ddt = dt.datetime(yd,md,dd,hh,mi,int(ss)) - inftunits.refdateDT
             juliand = juliandate(yd,md,dd,hh,mi,ss)
-            newtvals[it] = juliand - inftunits.refdatejuliand + 1
+            newtvals[it] = juliand - inftunits.refdatejuliand + 1.
             # Transforming to original units
             newtvals[it] = newtvals[it]/inftunits.utodays

trunk/tools/nc_var_tools.py

@@ -31388 +31388 @@
         lats = np.arange(latSW-ddy2,latNE+ddy2,ddy)
 
-    print 'Lluis shapes lons:', lons.shape, 'lats:', lats.shape
     # Sorting lon/lat_bounds
     lon_bnds = np.zeros((dimx,2), dtype=np.float64)
@@ -31583 +31582 @@
             print '    available ones:', ovar.dimensions
             quit(-1)
-        idimt = ovar.dimensions.index[operation[1]]
+        idimt = ovar.dimensions.index(operation[1])
         dimt = ovarshape[idimt]
-        slices = provide_slices(ovar.dimensions, ovarshape, [operation[1]])
+        slices = gen.provide_slices(ovar.dimensions, ovarshape, [operation[1]])
         minv = gen.typemod(operation[2], ovar.dtype)
         maxv = gen.typemod(operation[3], ovar.dtype)
 
         # First centered values
-        shapecirc = list(ovarshape)
-        shapecirc = shapecirc.pop(idimt)
+        shapecirc = []
+        for iv in range(len(ovarshape)):
+            if iv != idimt: shapecirc.append(ovarshape[iv])
         circ = np.zeros(tuple(shapecirc), dtype=ovar.dtype)
-        if shapecirc == 2:
-            ccircx = circ.shape[1]/2.
-            ccircy = circ.shape[0]/2.
+        rankcirc = len(shapecirc)
+        if rankcirc == 2:
+            dimx = circ.shape[1]
+            dimy = circ.shape[0]
+            ccircx = dimx/2.
+            ccircy = dimy/2.
             norm = np.sqrt(ccircx**2 + ccircy**2)
             for iy in range(dimy):
                 for ix in range(dimx):
                     circ[iy,ix] = np.sqrt((ix*1.-ccircx)**2 + (iy*1.-ccircy)**2)/norm
-        elif shapecirc == 3:
-            ccircx = circ.shape[2]/2.
-            ccircy = circ.shape[1]/2.
-            ccircz = circ.shape[0]/2.
+        elif rankcirc == 3:
+            dimx = circ.shape[2]
+            dimy = circ.shape[1]
+            dimz = circ.shape[0]
+            ccircx = dimx/2.
+            ccircy = dimy/2.
+            ccircz = dimz/2.
             norm = np.sqrt(ccircx**2 + ccircy**2 + ccircz**2)
             for iz in range(dimz):
@@ -31612 +31618 @@
         else:
             print errormsg
-            print '  ' + fname + ": shape of variable without time:", circ.shape, +  \
+            print '  ' + fname + ": rank of variable without time:", circ.shape,     \
               'not ready !!'
             print '   available ones: 2D, 3D'
@@ -31624 +31630 @@
             rangev = np.arange(maxv, minv-dt, dt)
 
-        vals = np.zeros(varshape, dtype=ovar.dtype)
+        vals = np.zeros(ovarshape, dtype=ovar.dtype)
 
         for it in range(dimt): 
-            vals[tuple(slices)] = circ*rangev[it]
+            circv = circ*rangev[it]
+            vals[tuple(slices[it])] = circv[:]
         ovar[:] = vals
 
@@ -31816 +31823 @@
     return
 
-timesv = [56649.5, 56680, 56710.5, 56741, 56771.5, 56802.5, 56833, 56863.5, 56894, 56924.5]
-dimt = len(timesv)
-values='lon|360,lat|180,time|None@' + str(dimt) + ':global'
-varsS='tas#time;lat;lon#f#None,time#time#f8#units|days!since!1850-01-01!00:00:00|S'
-CFfile_creation(values, 'CFtest.nc', varsS)
-fname = 'timev1850-2005.dat'
-of = open(fname, 'w')
-for tv in timesv:
-    of.write(str(tv) + '\n')
-of.close()
-setvar_asciivalues(fname, 'CFtest.nc', 'time')
-fill_varNCfile('random,0.,10.','CFtest.nc','tas')
-
-values="setCalendar;setRefDate,19491201000000;setTunits,hours"
-varaddattr('calendar|noleap', 'CFtest.nc', 'time')
-CFfile_fixTime(values, 'CFtest.nc', 'time')
+#timesv = [56649.5, 56680, 56710.5, 56741, 56771.5, 56802.5, 56833, 56863.5, 56894, 56924.5]
+#timesv = np.arange(15.5,315.5,30.) - 360.
+#dimt = len(timesv)
+#values='lon|360,lat|180,time|None@' + str(dimt) + ':global'
+#varsS='tas#time;lat;lon#f#None,time#time#f8#units|days!since!1850-01-01!00:00:00|S'
+#CFfile_creation(values, 'CFtest.nc', varsS)
+#fname = 'timev1850-2005.dat'
+#of = open(fname, 'w')
+#for tv in timesv:
+#    of.write(str(tv) + '\n')
+#of.close()
+#setvar_asciivalues(fname, 'CFtest.nc', 'time')
+#fill_varNCfile('centeredevol,time,0.,10.','CFtest.nc','tas')
+
+#values="setCalendar;setRefDate,19491201000000;setTunits,hours"
+#varaddattr('calendar|360d', 'CFtest.nc', 'time')
+#CFfile_fixTime(values, 'CFtest.nc', 'time')
 
 #quit()