Changeset 742 in lmdz_wrf

Timestamp:

May 3, 2016, 12:17:51 PM (9 years ago)

Author:

lfita

Message:

Final seem to work version II

Location:

trunk/tools

Files:

• module_ForInterpolate.F90 (modified) (8 diffs)
• nc_var_tools.py (modified) (4 diffs)

trunk/tools/module_ForInterpolate.F90

@@ -216 +216 @@
   REAL(r_k), INTENT(out)                                 :: mindiffLl
 ! Local
-  INTEGER                                                :: i,j
+  INTEGER                                                :: i
   REAL(r_k), DIMENSION(Nperx,Npery)                      :: difffraclonlat
   REAL(r_k)                                              :: mindifffracLl
@@ -634 +634 @@
   INTEGER                                                :: ierr
   INTEGER, DIMENSION(2)                                  :: ilonlat
-  REAL(r_k), DIMENSION(dimx,dimy)                        :: difflonlat
   REAL(r_k)                                              :: mindiffLl
   INTEGER                                                :: Ninpts1
@@ -743 +742 @@
 END SUBROUTINE CoarseInterpolateExact
 
-SUBROUTINE Interpolate(projlon, projlat, lonvs, latvs, mindiff, ivar, newvarinpt,                     &
-  newvarindiff, ilonlat, dimx, dimy, Ninpts)
+SUBROUTINE Interpolate(projlon, projlat, lonvs, latvs, mindiff, inpt, diffs, ilonlat, dimx, dimy,     &
+  Ninpts)
 ! Subroutine which finds the closest grid point within a projection
 
@@ -755 +754 @@
   REAL(r_k), DIMENSION(dimx,dimy), INTENT(in)            :: projlon, projlat
   INTEGER, INTENT(in)                                    :: Ninpts
-  REAL(r_k), DIMENSION(Ninpts), INTENT(in)               :: ivar, lonvs, latvs
+  REAL(r_k), DIMENSION(Ninpts), INTENT(in)               :: lonvs, latvs
   REAL(r_k), INTENT(in)                                  :: mindiff
-  INTEGER, DIMENSION(Ninpts), INTENT(out)                :: newvarinpt
-  REAL(r_k), DIMENSION(Ninpts), INTENT(out)              :: newvarindiff
+  INTEGER, DIMENSION(Ninpts), INTENT(inout)              :: inpt
+  REAL(r_k), DIMENSION(Ninpts), INTENT(out)              :: diffs
   INTEGER, DIMENSION(Ninpts,2), INTENT(out)              :: ilonlat
 
 ! Local
-  INTEGER                                                :: iv,i,j
-  INTEGER                                                :: ierr
+  INTEGER                                                :: iv
   REAL(r_k)                                              :: mindiffLl
   INTEGER                                                :: Ninpts1
@@ -776 +774 @@
 ! [lon/lat]vs: longitudes and latitudes of the points to interpolate
 ! mindiff: minimal accepted distance to the target point
-! ivar: values to localize in the target projection
-! newvar: localisation of the [lon/lat]vs point in the target projection
-! newvarin: number of point from the input data
-! newvarinpt: integer value indicating if the value has been already located (0: no, 1: yes)
-! newvarindiff: distance of point from the input data to the closest target point
+! inpt: whether the point has already been localized
+! diffs: distance of point from the input data to the closest target point
 ! ilonlat: longitude and latitude of the point
 ! ncid: netCDF output file id
@@ -791 +786 @@
 
   DO iv=1,Ninpts
-    IF (newvarinpt(iv) == 0) THEN
+    IF (inpt(iv) <= 0) THEN
 ! Not using the subroutine, not efficient!
 !      CALL lonlatFind(dimx, dimy, projlon, projlat, extremelon, extremelat, lonvs(iv), latvs(iv),     &
@@ -818 +813 @@
 
         IF (ilonlat(iv,1) >= 0 .AND. ilonlat(iv,2) >= 0) THEN
-          newvarinpt(iv) = 1
-          newvarindiff(iv) = mindiffLl
+          diffs(iv) = mindiffLl
+          inpt(iv) = 1
 !          PRINT *,'Lluis iv:', newvarin(ilonlat(1),ilonlat(2)), ' localized:', newvarinpt(iv),        &
 !            ' values:', newvar(ilonlat(1),ilonlat(2)), ' invalues:', ivar(iv), ' mindist:',           &
@@ -841 +836 @@
         STOP
       END IF
-    ELSE
-      PRINT *,TRIM(ErrWarnMsg('err'))
-      PRINT *,'  ' // TRIM(fname) // ': for point #', iv,' lon,lat in incomplet map:', lonvs(iv),     &
-        ' ,', latvs(iv), ' there is not a set of lon,lat in the completed map closer than: ',         &
-        mindiff, ' !!'
-      PRINT *,'    found minimum difference:', mindiffLl
-      STOP
     END IF
   END DO

trunk/tools/nc_var_tools.py

@@ -10501 +10501 @@
     elif vtype == type(np.int32(1)):
         typeinf = np.iinfo(np.int32)
-        if (abs(np.float64(val)) > typeinf.max):
+        if (np.abs(np.float64(val)) > typeinf.max):
             print warnmsg
             print '  ' + fname + ': value to transform ', val,' overpasses type:',   \
@@ -10508 +10508 @@
             newval = abs(np.float64(val))/np.float64(val) * np.int32(typeinf.max)
         else:
-            newval = np.int32(val)
+            newval = np.int32(np.float64(val))
     elif vtype == type(np.int64(1)):
         newval = np.int64(val)
@@ -20436 +20436 @@
         for ir in range(ptsf[0],Ninpts,fracs):
             iri = ir
-            ire = ir + fracs + 1
+            ire = ir + fracs
             print iri,',',ire
 #            percendone(iri,Ninpts,0.5,'done:')
-            pts = np.arange(iri,ire,1, dtype='int32')
-            lonvss = lonvs[iri:ire].astype('float64')
-            latvss = latvs[iri:ire].astype('float64')
-            ovars = ovar[iri:ire].astype('float64')
+            lonvss = lonvs[iri:ire+1].astype('float64')
+            latvss = latvs[iri:ire+1].astype('float64')
+            inptss = newvarinpt[iri:ire+1].astype('int32')
 
 #            newvar,newvarin,newvarinpt[pts],newvarindiff[pts] =                      \
@@ -20448 +20447 @@
 #              lonvss, latvss, fracd, mindiff, ovars)
 # Slow way
-            newvarinpt[pts],newvarindiff[pts],ilonlatv =                             \
-              fin.module_forinterpolate.interpolate(projlon, projlat,                \
-              lonvss, latvss, np.float64(mindiff), ovars)
+            idiff, ilonlatv = fin.module_forinterpolate.interpolate(projlon, projlat,\
+              lonvss, latvss, np.float64(mindiff), inptss)
             for i in range(fracs):
-#                print 'Lluis: ilonlatv:', ilonlatv[i,:]
-                newvar[ilonlatv[i,1],ilonlatv[i,0]] = ovars[i]
-                newvarin[ilonlatv[i,1],ilonlatv[i,0]] = i
+                newvar[ilonlatv[i,0],ilonlatv[i,1]] = ovar[iri + i]
+                newvarin[ilonlatv[i,0],ilonlatv[i,1]] = iri + i
+                newvarinpt[iri+i] = 1
+                newvarindiff[iri+i] = idiff[i]
+
             newnc.sync()
+#            newnc.close()
+#            quit()
 
     elif kind == 'lonlat':