Changeset 768 in lmdz_wrf

Timestamp:

May 10, 2016, 3:34:25 PM (9 years ago)

Author:

lfita

Message:

Getting there

• Starting from the last localized point in 'lonlatfrac'

Location:

trunk/tools

Files:

• module_ForInterpolate.F90 (modified) (1 diff)
• nc_var_tools.py (modified) (6 diffs)

trunk/tools/module_ForInterpolate.F90

@@ -893 +893 @@
 !        percendone(iv,Ninpts,0.5,'done:')
 
-        IF (ilonlat(iv,1) >= 0 .AND. ilonlat(iv,2) >= 0) THEN
+        IF (ilonlat(iv,1) >= 1 .AND. ilonlat(iv,2) >= 1) THEN
           diffs(iv) = mindiffLl
           inpt(iv) = 1

trunk/tools/nc_var_tools.py

@@ -13901 +13901 @@
         else:
             newvar = newnc.createVariable('lon','f8',('lon'))
-        basicvardef(newvar, 'lon', 'Longitudes','degrees_East')
+        basicvardef(newvar, 'longitude', 'Longitude','degrees_East')
         newvar[:] = lonmap
         newvar.setncattr('axis', 'X')
@@ -13910 +13910 @@
         else:
             newvar = newnc.createVariable('lat','f8',('lat'))
-        basicvardef(newvar, 'lat', 'Latitudes','degrees_North')
+        basicvardef(newvar, 'latitude', 'Latitude','degrees_North')
         newvar[:] = latmap
         newvar.setncattr('axis', 'Y')
@@ -13921 +13921 @@
         basicvardef(newvarindiff, 'locindiff', 'distance between input point and ' + \
           'its final location','degree')
-        set_attributek(newvar,'authorized_minimum_distance',mindiff,'R')
+        set_attributek(newvarindiff,'authorized_minimum_distance',mindiff,'R')
 
 # map variable
@@ -13958 +13958 @@
 
         newvar.setncattr('coordinates', 'lon lat')
+        newvarin.setncattr('coordinates', 'lon lat')
 
     else:
@@ -13991 +13992 @@
     Nptsf = len(ptsf)
     print Ninpts,'Npoints to find:', len(ptsf), ptsf[0:10], newvarindiff[ptsf[0:10]]
+    ipoint = ptsf[0]
+    Ninpts=np.min([Nsearchpt, Ninpts-ipoint])
 # Error at 150024, 150025, 151709, 153421
     print '  ' + fname + ': from:', Ninpts,'re-locating:',Nptsf,'points...'
@@ -14052 +14055 @@
             idiff, ilonlatv = fin.module_forinterpolate.interpolate1dll(projlon,     \
               projlat, lonvss, latvss, np.float64(mindiff), inptss)
+# Fortran routine provides ranges from 1,dimx!
+            ilonlatv = ilonlatv - 1
 
             for i in range(np.min([len(idiff),fracs])):