Changeset 713 in lmdz_wrf

Timestamp:

Apr 25, 2016, 6:37:18 PM (9 years ago)

Author:

lfita

Message:

Adding percentage of subdomains for the coarse search

File:

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

trunk/tools/nc_var_tools.py

@@ -18770 +18770 @@
 def Partialmap_Entiremap(values, filen, varn):
     """ Function to transform from a partial global map (e.g.: only land points) to an entire one
-      values= [lonmame],[latname],[fillVal],[resolution],[kind],[lonlatProjfile]
+      Coincidence of points is done throughout a first guess from fractions of the total domain of search
+      values= [lonmame],[latname],[fillVal],[resolution],[kind],[lonlatProjfile],[fracd]
         [lonname]: name of the longitude variable
         [latname]: name of the latitude variable
@@ -18785 +18786 @@
          'Goode': Goode projection
         [lonlatProjfile]: file with the lon,lat of the desired projection. 'None' to be computed and written on fly
+        [fracd]: Percentage of the fractions within perform the first guess search
       filen= name of the netCDF file
       varn= name of the variable
@@ -18798 +18800 @@
         quit()
 
-    arguments = '[lonmame],[latname],[fillVal],[resolution],[kind],[lonlatProjfile]'
+    arguments = '[lonmame],[latname],[fillVal],[resolution],[kind],' +               \
+      '[lonlatProjfile],[fracd]'
     check_arguments(fname, values, arguments, ',')
 
@@ -18816 +18819 @@
     kind = values.split(',')[4]
     Projfile = values.split(',')[5]
+    fracd = np.float(values.split(',')[6])
+
     if Projfile == 'None':
         lonlatProjfile = None
@@ -18974 +18979 @@
         else:
             newvar = newnc.createVariable('lon','f8',('lon'))
-        basicvardef(newvar, 'lon', 'Longitudes','degrees East')
+        basicvardef(newvar, 'lon', 'Longitudes','degrees_East')
         newvar[:] = lonmap
         newvar.setncattr('axis', 'X')
@@ -18983 +18988 @@
         else:
             newvar = newnc.createVariable('lat','f8',('lat'))
-        basicvardef(newvar, 'lat', 'Latitudes','degrees North')
+        basicvardef(newvar, 'lat', 'Latitudes','degrees_North')
         newvar[:] = latmap
         newvar.setncattr('axis', 'Y')
@@ -19033 +19038 @@
 #    print fraclat
 
+# Reducing the searching points
+    newvarinvals = newvarinpt[:]
+    maskpt = np.where(newvarinvals.mask == True, False, True)
+    points = np.arange(Ninpts)
+    mapoints = ma.array(points, mask=maskpt)
+    ptsf = mapoints.compressed()
+
+    Nptsf = len(ptsf)
+    print Ninpts,'Npoints to find:', len(ptsf), ptsf[0:10], newvarindiff[ptsf[0:10]]
 # Error at 150024, 150025, 151709, 153421
-    print '  ' + fname + ': re-locating:',Ninpts,'points...'
+    print '  ' + fname + ': from:', Ninpts,'re-locating:',Nptsf,'points...'
     if kind == 'Goode':
-        for iv in range(150024,Ninpts):
+        for iv0 in range(Nptsf):
+            iv = mapoints[ptsf[iv0]]
             if newvarinpt[iv] == 0:
 
@@ -19042 +19057 @@
 #                mindiffLl = np.min(difflonlat)
 #                ilatlon = index_mat(difflonlat, mindiffLl)
-                ilatlon, mindiffLl = CoarselonlatFind(projlon,projlat,lonvs[iv],latvs[iv],.1)
+                ilatlon, mindiffLl = CoarselonlatFind(projlon,projlat,lonvs[iv],latvs[iv],fracd)
 
 #                if ilatlon[0] != ilatlon2[0] or ilatlon[1] != ilatlon2[1]:
@@ -19095 +19110 @@
                         quit(-1)
 
-                if np.mod(iv,100) == 0: 
+                if np.mod(iv,1000) == 0: 
                     newnc.sync()
 #                    print '  ' + fname + 'values localized:', newvar[:].compressed()