Changeset 1390 in lmdz_wrf for trunk/tools

Timestamp:

Dec 15, 2016, 4:26:53 PM (8 years ago)

Author:

lfita

Message:

Adding 'shortmon': list of the 12 months with 3-characters length

File:

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

trunk/tools/generic_tools.py

@@ -30 +30 @@
 fillValueF64 = 1.e20
 fillValueI32 = -99999
+
+# 12 Months
+shortmon = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
 
 # For variables_values
@@ -10827 +10830 @@
     return linearwgt
 
-def linearint_3x3weights(xvals, yvals, intval):
+def linearint_3x3weights(xvals, yvals, intval0):
     """ Function to provide the weights for a linear interpolation of a value inside a 3x3 matrix of values as a weighted distance mean
       xvals: 3x3 matrix of x-values
@@ -10857 +10860 @@
     fname = 'linear_wegiths'
 
+    intval = np.array(intval0, dtype=np.float)
+    print 'type xvals:',  xvals.dtype
+
     # Assuming that values come from `vals_around' function (None, when outside matrix size)
     xvalsma = ma.masked_equal(xvals,None)
@@ -10880 +10886 @@
         quit(-1)
 
-    dist = np.sqrt( (xvalsma-intval[1])**2 + (yvalsma-intval[0])**2)
+    print 'Lluis intval:', intval
+    print '  ' + fname + ' Lluis xvalsma ____'
+    print xvalsma
+
+    print '  ' + fname + ' Lluis yvalsma ____'
+    print yvalsma
+
+    dist = np.sqrt( (xvals-intval[1])**2 + (yvals-intval[0])**2)
     inc = np.sum(dist)
     print 'inc:', inc, 'intval', intval
@@ -10909 +10922 @@
             iijj = iijj + 1
 
-    # Normalizing values (onlyl the first 4)
+    # Normalizing values (only the first 4)
     if iijj >= 3:
         inc = np.sum(sortdist[0:4])
@@ -10943 +10956 @@
       yvals= 2D matrix of y-coordinate values
       RETURNS: 
-        curvloc = [2,Npts] matrix with the closest i,j grid point in the 2D space of the field positions
-        curvweights = [3,3,Npts] 3x3 matrix weights around the curve position
+        curvloc= [2,Npts] matrix with the closest i,j grid point in the 2D space of the field positions
+        curvweights= [Npts,3,3] 3x3 matrix weights around the curve position
+        Nwgt= Number of weights
+        ijaorund3x3= [2,9] distance (in xval, yval units) to the curve position
     """
     fname = 'curvelocalize_2D'
@@ -10959 +10974 @@
         mindist = np.min(dist)
         ijloc = index_mat(dist,mindist)
-        iloc[icv] = ijloc[1]
-        jloc[icv] = ijloc[0]
+
+        curvloc[0,icv] = ijloc[0]
+        curvloc[1,icv] = ijloc[1]
 
         # Values around the nearest 2D-point to the curve point
         xaroundvls = vals_around(xvals,ijloc)
         yaroundvls = vals_around(yvals,ijloc)
-
-        curveweights[icv,:,:], Npts, ijaorund3x3= linearint_3x3weights(xvals, yvals, \
-          intval)
+        print 'Lluis type xaroundvls:', type(xaroundvls)
+
+        curveweights[icv,:,:], Nwgt, ijaorund3x3= linearint_3x3weights(xaroundvls,   \
+          yaroundvls, curve[:,icv])
         
- 
-    return
-
-
+    return curvloc, curveweights, Nwgt, ijaround3x3
+
+#lon1d = np.arange(10)
+#lat1d = np.arange(-5,5)
+#dx = lon1d.shape[0]
+#dy = lat1d.shape[0]
+
+#lons = np.zeros((dy,dx), dtype=np.float)
+#lats = np.zeros((dy,dx), dtype=np.float)
+
+#for iy in range(dy):
+#    lons[iy,:] = lon1d
+#for ix in range(dx):
+#    lats[:,ix] = lat1d
+
+#Ncurve = 12
+#iicurve = 0
+#eicurve = dx-1
+#ijcurve = 1
+#ejcurve = dy-3
+#iloncurve = lon1d[iicurve]
+#eloncurve = lon1d[eicurve]
+#ilatcurve = lat1d[ijcurve]
+#elatcurve = lat1d[ejcurve]
+#Dxcurve = (eloncurve-iloncurve)/(Ncurve-1.)
+#Dycurve = (elatcurve-ilatcurve)/(Ncurve-1.)
+
+#curve = np.zeros((2,Ncurve), dtype=np.float)
+#for icv in range(Ncurve):
+#    curve[0,icv] = ilatcurve + Dycurve*icv
+#    curve[1,icv] = iloncurve + Dxcurve*icv
+
+#print 'Curve origin:', ilatcurve, ',', iloncurve
+#print 'Curve ending:', elatcurve, ',', eloncurve
+
+#print curve
+
+#loccurve, wgts, Nwgts, loc3x3 = curvelocalize_2D(curve,lons,lats)
+#print loccurve
 #quit()