Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/cfmip_point_locations.F90

    r1910 r2408  
    3434  USE dimphy
    3535  USE iophy
    36   USE mod_grid_phy_lmdz
     36  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo
    3737
    3838  IMPLICIT none
    39 #include "dimensions.h"
    4039  INTEGER :: npCFMIP
    4140  REAL, DIMENSION(npCFMIP) :: lonCFMIP, latCFMIP
     
    4443  REAL :: dlon1, dlon2
    4544  REAL :: dlat1, dlat2
    46   REAL, DIMENSION(iim+1) :: lon
     45  REAL, DIMENSION(nbp_lon+1) :: lon
    4746  INTEGER, DIMENSION(npCFMIP) :: tabijGCM
    4847  REAL, DIMENSION(npCFMIP) :: lonGCM, latGCM
    4948
    50   lon(1:iim)=io_lon(:)
    51   lon(iim+1)=-1*lon(1)
     49  lon(1:nbp_lon)=io_lon(:)
     50  lon(nbp_lon+1)=-1*lon(1)
    5251  OPEN(22, file="LMDZ_pointsCFMIP.txt")
    5352  DO np=1, npCFMIP
    54   DO i=1, iim
     53  DO i=1, nbp_lon
    5554!
    5655! PRINT*,'IM np i lonCF lonGCM lonGCM+1',np,i,lonCFMIP(np),lon(i), &
     
    8584   ELSE
    8685    j=j+1
    87     IF(j.LE.jjm) THEN
     86    IF(j.LE.nbp_lat-1) THEN
    8887     GOTO 40
    8988    ENDIF
     
    9998     lonGCM(ip)=lon(ipt(ip))
    10099     latGCM(ip)=io_lat(jpt(ip))
    101      if(jpt(ip).GE.2.AND.jpt(ip).LE.jjm) THEN     
    102       tabijGCM(ip)=1+(jpt(ip)-2)*iim+ipt(ip)
     100     if(jpt(ip).GE.2.AND.jpt(ip).LE.nbp_lat-1) THEN     
     101      tabijGCM(ip)=1+(jpt(ip)-2)*nbp_lon+ipt(ip)
    103102     else if(jpt(ip).EQ.1) THEN
    104103      tabijGCM(ip)=1
    105      else if(jpt(ip).EQ.jjm+1) THEN
     104     else if(jpt(ip).EQ.nbp_lat) THEN
    106105      tabijGCM(ip)=klon_glo
    107106     else
Note: See TracChangeset for help on using the changeset viewer.