Changeset 2344 for LMDZ5/trunk/libf/phylmd/surf_land_orchidee_mod.F90

Timestamp:

Aug 21, 2015, 9:23:13 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Physics/dynamics separation: get rid of all the 'include "temps.h"' in the physics; variables in module time_phylmdz_mod must be used instead. Also added JD_cur, JH_cur and JD_ref in module phys_cal_mod, in preparation for having physics handle its calendar internally.
EM

File:

• LMDZ5/trunk/libf/phylmd/surf_land_orchidee_mod.F90 (modified) (10 diffs)

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -46 +46 @@
     USE indice_sol_mod
     USE print_control_mod, ONLY: lunout
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
 !    
 ! Cette routine sert d'interface entre le modele atmospherique et le 
@@ -98 +99 @@
 !   qsurf        air moisture at surface
 !
-    INCLUDE "temps.h"
     INCLUDE "YOMCST.h"
-    INCLUDE "dimensions.h"
   
 !
@@ -229 +228 @@
        DO igrid = 2, klon - 1
           indi = indi + 1
-          IF ( indi > iim) THEN
+          IF ( indi > nbp_lon) THEN
              indi = 1
              indj = indj + 1
@@ -237 +236 @@
        ENDDO
        ig(klon) = 1
-       jg(klon) = jjm + 1
+       jg(klon) = nbp_lat
 
        IF ((.NOT. ALLOCATED(lalo))) THEN
@@ -247 +246 @@
        ENDIF
        IF ((.NOT. ALLOCATED(lon_scat))) THEN
-          ALLOCATE(lon_scat(iim,jjm+1), stat = error)
+          ALLOCATE(lon_scat(nbp_lon,nbp_lat), stat = error)
           IF (error /= 0) THEN
              abort_message='Pb allocation lon_scat'
@@ -254 +253 @@
        ENDIF
        IF ((.NOT. ALLOCATED(lat_scat))) THEN
-          ALLOCATE(lat_scat(iim,jjm+1), stat = error)
+          ALLOCATE(lat_scat(nbp_lon,nbp_lat), stat = error)
           IF (error /= 0) THEN
              abort_message='Pb allocation lat_scat'
@@ -275 +274 @@
        IF (is_mpi_root) THEN
           index = 1
-          DO jj = 2, jjm
-             DO ij = 1, iim
+          DO jj = 2, nbp_lat-1
+             DO ij = 1, nbp_lon
                 index = index + 1
                 lon_scat(ij,jj) = rlon_g(index)
@@ -284 +283 @@
           lon_scat(:,1) = lon_scat(:,2)
           lat_scat(:,1) = rlat_g(1)
-          lon_scat(:,jjm+1) = lon_scat(:,2)
-          lat_scat(:,jjm+1) = rlat_g(klon_glo)
+          lon_scat(:,nbp_lat) = lon_scat(:,2)
+          lat_scat(:,nbp_lat) = rlat_g(klon_glo)
        ENDIF
    
@@ -395 +394 @@
 
 #ifdef CPP_VEGET
-          CALL intersurf_main (itime+itau_phy-1, iim, jjm+1, knon, ktindex, dtime, &
+          CALL intersurf_main (itime+itau_phy-1, nbp_lon, nbp_lat, knon, ktindex, dtime, &
                lrestart_read, lrestart_write, lalo, &
                contfrac, neighbours, resolution, date0, &
@@ -419 +418 @@
     IF (knon > 0) THEN
 #ifdef CPP_VEGET    
-       CALL intersurf_main (itime+itau_phy, iim, jjm+1, knon, ktindex, dtime,  &
+       CALL intersurf_main (itime+itau_phy, nbp_lon, nbp_lat, knon, ktindex, dtime,  &
             lrestart_read, lrestart_write, lalo, &
             contfrac, neighbours, resolution, date0, &