Changeset 730 in lmdz_wrf

Timestamp:

Apr 26, 2016, 9:43:34 PM (9 years ago)

Author:

lfita

Message:

Fixing right matrix indices

Location:

trunk/tools

Files:

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

trunk/tools/module_ForInterpolate.F90

@@ -197 +197 @@
 END SUBROUTINE CoarselonlatFind
 
-SUBROUTINE CoarseInterpolate(inpts, projlon, projlat, lonvs, latvs, percen, mindiff, ivar, newvar,    &
-  newvarin, newvarinpt, newvarindiff, dimx, dimy, Ninpts)
+SUBROUTINE CoarseInterpolate(projlon, projlat, lonvs, latvs, percen, mindiff, ivar, newvar, newvarin, &
+  newvarinpt, newvarindiff, dimx, dimy, Ninpts)
 ! Subroutine which finds the closest grid point within a projection throughout a first guest 
 !   approche from percentages of the whole domain
@@ -210 +210 @@
   REAL(r_k), DIMENSION(dimx,dimy), INTENT(in)            :: projlon, projlat
   INTEGER, INTENT(in)                                    :: Ninpts
-  INTEGER, DIMENSION(Ninpts), INTENT(in)                 :: inpts
   REAL(r_k), DIMENSION(Ninpts), INTENT(in)               :: ivar, lonvs, latvs
   REAL(r_k)                                              :: mindiff, percen
@@ -230 +229 @@
 
 !!!!!!! Variables
-! inpts: relative position of the values to interpolate
 ! dimx, dimy: dimension length of the target interpolation
 ! proj[lon/lat]: longitudes and latitudes of the target interpolation
@@ -301 +299 @@
 
         IF (ilonlat(1) >= 0 .AND. ilonlat(1) >= 0) THEN
-          newvar(ilonlat(1),ilonlat(2)) = ivar(inpts(iv))
-          newvarin(ilonlat(1),ilonlat(2)) = inpts(iv)
-          newvarinpt(inpts(iv)) = 1
-          newvarindiff(inpts(iv)) = mindiffLl
+          newvar(ilonlat(1),ilonlat(2)) = ivar(iv)
+          newvarin(ilonlat(1),ilonlat(2)) = iv
+          newvarinpt(iv) = 1
+          newvarindiff(iv) = mindiffLl
 !          PRINT *,'Lluis iv:', newvarin(ilonlat(1),ilonlat(2)), ' localized:', newvarinpt(iv),        &
 !            ' values:', newvar(ilonlat(1),ilonlat(2)), ' invalues:', ivar(iv), ' mindist:',           &

trunk/tools/nc_var_tools.py

@@ -19740 +19740 @@
             ovars = ovar[iri:ire].astype('float64')
 
-            newvar,newvarin,newvarinpt,newvarindiff =                                \
-              fin.module_forinterpolate.coarseinterpolate(pts, projlon, projlat,     \
+            newvar,newvarin,newvarinpt[pts],newvarindiff[pts] =                      \
+              fin.module_forinterpolate.coarseinterpolate(projlon, projlat,          \
               lonvss, latvss, np.float64(fracd), np.float64(mindiff), ovars)
             newnc.sync()