Changeset 728 in lmdz_wrf for trunk

Timestamp:

Apr 26, 2016, 5:54:36 PM (9 years ago)

Author:

lfita

Message:

Fixing wrong definition of fraction matrices

File:

• trunk/tools/module_ForInterpolate.F90 (modified) (3 diffs)

trunk/tools/module_ForInterpolate.F90

@@ -216 +216 @@
   INTEGER, DIMENSION(Ninpts), INTENT(out)                :: newvarinpt
   REAL(r_k), DIMENSION(Ninpts), INTENT(out)              :: newvarindiff
+
 ! Local
-  INTEGER                                                :: iv
+  INTEGER                                                :: iv,i,j
+  INTEGER                                                :: ierr
   INTEGER, DIMENSION(2)                                  :: ilonlat
   REAL(r_k)                                              :: mindiffLl
@@ -223 +225 @@
   REAL(r_k), DIMENSION(2)                                :: extremelon, extremelat
   REAL(r_k), ALLOCATABLE, DIMENSION(:,:)                 :: fractionlon, fractionlat
-  INTEGER                                                :: fracdx, fracdy
+  INTEGER                                                :: dfracdx, dfracdy, fracdx, fracdy
   CHARACTER(LEN=50)                                      :: fname
 
@@ -246 +248 @@
   extremelat = (/ MINVAL(projlat), MAXVAL(projlat) /)
 
+  PRINT *,'  ' // TRIM(fname) //' fraction:', dimx, ' ,', dimy, ' %', percen
+
+  dfracdx = INT(1./percen)
+  dfracdy = INT(1./percen)
   fracdx = INT(dimx*percen)
   fracdy = INT(dimy*percen)
 
   IF (ALLOCATED(fractionlon)) DEALLOCATE(fractionlon)
-  ALLOCATE(fractionlon(fracdx, fracdy))
+  ALLOCATE(fractionlon(dfracdx, dfracdy), STAT=ierr)
+  IF (ierr /= 0) THEN
+    PRINT *,TRIM(ErrWarnMsg('err'))
+    PRINT *,'  ' // TRIM(fname) //": problem allocating 'fractionlon' !!"
+    STOP
+  END IF
   IF (ALLOCATED(fractionlat)) DEALLOCATE(fractionlat)
-  ALLOCATE(fractionlat(fracdx, fracdy))
-
-  fractionlon = projlon(::fracdx,::fracdy)
-  fractionlat = projlat(::fracdx,::fracdy)
+  ALLOCATE(fractionlat(dfracdx, dfracdy), STAT=ierr)
+  IF (ierr /= 0) THEN
+    PRINT *,TRIM(ErrWarnMsg('err'))
+    PRINT *,'  ' // TRIM(fname) //": problem allocating 'fractionlat' !!"
+    STOP
+  END IF
+
+  DO i=1,dfracdx
+    DO j=1,dfracdy
+      fractionlon(i,j) = projlon(fracdx*(i-1),fracdy*(j-1))
+      fractionlat(i,j) = projlat(fracdx*(i-1),fracdy*(j-1))
+    END DO
+  END DO
+
+  PRINT *,'  ' // TRIM(fname) // ' fractions of:'
+  PRINT *,' lon _______'
+  PRINT *,fractionlon
+  PRINT *,' lat_______'
+  PRINT *,fractionlat
 
   DO iv=1,Ninpts
     IF (newvarinpt(iv) == 0) THEN
       CALL CoarselonlatFind(dimx, dimy, projlon, projlat, extremelon, extremelat, fractionlon,        &
-        fractionlat, lonvs(iv), latvs(iv), percen, fracdx, fracdy, ilonlat, mindiffLl)
+        fractionlat, lonvs(iv), latvs(iv), percen, dfracdx, dfracdy, ilonlat, mindiffLl)
 
       IF (mindiffLl <= mindiff) THEN