Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/cfmip_point_locations.F90

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:

• . (modified) (1 prop)
• libf/phylmd/cfmip_point_locations.F90 (modified) (4 diffs)

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

@@ -34 +34 @@
   USE dimphy
   USE iophy
-  USE mod_grid_phy_lmdz
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo
 
   IMPLICIT none 
-#include "dimensions.h"
   INTEGER :: npCFMIP
   REAL, DIMENSION(npCFMIP) :: lonCFMIP, latCFMIP
@@ -44 +43 @@
   REAL :: dlon1, dlon2
   REAL :: dlat1, dlat2
-  REAL, DIMENSION(iim+1) :: lon
+  REAL, DIMENSION(nbp_lon+1) :: lon
   INTEGER, DIMENSION(npCFMIP) :: tabijGCM
   REAL, DIMENSION(npCFMIP) :: lonGCM, latGCM
 
-  lon(1:iim)=io_lon(:)
-  lon(iim+1)=-1*lon(1)
+  lon(1:nbp_lon)=io_lon(:)
+  lon(nbp_lon+1)=-1*lon(1)
   OPEN(22, file="LMDZ_pointsCFMIP.txt")
   DO np=1, npCFMIP
-  DO i=1, iim
+  DO i=1, nbp_lon
 !
 ! PRINT*,'IM np i lonCF lonGCM lonGCM+1',np,i,lonCFMIP(np),lon(i), &
@@ -85 +84 @@
    ELSE
     j=j+1
-    IF(j.LE.jjm) THEN 
+    IF(j.LE.nbp_lat-1) THEN 
      GOTO 40
     ENDIF
@@ -99 +98 @@
      lonGCM(ip)=lon(ipt(ip))
      latGCM(ip)=io_lat(jpt(ip))
-     if(jpt(ip).GE.2.AND.jpt(ip).LE.jjm) THEN     
-      tabijGCM(ip)=1+(jpt(ip)-2)*iim+ipt(ip)
+     if(jpt(ip).GE.2.AND.jpt(ip).LE.nbp_lat-1) THEN     
+      tabijGCM(ip)=1+(jpt(ip)-2)*nbp_lon+ipt(ip)
      else if(jpt(ip).EQ.1) THEN
       tabijGCM(ip)=1
-     else if(jpt(ip).EQ.jjm+1) THEN
+     else if(jpt(ip).EQ.nbp_lat) THEN
       tabijGCM(ip)=klon_glo
      else