Changeset 3819

Timestamp:

Apr 22, 2015, 6:28:50 PM (10 years ago)

Author:

ymipsl

Message:

Removed all iim et jjm depedency. Replaced by nbp_lon and nbp_lat.
Supress gr_fi_ecrit, replaced by grid1dTo2d_glo

YM

Location:

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Files:

• cfmip_point_locations.F90 (modified) (4 diffs)
• cpl_mod.F90 (modified) (33 diffs)
• ini_bilKP_ave.h (modified) (1 diff)
• ini_bilKP_ins.h (modified) (1 diff)
• ini_histday_seri.h (modified) (2 diffs)
• ini_paramLMDZ_phy.h (modified) (2 diffs)
• iophy.F90 (modified) (43 diffs)
• o3_chem_m.F90 (modified) (10 diffs)
• pbl_surface_mod.F90 (modified) (2 diffs)
• phys_output_mod.F90 (modified) (6 diffs)
• phys_output_write_mod.F90 (modified) (5 diffs)
• physiq.F90 (modified) (3 diffs)
• readaerosol.F90 (modified) (11 diffs)
• readaerosol_interp.F90 (modified) (1 diff)
• readaerosolstrato.F90 (modified) (4 diffs)
• readchlorophyll.F90 (modified) (3 diffs)
• regr_lat_time_climoz_m.F90 (modified) (12 diffs)
• regr_lat_time_coefoz_m.F90 (modified) (10 diffs)
• regr_pr_av_m.F90 (modified) (6 diffs)
• regr_pr_comb_coefoz_m.F90 (modified) (7 diffs)
• regr_pr_int_m.F90 (modified) (8 diffs)
• regr_pr_o3_m.F90 (modified) (7 diffs)
• thermcell_old.F90 (modified) (1 diff)
• write_bilKP_ave.h (modified) (3 diffs)
• write_bilKP_ins.h (modified) (4 diffs)
• write_histday_seri.h (modified) (9 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/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 

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cpl_mod.F90

@@ -103 +103 @@
     USE surface_data
     USE indice_sol_mod
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat, grid1dTo2d_glo
    ! USE temps_phy_mod
     USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy, itaufin, lunout
-    INCLUDE "dimensions.h"
 
 ! Input arguments
@@ -121 +121 @@
     INTEGER                           :: npas ! only for OASIS2
     REAL                              :: zjulian
-    REAL, DIMENSION(iim,jjm+1)        :: zx_lon, zx_lat
+    REAL, DIMENSION(nbp_lon,nbp_lat)        :: zx_lon, zx_lat
     CHARACTER(len = 20)               :: modname = 'cpl_init'
     CHARACTER(len = 80)               :: abort_message
@@ -172 +172 @@
     ALLOCATE(cpl_taumod(klon,2), stat = error)
     sum_error = sum_error + error
-    ALLOCATE(cpl_rriv2D(iim,jj_nb), stat=error)
-    sum_error = sum_error + error
-    ALLOCATE(cpl_rcoa2D(iim,jj_nb), stat=error)
-    sum_error = sum_error + error
-    ALLOCATE(cpl_rlic2D(iim,jj_nb), stat=error)
-    sum_error = sum_error + error
-    ALLOCATE(read_sst(iim, jj_nb), stat = error)
-    sum_error = sum_error + error
-    ALLOCATE(read_sic(iim, jj_nb), stat = error)
-    sum_error = sum_error + error
-    ALLOCATE(read_sit(iim, jj_nb), stat = error)
-    sum_error = sum_error + error
-    ALLOCATE(read_alb_sic(iim, jj_nb), stat = error)
-    sum_error = sum_error + error
-    ALLOCATE(read_u0(iim, jj_nb), stat = error)
-    sum_error = sum_error + error
-    ALLOCATE(read_v0(iim, jj_nb), stat = error)
+    ALLOCATE(cpl_rriv2D(nbp_lon,jj_nb), stat=error)
+    sum_error = sum_error + error
+    ALLOCATE(cpl_rcoa2D(nbp_lon,jj_nb), stat=error)
+    sum_error = sum_error + error
+    ALLOCATE(cpl_rlic2D(nbp_lon,jj_nb), stat=error)
+    sum_error = sum_error + error
+    ALLOCATE(read_sst(nbp_lon, jj_nb), stat = error)
+    sum_error = sum_error + error
+    ALLOCATE(read_sic(nbp_lon, jj_nb), stat = error)
+    sum_error = sum_error + error
+    ALLOCATE(read_sit(nbp_lon, jj_nb), stat = error)
+    sum_error = sum_error + error
+    ALLOCATE(read_alb_sic(nbp_lon, jj_nb), stat = error)
+    sum_error = sum_error + error
+    ALLOCATE(read_u0(nbp_lon, jj_nb), stat = error)
+    sum_error = sum_error + error
+    ALLOCATE(read_v0(nbp_lon, jj_nb), stat = error)
     sum_error = sum_error + error
 
     IF (carbon_cycle_cpl) THEN
-       ALLOCATE(read_co2(iim, jj_nb), stat = error)
+       ALLOCATE(read_co2(nbp_lon, jj_nb), stat = error)
        sum_error = sum_error + error
        ALLOCATE(cpl_atm_co2(klon,2), stat = error)
@@ -230 +230 @@
        idayref = day_ini
        CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
-       CALL gr_fi_ecrit(1,klon,iim,jjm+1,rlon,zx_lon)
-       DO i = 1, iim
+       CALL grid1dTo2d_glo(rlon,zx_lon)
+       DO i = 1, nbp_lon
           zx_lon(i,1) = rlon(i+1)
-          zx_lon(i,jjm+1) = rlon(i+1)
+          zx_lon(i,nbp_lat) = rlon(i+1)
        ENDDO
-       CALL gr_fi_ecrit(1,klon,iim,jjm+1,rlat,zx_lat)
+       CALL grid1dTo2d_glo(rlat,zx_lat)
        clintocplnam="cpl_atm_tauflx"
-       CALL histbeg(clintocplnam, iim,zx_lon(:,1),jjm+1,zx_lat(1,:),&
-            1,iim,1,jjm+1, itau_phy,zjulian,dtime,nhoridct,nidct) 
+       CALL histbeg(clintocplnam, nbp_lon,zx_lon(:,1),nbp_lat,zx_lat(1,:),&
+            1,nbp_lon,1,nbp_lat, itau_phy,zjulian,dtime,nhoridct,nidct) 
 ! no vertical axis
        CALL histdef(nidct, 'tauxe','tauxe', &
-            "-",iim, jjm+1, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
+            "-",nbp_lon, nbp_lat, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
        CALL histdef(nidct, 'tauyn','tauyn', &
-            "-",iim, jjm+1, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
+            "-",nbp_lon, nbp_lat, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
        CALL histdef(nidct, 'tmp_lon','tmp_lon', &
-            "-",iim, jjm+1, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
+            "-",nbp_lon, nbp_lat, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
        CALL histdef(nidct, 'tmp_lat','tmp_lat', &
-            "-",iim, jjm+1, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
+            "-",nbp_lon, nbp_lat, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
        DO jf=1,maxsend
          IF (infosend(i)%action) THEN
              CALL histdef(nidct, infosend(i)%name ,infosend(i)%name , &
-                "-",iim, jjm+1, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
+                "-",nbp_lon, nbp_lat, nhoridct, 1, 1, 1, -99, 32, "inst", dtime,dtime)
          ENDIF
        END DO
@@ -258 +258 @@
        
        clfromcplnam="cpl_atm_sst"
-       CALL histbeg(clfromcplnam, iim,zx_lon(:,1),jjm+1,zx_lat(1,:),1,iim,1,jjm+1, &
+       CALL histbeg(clfromcplnam, nbp_lon,zx_lon(:,1),nbp_lat,zx_lat(1,:),1,nbp_lon,1,nbp_lat, &
             0,zjulian,dtime,nhoridcs,nidcs) 
 ! no vertical axis
@@ -264 +264 @@
          IF (inforecv(i)%action) THEN
              CALL histdef(nidcs,inforecv(i)%name ,inforecv(i)%name , &
-                "-",iim, jjm+1, nhoridcs, 1, 1, 1, -99, 32, "inst", dtime,dtime)
+                "-",nbp_lon, nbp_lat, nhoridcs, 1, 1, 1, -99, 32, "inst", dtime,dtime)
          ENDIF
        END DO
@@ -299 +299 @@
   !  USE temps_phy_mod
     USE inifis_mod, ONLY: start_time, itau_phy
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     
     INCLUDE "YOMCST.h"
-    INCLUDE "dimensions.h"
-
 ! Arguments
 !************************************************************************************
@@ -314 +313 @@
     INTEGER                                 :: j, i, time_sec
     INTEGER                                 :: itau_w
-    INTEGER, DIMENSION(iim*(jjm+1))         :: ndexcs
+    INTEGER, DIMENSION(nbp_lon*nbp_lat)    :: ndexcs
     CHARACTER(len = 20)                     :: modname = 'cpl_receive_frac'
     CHARACTER(len = 80)                     :: abort_message
     REAL, DIMENSION(klon)                   :: read_sic1D
-    REAL, DIMENSION(iim,jj_nb,maxrecv)      :: tab_read_flds
+    REAL, DIMENSION(nbp_lon,jj_nb,maxrecv)  :: tab_read_flds
     REAL, DIMENSION(klon,nbsrf)             :: pctsrf_old
     REAL, DIMENSION(klon_mpi)               :: rlon_mpi, rlat_mpi
-    REAL, DIMENSION(iim, jj_nb)             :: tmp_lon, tmp_lat
-    REAL, DIMENSION(iim, jj_nb)             :: tmp_r0
+    REAL, DIMENSION(nbp_lon, jj_nb)         :: tmp_lon, tmp_lat
+    REAL, DIMENSION(nbp_lon, jj_nb)         :: tmp_r0
 
 !*************************************************************************************
@@ -349 +348 @@
           DO i = 1, maxrecv
             IF (inforecv(i)%action) THEN
-                CALL histwrite(nidcs,inforecv(i)%name,itau_w,tab_read_flds(:,:,i),iim*(jjm+1),ndexcs)
+                CALL histwrite(nidcs,inforecv(i)%name,itau_w,tab_read_flds(:,:,i),nbp_lon*nbp_lat,ndexcs)
             ENDIF
           END DO
@@ -374 +373 @@
 ! Transform the currents from cartesian to spheric coordinates
 ! tmp_r0 should be zero
-          CALL geo2atm(iim, jj_nb, tab_read_flds(:,:,idr_curenx), &
+          CALL geo2atm(nbp_lon, jj_nb, tab_read_flds(:,:,idr_curenx), &
              tab_read_flds(:,:,idr_cureny), tab_read_flds(:,:,idr_curenz), &
                tmp_lon, tmp_lat, &
@@ -543 +542 @@
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
     USE indice_sol_mod
-    INCLUDE "dimensions.h"
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 
 ! Input arguments
@@ -636 +635 @@
        IF (.NOT. ALLOCATED(cpl_sols2D)) THEN
           sum_error = 0
-          ALLOCATE(cpl_sols2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_nsol2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_rain2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_snow2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_evap2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_tsol2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_fder2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_albe2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_taux2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_tauy2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_windsp2D(iim,jj_nb), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_taumod2D(iim,jj_nb,2), stat=error)
+          ALLOCATE(cpl_sols2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_nsol2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_rain2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_snow2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_evap2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_tsol2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_fder2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_albe2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_taux2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_tauy2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_windsp2D(nbp_lon,jj_nb), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_taumod2D(nbp_lon,jj_nb,2), stat=error)
           sum_error = sum_error + error
           
           IF (carbon_cycle_cpl) THEN
-             ALLOCATE(cpl_atm_co22D(iim,jj_nb), stat=error)
+             ALLOCATE(cpl_atm_co22D(nbp_lon,jj_nb), stat=error)
              sum_error = sum_error + error
           END IF
@@ -734 +733 @@
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
     USE indice_sol_mod
-    INCLUDE "dimensions.h"
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 
 ! Input arguments
@@ -821 +820 @@
        IF (.NOT. ALLOCATED(cpl_sols2D)) THEN
           sum_error = 0
-          ALLOCATE(cpl_sols2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_nsol2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_rain2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_snow2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_evap2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_tsol2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_fder2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_albe2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_taux2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_tauy2D(iim,jj_nb,2), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_windsp2D(iim,jj_nb), stat=error)
-          sum_error = sum_error + error
-          ALLOCATE(cpl_taumod2D(iim,jj_nb,2), stat=error)
+          ALLOCATE(cpl_sols2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_nsol2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_rain2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_snow2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_evap2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_tsol2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_fder2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_albe2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_taux2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_tauy2D(nbp_lon,jj_nb,2), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_windsp2D(nbp_lon,jj_nb), stat=error)
+          sum_error = sum_error + error
+          ALLOCATE(cpl_taumod2D(nbp_lon,jj_nb,2), stat=error)
           sum_error = sum_error + error
 
           IF (carbon_cycle_cpl) THEN
-             ALLOCATE(cpl_atm_co22D(iim,jj_nb), stat=error)
+             ALLOCATE(cpl_atm_co22D(nbp_lon,jj_nb), stat=error)
              sum_error = sum_error + error
           END IF
@@ -914 +913 @@
 ! (it is done in cpl_send_seaice_fields).
 !
-    INCLUDE "dimensions.h"
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 
 ! Input arguments
@@ -926 +925 @@
 ! Local variables
 !*************************************************************************************
-    REAL, DIMENSION(iim,jj_nb)             :: rriv2D
-    REAL, DIMENSION(iim,jj_nb)             :: rcoa2D
+    REAL, DIMENSION(nbp_lon,jj_nb)             :: rriv2D
+    REAL, DIMENSION(nbp_lon,jj_nb)             :: rcoa2D
 
 !*************************************************************************************
@@ -968 +967 @@
 
   SUBROUTINE cpl_send_landice_fields(itime, knon, knindex, rlic_in)
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 ! This subroutine cumulates the field for melting ice for each time-step 
 ! during a coupling period. This routine will not send to coupler. Sending 
 ! will be done in cpl_send_seaice_fields.
 !
-
-    INCLUDE "dimensions.h"
 
 ! Input varibales
@@ -984 +982 @@
 ! Local varibales
 !*************************************************************************************
-    REAL, DIMENSION(iim,jj_nb)             :: rlic2D
+    REAL, DIMENSION(nbp_lon,jj_nb)             :: rlic2D
 
 !*************************************************************************************
@@ -1033 +1031 @@
 ! Some includes
 !*************************************************************************************
-    INCLUDE "dimensions.h"
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     
 ! Input arguments
@@ -1048 +1046 @@
     INTEGER                                              :: itau_w
     INTEGER                                              :: time_sec
-    INTEGER, DIMENSION(iim*(jjm+1))                      :: ndexct
+    INTEGER, DIMENSION(nbp_lon*nbp_lat)                  :: ndexct
     REAL                                                 :: Up, Down
-    REAL, DIMENSION(iim, jj_nb)                          :: tmp_lon, tmp_lat
-    REAL, DIMENSION(iim, jj_nb, 4)                       :: pctsrf2D
-    REAL, DIMENSION(iim, jj_nb)                          :: deno
+    REAL, DIMENSION(nbp_lon, jj_nb)                      :: tmp_lon, tmp_lat
+    REAL, DIMENSION(nbp_lon, jj_nb, 4)                   :: pctsrf2D
+    REAL, DIMENSION(nbp_lon, jj_nb)                      :: deno
     CHARACTER(len = 20)                                  :: modname = 'cpl_send_all'
     CHARACTER(len = 80)                                  :: abort_message
    
 ! Variables with fields to coupler
-    REAL, DIMENSION(iim, jj_nb)                          :: tmp_taux
-    REAL, DIMENSION(iim, jj_nb)                          :: tmp_tauy
-    REAL, DIMENSION(iim, jj_nb)                          :: tmp_calv
+    REAL, DIMENSION(nbp_lon, jj_nb)                      :: tmp_taux
+    REAL, DIMENSION(nbp_lon, jj_nb)                      :: tmp_tauy
+    REAL, DIMENSION(nbp_lon, jj_nb)                      :: tmp_calv
 ! Table with all fields to send to coupler
-    REAL, DIMENSION(iim, jj_nb, maxsend)                 :: tab_flds
+    REAL, DIMENSION(nbp_lon, jj_nb, maxsend)             :: tab_flds
     REAL, DIMENSION(klon_mpi)                            :: rlon_mpi, rlat_mpi
 
@@ -1115 +1113 @@
 
       DO j = 1, jj_nb
-         tmp_calv(:,j) = DOT_PRODUCT (cpl_rlic2D(1:iim,j), &
-              pctsrf2D(1:iim,j,is_lic)) / REAL(iim)
+         tmp_calv(:,j) = DOT_PRODUCT (cpl_rlic2D(1:nbp_lon,j), &
+              pctsrf2D(1:nbp_lon,j,is_lic)) / REAL(nbp_lon)
       ENDDO
     
@@ -1136 +1134 @@
          
          IF (.NOT. is_north_pole .AND. ii_begin /=1) THEN
-            Up=Up+tmp_calv(iim,1)
+            Up=Up+tmp_calv(nbp_lon,1)
             tmp_calv(:,1)=Up
          ENDIF
          
-         IF (.NOT. is_south_pole .AND. ii_end /= iim) THEN
+         IF (.NOT. is_south_pole .AND. ii_end /= nbp_lon) THEN
             Down=Down+tmp_calv(1,jj_nb)
             tmp_calv(:,jj_nb)=Down       
@@ -1229 +1227 @@
     IF (is_sequential) THEN
        IF (is_north_pole) tmp_lon(:,1)     = tmp_lon(:,2)
-       IF (is_south_pole) tmp_lon(:,jjm+1) = tmp_lon(:,jjm)
+       IF (is_south_pole) tmp_lon(:,nbp_lat) = tmp_lon(:,nbp_lat-1)
     ENDIF
       
@@ -1236 +1234 @@
        ndexct(:) = 0
        itau_w = itau_phy + itime + start_time * day_step / iphysiq
-       CALL histwrite(nidct,'tauxe',itau_w,tmp_taux,iim*(jjm+1),ndexct)
-       CALL histwrite(nidct,'tauyn',itau_w,tmp_tauy,iim*(jjm+1),ndexct)
-       CALL histwrite(nidct,'tmp_lon',itau_w,tmp_lon,iim*(jjm+1),ndexct)
-       CALL histwrite(nidct,'tmp_lat',itau_w,tmp_lat,iim*(jjm+1),ndexct)
+       CALL histwrite(nidct,'tauxe',itau_w,tmp_taux,nbp_lon*nbp_lat,ndexct)
+       CALL histwrite(nidct,'tauyn',itau_w,tmp_tauy,nbp_lon*nbp_lat,ndexct)
+       CALL histwrite(nidct,'tmp_lon',itau_w,tmp_lon,nbp_lon*nbp_lat,ndexct)
+       CALL histwrite(nidct,'tmp_lat',itau_w,tmp_lat,nbp_lon*nbp_lat,ndexct)
     ENDIF
 
@@ -1245 +1243 @@
 ! cartesian 3D coordinates 
 !$OMP MASTER
-    CALL atm2geo (iim, jj_nb, tmp_taux, tmp_tauy, tmp_lon, tmp_lat, &
+    CALL atm2geo (nbp_lon, jj_nb, tmp_taux, tmp_tauy, tmp_lon, tmp_lat, &
          tab_flds(:,:,ids_tauxxu), tab_flds(:,:,ids_tauyyu), tab_flds(:,:,ids_tauzzu) )
     
@@ -1260 +1258 @@
         DO j=1,maxsend
           IF (infosend(j)%action) CALL histwrite(nidct,infosend(j)%name, itau_w, &
-             tab_flds(:,:,j),iim*(jjm+1),ndexct)
+             tab_flds(:,:,j),nbp_lon*nbp_lat,ndexct)
         ENDDO
     ENDIF
@@ -1302 +1300 @@
   SUBROUTINE cpl2gath(champ_in, champ_out, knon, knindex)
   USE mod_phys_lmdz_para
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 ! Cette routine transforme un champs de la grille 2D recu du coupleur sur la grille 
 ! 'gathered' (la grille physiq comprime).
@@ -1314 +1313 @@
 !   champ_out    champ sur la grille 'gatherd'
 !
-    INCLUDE "dimensions.h"
 
 ! Input
-    INTEGER, INTENT(IN)                       :: knon
-    REAL, DIMENSION(iim,jj_nb), INTENT(IN)    :: champ_in
-    INTEGER, DIMENSION(klon), INTENT(IN)      :: knindex
+    INTEGER, INTENT(IN)                        :: knon
+    REAL, DIMENSION(nbp_lon,jj_nb), INTENT(IN) :: champ_in
+    INTEGER, DIMENSION(klon), INTENT(IN)       :: knindex
 
 ! Output
@@ -1333 +1331 @@
     
 
-! Transform from 2 dimensions (iim,jj_nb) to 1 dimension (klon)
+! Transform from 2 dimensions (nbp_lon,jj_nb) to 1 dimension (klon)
 !$OMP MASTER 
     CALL Grid2Dto1D_mpi(champ_in,temp_mpi)
@@ -1352 +1350 @@
   SUBROUTINE gath2cpl(champ_in, champ_out, knon, knindex)
   USE mod_phys_lmdz_para
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 ! Cette routine ecrit un champ 'gathered' sur la grille 2D pour le passer
 ! au coupleur.
@@ -1363 +1362 @@
 !   champ_out    champ sur la grille 2D
 !
-    INCLUDE "dimensions.h"
     
 ! Input arguments
@@ -1373 +1371 @@
 ! Output arguments
 !*************************************************************************************
-    REAL, DIMENSION(iim,jj_nb), INTENT(OUT) :: champ_out
+    REAL, DIMENSION(nbp_lon,jj_nb), INTENT(OUT) :: champ_out
 
 ! Local variables
@@ -1389 +1387 @@
     ENDDO
 
-! Transform from 1 dimension (klon) to 2 dimensions (iim,jj_nb)
+! Transform from 1 dimension (klon) to 2 dimensions (nbp_lon,jj_nb)
     CALL gather_omp(temp_omp,temp_mpi)
 

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_bilKP_ave.h

@@ -11 +11 @@
          CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 c
-cym         CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon,zx_lon)
-cym         DO i = 1, iim
-cym            zx_lon(i,1) = rlon(i+1)
-cym            zx_lon(i,jjmp1) = rlon(i+1)
-cym         ENDDO
          DO ll=1,klev
             znivsig(ll)=REAL(ll)
          ENDDO
-cym         CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat,zx_lat)
-cym         write(*,*)'zx_lon = ',zx_lon(:,1)
-cym         write(*,*)'zx_lat = ',zx_lat(1,:)
-cym         CALL histbeg("histbilKP_ave", iim,zx_lon(:,1), jjmp1,
-cym     .                zx_lat(1,:),
-cym     .                1,iim,1,jjmp1, itau_phy, zjulian, dtime,
-cym     .                nhori, nid_bilKPave)
          CALL histbeg_phy("histbilKP_ave", itau_phy, zjulian, dtime,
      .                nhori, nid_bilKPave)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_bilKP_ins.h

@@ -11 +11 @@
          CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 c
-cym         CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon,zx_lon)
-cym         DO i = 1, iim
-cym            zx_lon(i,1) = rlon(i+1)
-cym            zx_lon(i,jjmp1) = rlon(i+1)
-cym         ENDDO
          DO ll=1,klev
             znivsig(ll)=REAL(ll)
          ENDDO
-cym         CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat,zx_lat)
-cym         write(*,*)'zx_lon = ',zx_lon(:,1)
-cym         write(*,*)'zx_lat = ',zx_lat(1,:)
 c
 cIM 280405 BEG

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_histday_seri.h

@@ -13 +13 @@
          CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 !
-         CALL gr_fi_ecrit(1,klon,nbp_lon,jjmp1,rlon,zx_lon)
+         CALL grid1dTo2d_glo(rlon,zx_lon)
          DO i = 1, nbp_lon
             zx_lon(i,1) = rlon(i+1)
@@ -21 +21 @@
             znivsig(ll)=REAL(ll)
          ENDDO
-         CALL gr_fi_ecrit(1,klon,nbp_lon,jjmp1,rlat,zx_lat)
+         CALL grid1dTo2d_glo(rlat,zx_lat)
 !
          imin_debut=1 

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_paramLMDZ_phy.h

@@ -15 +15 @@
        CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
 !
-       CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,rlon_glo,zx_lon)
+       CALL grid1dTo2d_glo(rlon_glo,zx_lon)
        if (nbp_lon.gt.1) then
        DO i = 1, nbp_lon
@@ -22 +22 @@
        ENDDO
        endif
-       CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,rlat_glo,zx_lat)
+       CALL grid1dTo2d_glo(rlat_glo,zx_lat)
 !
        CALL histbeg("paramLMDZ_phy.nc",  &

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/iophy.F90

@@ -53 +53 @@
 #endif
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
     REAL,DIMENSION(klon),INTENT(IN) :: rlon
     REAL,DIMENSION(klon),INTENT(IN) :: rlat
@@ -76 +75 @@
     
 !$OMP MASTER  
-    ALLOCATE(io_lat(jjm+1-1/(iim*jjm)))
+    ALLOCATE(io_lat(nbp_lat))
     io_lat(1)=rlat_glo(1)
-    io_lat(jjm+1-1/(iim*jjm))=rlat_glo(klon_glo)
-    IF ((iim*jjm) > 1) then
-      DO i=2,jjm
-        io_lat(i)=rlat_glo(2+(i-2)*iim)
+    io_lat(nbp_lat)=rlat_glo(klon_glo)
+    IF ((nbp_lon*nbp_lat) > 1) then
+      DO i=2,nbp_lat-1
+        io_lat(i)=rlat_glo(2+(i-2)*nbp_lon)
       ENDDO
     ENDIF
 
-    ALLOCATE(io_lon(iim))
-    io_lon(:)=rlon_glo(2-1/(iim*jjm):iim+1-1/(iim*jjm))
+    ALLOCATE(io_lon(nbp_lon))
+    io_lon(1)=rlon_glo(1)
+    IF (nbp_lon > 1) io_lon(2:nbp_lon)=rlon_glo(3:nbp_lon+1)
+    
 !! (I) dtnb   : total number of domains
 !! (I) dnb    : domain number
@@ -103 +104 @@
 
     ddid=(/ 1,2 /)
-    dsg=(/ iim, jjm+1-1/(iim*jjm) /)
-    dsl=(/ iim, jj_nb /)
+    dsg=(/ nbp_lon, nbp_lat /)
+    dsl=(/ nbp_lon, jj_nb /)
     dpf=(/ 1,jj_begin /)
-    dpl=(/ iim, jj_end /)
+    dpl=(/ nbp_lon, jj_end /)
     dhs=(/ ii_begin-1,0 /)
     IF (mpi_rank==mpi_size-1) THEN
       dhe=(/0,0/)
     ELSE
-      dhe=(/ iim-ii_end,0 /)  
+      dhe=(/ nbp_lon-ii_end,0 /)  
     ENDIF
 
@@ -154 +155 @@
                                 mpi_size, mpi_rank 
   USE ioipsl, only: flio_dom_set
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'   
-    REAL,DIMENSION(iim),INTENT(IN) :: lon
-    REAL,DIMENSION(jjm+1-1/(iim*jjm)),INTENT(IN) :: lat
+    REAL,DIMENSION(nbp_lon),INTENT(IN) :: lon
+    REAL,DIMENSION(nbp_lat),INTENT(IN) :: lat
 
     INTEGER,DIMENSION(2) :: ddid
@@ -168 +169 @@
 
 !$OMP MASTER  
-    allocate(io_lat(jjm+1-1/(iim*jjm)))
+    allocate(io_lat(nbp_lat))
     io_lat(:)=lat(:)
-    allocate(io_lon(iim))
+    allocate(io_lon(nbp_lon))
     io_lon(:)=lon(:)
    
     ddid=(/ 1,2 /)
-    dsg=(/ iim, jjm+1-1/(iim*jjm) /)
-    dsl=(/ iim, jj_nb /)
+    dsg=(/ nbp_lon, nbp_lat /)
+    dsl=(/ nbp_lon, jj_nb /)
     dpf=(/ 1,jj_begin /)
-    dpl=(/ iim, jj_end /)
+    dpl=(/ nbp_lon, jj_end /)
     dhs=(/ ii_begin-1,0 /)
     if (mpi_rank==mpi_size-1) then
       dhe=(/0,0/)
     else
-      dhe=(/ iim-ii_end,0 /)  
+      dhe=(/ nbp_lon-ii_end,0 /)  
     endif
     
@@ -197 +198 @@
   USE mod_phys_lmdz_para, only: is_sequential, is_using_mpi, is_mpi_root, &
                                 jj_begin, jj_end, jj_nb
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
   use ioipsl, only: histbeg
 #ifdef CPP_XIOS
@@ -202 +204 @@
 #endif
   IMPLICIT NONE
-  include 'dimensions.h'
   include 'clesphys.h'
     
@@ -216 +217 @@
 !$OMP MASTER    
     if (is_sequential) then
-      call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
-                   1,iim,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day)
+      call histbeg(name,nbp_lon,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
+                   1,nbp_lon,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day)
     else
-      call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
-                   1,iim,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day,phys_domain_id)
+      call histbeg(name,nbp_lon,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
+                   1,nbp_lon,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day,phys_domain_id)
     endif
 
@@ -239 +240 @@
 
   USE mod_phys_lmdz_para, only: jj_begin, jj_end, jj_nb, is_sequential
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
   use ioipsl, only: histbeg
 
   IMPLICIT NONE
-  include 'dimensions.h'
     
     character*(*), INTENT(IN) :: name
@@ -254 +255 @@
 #ifndef CPP_IOIPSL_NO_OUTPUT 
     if (is_sequential) then
-      call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
-                   1,iim,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day)
+      call histbeg(name,nbp_lon,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
+                   1,nbp_lon,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day)
     else
-      call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
-                   1,iim,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day,phys_domain_id)
+      call histbeg(name,nbp_lon,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
+                   1,nbp_lon,1,jj_nb,itau0, zjulian, dtime, nhori, nid_day,phys_domain_id)
     endif
 #endif
@@ -273 +274 @@
                                 is_sequential, klon_mpi_begin, klon_mpi_end, &
                                 mpi_rank
-  USE mod_grid_phy_lmdz, only: klon_glo
+  USE mod_grid_phy_lmdz, only: klon_glo, nbp_lon, nbp_lat, grid1dTo2d_glo
   use ioipsl, only: histbeg
 
   IMPLICIT NONE
-  include 'dimensions.h' 
 
     REAL,DIMENSION(klon),INTENT(IN) :: rlon
@@ -303 +303 @@
     REAL, allocatable, DIMENSION(:) :: npplat, npplon
     REAL, allocatable, DIMENSION(:,:) :: npplat_bounds, npplon_bounds
-    INTEGER, PARAMETER :: jjmp1=jjm+1-1/jjm
-    REAL, DIMENSION(iim,jjmp1) :: zx_lon, zx_lat
+    REAL, DIMENSION(nbp_lon,nbp_lat) :: zx_lon, zx_lat
 
     CALL gather(rlat,rlat_glo)
@@ -329 +328 @@
      endif
 !
-     IF ( tabij(i).LE.iim) THEN
+     IF ( tabij(i).LE.nbp_lon) THEN
       plat_bounds(i,1)=rlat_glo(tabij(i))
      ELSE
-      plat_bounds(i,1)=rlat_glo(tabij(i)-iim)
+      plat_bounds(i,1)=rlat_glo(tabij(i)-nbp_lon)
      ENDIF
-     plat_bounds(i,2)=rlat_glo(tabij(i)+iim)
+     plat_bounds(i,2)=rlat_glo(tabij(i)+nbp_lon)
 !
 !    print*,'CFMIP_iophy point i lon lon_bds',i,plon_bounds(i,1),rlon_glo(tabij(i)),plon_bounds(i,2) 
@@ -350 +349 @@
      ENDDO
 
-       CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon_glo,zx_lon)
-       if ((iim*jjm).gt.1) then
-       DO i = 1, iim
-         zx_lon(i,1) = rlon_glo(i+1)
-         zx_lon(i,jjmp1) = rlon_glo(i+1)
-       ENDDO
-       endif
-       CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlat_glo,zx_lat)
+       CALL grid1dTo2d_glo(rlon_glo,zx_lon)
+       IF ( nbp_lon*nbp_lat > 1) then
+         DO i = 1, nbp_lon
+           zx_lon(i,1) = rlon_glo(i+1)
+           zx_lon(i,nbp_lat) = rlon_glo(i+1)
+         ENDDO
+       ENDIF
+       CALL grid1dTo2d_glo(rlat_glo,zx_lat)
 
     DO i=1,pim
@@ -366 +365 @@
 
      if (ipt(i).EQ.1) then
-      plon_bounds(i,1)=zx_lon(iim,jpt(i))
+      plon_bounds(i,1)=zx_lon(nbp_lon,jpt(i))
       plon_bounds(i,2)=360.+zx_lon(ipt(i)+1,jpt(i))
      endif
  
-     if (ipt(i).EQ.iim) then
+     if (ipt(i).EQ.nbp_lon) then
       plon_bounds(i,2)=360.+zx_lon(1,jpt(i))
      endif
@@ -382 +381 @@
      endif
  
-     if (jpt(i).EQ.jjmp1) then
-      plat_bounds(i,1)=zx_lat(ipt(i),jjmp1)+0.001
-      plat_bounds(i,2)=zx_lat(ipt(i),jjmp1)-0.001
+     if (jpt(i).EQ.nbp_lat) then
+      plat_bounds(i,1)=zx_lat(ipt(i),nbp_lat)+0.001
+      plat_bounds(i,2)=zx_lat(ipt(i),nbp_lat)-0.001
      endif
 !
@@ -444 +443 @@
 
 
-  SUBROUTINE histdef2d_old (iff,lpoint,flag_var,nomvar,titrevar,unitvar)
-
-    USE ioipsl, only: histdef
-    USE mod_phys_lmdz_para, only: jj_nb
-    use phys_output_var_mod, only: type_ecri, zoutm, zdtime_moy, lev_files, &
-                                   nid_files, nhorim, swaero_diag, nfiles
-    IMPLICIT NONE
-    INCLUDE "dimensions.h"
-    INCLUDE "clesphys.h"
-
-    INTEGER                          :: iff
-    LOGICAL                          :: lpoint
-    INTEGER, DIMENSION(nfiles)       :: flag_var
-    CHARACTER(LEN=20)                 :: nomvar
-    CHARACTER(LEN=*)                 :: titrevar
-    CHARACTER(LEN=*)                 :: unitvar
-
-    REAL zstophym
-
-    IF (type_ecri(iff)=='inst(X)'.OR.type_ecri(iff)=='once') THEN
-       zstophym=zoutm(iff)
-    ELSE
-       zstophym=zdtime_moy
-    ENDIF
-
-    ! Appel a la lecture des noms et niveau d'ecriture des variables dans output.def
-    CALL conf_physoutputs(nomvar,flag_var)
-
-    IF(.NOT.lpoint) THEN  
-       IF ( flag_var(iff)<=lev_files(iff) ) THEN
-          CALL histdef (nid_files(iff),nomvar,titrevar,unitvar, &
-               iim,jj_nb,nhorim(iff), 1,1,1, -99, 32, &
-               type_ecri(iff), zstophym,zoutm(iff))                
-       ENDIF
-    ELSE
-       IF ( flag_var(iff)<=lev_files(iff) ) THEN
-          CALL histdef (nid_files(iff),nomvar,titrevar,unitvar, &
-               npstn,1,nhorim(iff), 1,1,1, -99, 32, &
-               type_ecri(iff), zstophym,zoutm(iff))                
-       ENDIF
-    ENDIF
-
-    ! Set swaero_diag=true if at least one of the concerned variables are defined 
-    IF (nomvar=='topswad' .OR. nomvar=='topswai' .OR. nomvar=='solswad' .OR. nomvar=='solswai' ) THEN
-       IF  ( flag_var(iff)<=lev_files(iff) ) THEN
-          swaero_diag=.TRUE.
-       END IF
-    END IF
-  END SUBROUTINE histdef2d_old
-
-
-
-  SUBROUTINE histdef3d_old (iff,lpoint,flag_var,nomvar,titrevar,unitvar)
-
-    USE ioipsl, only: histdef
-    USE dimphy, only: klev
-    USE mod_phys_lmdz_para, only: jj_nb
-    use phys_output_var_mod, only: type_ecri, zoutm, lev_files, nid_files, &
-                                   nhorim, zdtime_moy, levmin, levmax, &
-                                   nvertm, nfiles
-    IMPLICIT NONE
-
-    INCLUDE "dimensions.h"
-!    INCLUDE "indicesol.h"
-    INCLUDE "clesphys.h"
-
-    INTEGER                          :: iff
-    LOGICAL                          :: lpoint
-    INTEGER, DIMENSION(nfiles)       :: flag_var
-    CHARACTER(LEN=20)                 :: nomvar
-    CHARACTER(LEN=*)                 :: titrevar
-    CHARACTER(LEN=*)                 :: unitvar
-
-    REAL zstophym
-
-    ! Appel a la lecture des noms et niveau d'ecriture des variables dans output.def
-    CALL conf_physoutputs(nomvar,flag_var)
-
-    IF (type_ecri(iff)=='inst(X)'.OR.type_ecri(iff)=='once') THEN
-       zstophym=zoutm(iff)
-    ELSE
-       zstophym=zdtime_moy
-    ENDIF
-
-    IF(.NOT.lpoint) THEN
-       IF ( flag_var(iff)<=lev_files(iff) ) THEN
-          CALL histdef (nid_files(iff), nomvar, titrevar, unitvar, &
-               iim, jj_nb, nhorim(iff), klev, levmin(iff), &
-               levmax(iff)-levmin(iff)+1, nvertm(iff), 32, type_ecri(iff), &
-               zstophym, zoutm(iff))
-       ENDIF
-    ELSE
-       IF ( flag_var(iff)<=lev_files(iff) ) THEN
-          CALL histdef (nid_files(iff), nomvar, titrevar, unitvar, &
-               npstn,1,nhorim(iff), klev, levmin(iff), &
-               levmax(iff)-levmin(iff)+1, nvertm(iff), 32, &
-               type_ecri(iff), zstophym,zoutm(iff))
-       ENDIF
-    ENDIF
-  END SUBROUTINE histdef3d_old
-
-
-
-
-
-
-
 
   SUBROUTINE histdef2d (iff,var)
@@ -559 +451 @@
                                    clef_stations, phys_out_filenames, lev_files, &
                                    nid_files, nhorim, swaero_diag
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 #ifdef CPP_XIOS
     use wxios, only: wxios_add_field_to_file
@@ -564 +457 @@
     IMPLICIT NONE
 
-    INCLUDE "dimensions.h"
     INCLUDE "clesphys.h"
 
@@ -615 +507 @@
        IF ( var%flag(iff)<=lev_files(iff) ) THEN
           CALL histdef (nid_files(iff), var%name, var%description, var%unit, &
-               iim,jj_nb,nhorim(iff), 1,1,1, -99, 32, &
+               nbp_lon,jj_nb,nhorim(iff), 1,1,1, -99, 32, &
                typeecrit, zstophym,zoutm(iff))                
        ENDIF
@@ -644 +536 @@
                                    nid_files, nhorim, swaero_diag, levmin, &
                                    levmax, nvertm
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 #ifdef CPP_XIOS
     use wxios, only: wxios_add_field_to_file
 #endif
     IMPLICIT NONE
-
-    INCLUDE "dimensions.h"
     INCLUDE "clesphys.h"
 
@@ -700 +591 @@
        IF ( var%flag(iff)<=lev_files(iff) ) THEN
           CALL histdef (nid_files(iff), var%name, var%description, var%unit, &
-               iim, jj_nb, nhorim(iff), klev, levmin(iff), &
+               nbp_lon, jj_nb, nhorim(iff), klev, levmin(iff), &
                levmax(iff)-levmin(iff)+1, nvertm(iff), 32, typeecrit, &
                zstophym, zoutm(iff))
@@ -742 +633 @@
   USE ioipsl, only: histwrite
   USE inifis_mod, ONLY: prt_level, lunout
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
   IMPLICIT NONE
-  include 'dimensions.h'
     
     integer,INTENT(IN) :: nid
@@ -752 +643 @@
     REAL,DIMENSION(klon_mpi) :: buffer_omp
     INTEGER, allocatable, DIMENSION(:) :: index2d
-    REAL :: Field2d(iim,jj_nb)
+    REAL :: Field2d(nbp_lon,jj_nb)
 
     integer :: ip
@@ -764 +655 @@
     CALL grid1Dto2D_mpi(buffer_omp,Field2d)
     if(.NOT.lpoint) THEN
-     ALLOCATE(index2d(iim*jj_nb))
-     ALLOCATE(fieldok(iim*jj_nb))
+     ALLOCATE(index2d(nbp_lon*jj_nb))
+     ALLOCATE(fieldok(nbp_lon*jj_nb))
      IF (prt_level >= 10) write(lunout,*)'Sending ',name,' to IOIPSL'
-     CALL histwrite(nid,name,itau,Field2d,iim*jj_nb,index2d)
+     CALL histwrite(nid,name,itau,Field2d,nbp_lon*jj_nb,index2d)
      IF (prt_level >= 10) write(lunout,*)'Finished sending ',name,' to IOIPSL'
     else
@@ -805 +696 @@
                                 is_sequential, klon_mpi_begin, klon_mpi_end, &
                                 jj_nb, klon_mpi
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
   use ioipsl, only: histwrite
   use inifis_mod, only: prt_level, lunout
   IMPLICIT NONE
-  include 'dimensions.h'
     
     integer,INTENT(IN) :: nid
@@ -816 +707 @@
     REAL,DIMENSION(:,:),INTENT(IN) :: field  ! --> field(klon,:)
     REAL,DIMENSION(klon_mpi,size(field,2)) :: buffer_omp
-    REAL :: Field3d(iim,jj_nb,size(field,2))
+    REAL :: Field3d(nbp_lon,jj_nb,size(field,2))
     INTEGER :: ip, n, nlev
     INTEGER, ALLOCATABLE, DIMENSION(:) :: index3d
@@ -829 +720 @@
     CALL grid1Dto2D_mpi(buffer_omp,field3d)
     if(.NOT.lpoint) THEN
-     ALLOCATE(index3d(iim*jj_nb*nlev))
-     ALLOCATE(fieldok(iim*jj_nb,nlev))
+     ALLOCATE(index3d(nbp_lon*jj_nb*nlev))
+     ALLOCATE(fieldok(nbp_lon*jj_nb,nlev))
      IF (prt_level >= 10) write(lunout,*)'Sending ',name,' to IOIPSL'
-     CALL histwrite(nid,name,itau,Field3d,iim*jj_nb*nlev,index3d)
+     CALL histwrite(nid,name,itau,Field3d,nbp_lon*jj_nb*nlev,index3d)
      IF (prt_level >= 10) write(lunout,*)'Finished sending ',name,' to IOIPSL'
    else
@@ -880 +771 @@
                                  nfiles, vars_defined, clef_stations, &
                                  nid_files
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 #ifdef CPP_XIOS
   USE xios, only: xios_send_field
@@ -886 +778 @@
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
   include 'clesphys.h'
 
@@ -899 +790 @@
     REAL,DIMENSION(klon_mpi) :: buffer_omp
     INTEGER, allocatable, DIMENSION(:) :: index2d
-    REAL :: Field2d(iim,jj_nb)
+    REAL :: Field2d(nbp_lon,jj_nb)
 
     INTEGER :: ip
@@ -980 +871 @@
 
                   IF(.NOT.clef_stations(iff)) THEN
-                        ALLOCATE(index2d(iim*jj_nb))
-                        ALLOCATE(fieldok(iim*jj_nb))
+                        ALLOCATE(index2d(nbp_lon*jj_nb))
+                        ALLOCATE(fieldok(nbp_lon*jj_nb))
 #ifndef CPP_IOIPSL_NO_OUTPUT 
-                        CALL histwrite(nid_files(iff),var%name,itau_iophy,Field2d,iim*jj_nb,index2d)
+                        CALL histwrite(nid_files(iff),var%name,itau_iophy,Field2d,nbp_lon*jj_nb,index2d)
 #endif
 !#ifdef CPP_XIOS
@@ -1039 +930 @@
                                  nfiles, vars_defined, clef_stations, &
                                  nid_files
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 #ifdef CPP_XIOS
   USE xios, only: xios_send_field
@@ -1045 +937 @@
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
   include 'clesphys.h'
 
@@ -1056 +947 @@
 !$OMP THREADPRIVATE(firstx)
     REAL,DIMENSION(klon_mpi,SIZE(field,2)) :: buffer_omp
-    REAL :: Field3d(iim,jj_nb,SIZE(field,2))
+    REAL :: Field3d(nbp_lon,jj_nb,SIZE(field,2))
     INTEGER :: ip, n, nlev, nlevx
     INTEGER, ALLOCATABLE, DIMENSION(:) :: index3d
@@ -1121 +1012 @@
                                   iff,nlev,klev, firstx                       
                   write(lunout,*)'histwrite3d_phy: call xios_send_field for ', &
-                                  trim(var%name), ' with iim jjm nlevx = ', &
-                                  iim,jj_nb,nlevx
+                                  trim(var%name), ' with nbp_lon nbp_lat nlevx = ', &
+                                  nbp_lon,jj_nb,nlevx
                 endif
                 CALL xios_send_field(var%name, Field3d(:,:,1:nlevx))
@@ -1129 +1020 @@
 #endif
                 IF (.NOT.clef_stations(iff)) THEN
-                        ALLOCATE(index3d(iim*jj_nb*nlev))
-                        ALLOCATE(fieldok(iim*jj_nb,nlev))
+                        ALLOCATE(index3d(nbp_lon*jj_nb*nlev))
+                        ALLOCATE(fieldok(nbp_lon*jj_nb,nlev))
 
 #ifndef CPP_IOIPSL_NO_OUTPUT 
-                        CALL histwrite(nid_files(iff),var%name,itau_iophy,Field3d,iim*jj_nb*nlev,index3d)
+                        CALL histwrite(nid_files(iff),var%name,itau_iophy,Field3d,nbp_lon*jj_nb*nlev,index3d)
 #endif
 
@@ -1185 +1076 @@
                                 is_sequential, klon_mpi_begin, klon_mpi_end, &
                                 jj_nb, klon_mpi
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
   USE xios, only: xios_send_field
 
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
@@ -1196 +1087 @@
     REAL,DIMENSION(klon_mpi) :: buffer_omp
     INTEGER, allocatable, DIMENSION(:) :: index2d
-    REAL :: Field2d(iim,jj_nb)
+    REAL :: Field2d(nbp_lon,jj_nb)
 
     INTEGER :: ip
@@ -1215 +1106 @@
     !IF(.NOT.clef_stations(iff)) THEN
     IF (.TRUE.) THEN
-        ALLOCATE(index2d(iim*jj_nb))
-        ALLOCATE(fieldok(iim*jj_nb))
+        ALLOCATE(index2d(nbp_lon*jj_nb))
+        ALLOCATE(fieldok(nbp_lon*jj_nb))
 
 
@@ -1256 +1147 @@
                                 jj_nb, klon_mpi
   USE xios, only: xios_send_field
+  USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
 
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
@@ -1265 +1156 @@
 
     REAL,DIMENSION(klon_mpi,SIZE(field,2)) :: buffer_omp
-    REAL :: Field3d(iim,jj_nb,SIZE(field,2))
+    REAL :: Field3d(nbp_lon,jj_nb,SIZE(field,2))
     INTEGER :: ip, n, nlev
     INTEGER, ALLOCATABLE, DIMENSION(:) :: index3d
@@ -1286 +1177 @@
     !IF (.NOT.clef_stations(iff)) THEN
     IF(.TRUE.)THEN
-        ALLOCATE(index3d(iim*jj_nb*nlev))
-        ALLOCATE(fieldok(iim*jj_nb,nlev))
+        ALLOCATE(index3d(nbp_lon*jj_nb*nlev))
+        ALLOCATE(fieldok(nbp_lon*jj_nb,nlev))
         CALL xios_send_field(field_name, Field3d(:,:,1:nlev))
                         

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/o3_chem_m.F90

@@ -14 +14 @@
 
     ! All the 2-dimensional arrays are on the partial "physics" grid.
-    ! Their shape is "(/klon, llm/)".
+    ! Their shape is "(/klon, klev/)".
     ! Index "(i, :)" is for longitude "rlon(i)", latitude "rlat(i)".
-
     use assert_m, only: assert
-    use dimphy, only: klon
+    use dimphy, only: klon,klev
     use regr_pr_comb_coefoz_m, only: c_Mob, a4_mass, a2, r_het_interm
    ! use comconst_phy_mod
@@ -25 +24 @@
     integer, intent(in):: julien ! jour julien, 1 <= julien <= 360
     real, intent(in):: gmtime ! heure de la journée en fraction de jour
-    real, intent(in):: t_seri(:, :) ! (klon, llm) temperature, in K
+    real, intent(in):: t_seri(:, :) ! (klon, klev) temperature, in K
 
-    real, intent(in):: zmasse(:, :) ! (klon, llm)
+    real, intent(in):: zmasse(:, :) ! (klon, klev)
     ! (column-density of mass of air in a cell, in kg m-2)
     ! "zmasse(:, k)" is for layer "k".)
@@ -36 +35 @@
     ! (longitude and latitude of each horizontal position, in degrees)
 
-    real, intent(inout):: q(:, :) ! (klon, llm) mass fraction of ozone
+    real, intent(inout):: q(:, :) ! (klon, klev) mass fraction of ozone
     ! "q(:, k)" is at middle of layer "k".)
 
     ! Variables local to the procedure:
-    include "dimensions.h"
     ! (for "pi")
     integer k
 
-    real c(klon, llm)
+    real c(klon, klev)
     ! (constant term during a time step in the net mass production
     ! rate of ozone by chemistry, per unit mass of air, in s-1)
     ! "c(:, k)" is at middle of layer "k".)
 
-    real b(klon, llm)
+    real b(klon, klev)
     ! (coefficient of "q" in the net mass production
     ! rate of ozone by chemistry, per unit mass of air, in s-1)
     ! "b(:, k)" is at middle of layer "k".)
 
-    real dq_o3_chem(klon, llm)
+    real dq_o3_chem(klon, klev)
     ! (variation of ozone mass fraction due to chemistry during a time step)
     ! "dq_o3_chem(:, k)" is at middle of layer "k".)
@@ -70 +68 @@
     call assert(klon == (/size(q, 1), size(t_seri, 1), size(zmasse, 1), &
          size(rlat), size(rlon)/), "o3_chem klon")
-    call assert(llm == (/size(q, 2), size(t_seri, 2), size(zmasse, 2)/), &
-         "o3_chem llm")
+    call assert(klev == (/size(q, 2), size(t_seri, 2), size(zmasse, 2)/), &
+         "o3_chem klev")
 
     c = c_Mob + a4_mass * t_seri
@@ -87 +85 @@
     call orbite(real(julien), earth_long, trash1)
     call zenang(earth_long, gmtime, pdtphys, rlat, rlon, pmu0, trash2)
-    forall (k = 1: llm)
+    forall (k = 1: klev)
        where (pmu0 <= cos(87. / 180. * pi)) b(:, k) = 0.
     end forall
@@ -113 +111 @@
 
     ! All the 2-dimensional arrays are on the partial "physics" grid.
-    ! Their shape is "(/klon, llm/)".
+    ! Their shape is "(/klon, klev/)".
     ! Index "(i, :)" is for longitude "rlon(i)", latitude "rlat(i)".
 
     use regr_pr_comb_coefoz_m, only: a6_mass
     use assert_m, only: assert
-    use dimphy, only: klon
+    use dimphy, only: klon, klev
 
     real, intent(in):: q(:, :) ! mass fraction of ozone
@@ -137 +135 @@
     ! ("b(:, k)" is at middle of layer "k".)
 
-    include "dimensions.h"
 
-    real o3_prod(klon, llm)
+    real o3_prod(klon, klev)
     ! (net mass production rate of ozone by chemistry, per unit mass
     ! of air, in s-1)
@@ -146 +143 @@
     ! Variables local to the procedure:
 
-    real sigma_mass(klon, llm)
+    real sigma_mass(klon, klev)
     ! (mass column-density of ozone above point, in kg m-2)
     ! ("sigma_mass(:, k)" is at middle of layer "k".)
@@ -156 +153 @@
     call assert(klon == (/size(q, 1), size(zmasse, 1), size(c, 1), &
          size(b, 1)/), "o3_prod 1")
-    call assert(llm == (/size(q, 2), size(zmasse, 2), size(c, 2), &
+    call assert(klev == (/size(q, 2), size(zmasse, 2), size(c, 2), &
          size(b, 2)/), "o3_prod 2")
 
@@ -162 +159 @@
     ! "k", and, as a first approximation, take it as column-density
     ! above the middle of layer "k":
-    sigma_mass(:, llm) = zmasse(:, llm) * q(:, llm) ! top layer
-    do k =  llm - 1, 1, -1
+    sigma_mass(:, klev) = zmasse(:, klev) * q(:, klev) ! top layer
+    do k =  klev - 1, 1, -1
        sigma_mass(:, k) = sigma_mass(:, k+1) + zmasse(:, k) * q(:, k)
     end do

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/pbl_surface_mod.F90

@@ -263 +263 @@
   !  USE temps_phy_mod
     USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy, lunout, prt_level
-    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid1dto2d_glo
     IMPLICIT NONE
 
@@ -793 +793 @@
           idayref = day_ini
           CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
-          CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,rlon,zx_lon)
+          CALL grid1dTo2d_glo(rlon,zx_lon)
           DO i = 1, nbp_lon
              zx_lon(i,1) = rlon(i+1)
              zx_lon(i,nbp_lat) = rlon(i+1)
           ENDDO
-          CALL gr_fi_ecrit(1,klon,nbp_lon,nbp_lat,rlat,zx_lat)
+          CALL grid1dTo2d_glo(rlat,zx_lat)
           CALL histbeg("sous_index",nbp_lon,zx_lon(:,1),nbp_lat,zx_lat(1,:), &
                1,nbp_lon,1,nbp_lat, &

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_mod.F90

@@ -36 +36 @@
     USE iophy 
     USE dimphy
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     USE infotrac_phy
     USE ioipsl
@@ -56 +57 @@
     
     IMPLICIT NONE
-    include "dimensions.h"
     include "clesphys.h"
     include "thermcell.h"
@@ -70 +70 @@
     REAL, DIMENSION(klon, klev+1), INTENT(IN)   :: paprs
     REAL, DIMENSION(klon,klev,nqtot), INTENT(IN):: qx, d_qx
-    REAL, DIMENSION(klon, llm), INTENT(IN)      :: zmasse
+    REAL, DIMENSION(klon, klev), INTENT(IN)      :: zmasse
 
 
@@ -107 +107 @@
     CHARACTER(LEN=2)                      :: bb3
     CHARACTER(LEN=6)                      :: type_ocean
-    INTEGER, DIMENSION(iim*jjmp1)         ::  ndex2d
-    INTEGER, DIMENSION(iim*jjmp1*klev)    :: ndex3d
+    INTEGER, DIMENSION(nbp_lon*jjmp1)     ::  ndex2d
+    INTEGER, DIMENSION(nbp_lon*jjmp1*klev)    :: ndex3d
     INTEGER                               :: imin_ins, imax_ins
     INTEGER                               :: jmin_ins, jmax_ins
@@ -344 +344 @@
           IF (phys_out_regfkey(iff)) then
              imin_ins=1
-             imax_ins=iim
+             imax_ins=nbp_lon
              jmin_ins=1
              jmax_ins=jjmp1
 
              ! correction abderr        
-             do i=1,iim
+             do i=1,nbp_lon
                 WRITE(lunout,*)'io_lon(i)=',io_lon(i)
                 IF (io_lon(i).le.phys_out_lonmin(iff)) imin_ins=i
@@ -368 +368 @@
                   io_lat(jmax_ins),io_lat(jmin_ins)
 
-             CALL histbeg(phys_out_filenames(iff),iim,io_lon,jjmp1,io_lat, &
+             CALL histbeg(phys_out_filenames(iff),nbp_lon,io_lon,jjmp1,io_lat, &
                   imin_ins,imax_ins-imin_ins+1, &
                   jmin_ins,jmax_ins-jmin_ins+1, &

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_write_mod.F90

@@ -25 +25 @@
 
     USE dimphy, only: klon, klev, klevp1, nslay
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     !USE control_phy_mod, only: day_step, iphysiq
     USE inifis_mod, only: day_step, iphysiq
@@ -258 +259 @@
     INCLUDE "compbl.h"
     INCLUDE "YOMCST.h"
-    INCLUDE "dimensions.h"
 
     ! Input
@@ -273 +273 @@
     REAL, DIMENSION(klon, klev+1) :: paprs
     REAL, DIMENSION(klon,klev,nqtot) :: qx, d_qx
-    REAL, DIMENSION(klon, llm) :: zmasse
+    REAL, DIMENSION(klon, klev) :: zmasse
     LOGICAL :: flag_aerosol_strat
     INTEGER :: flag_aerosol 
@@ -280 +280 @@
 
     ! Local
-    INTEGER, PARAMETER :: jjmp1=jjm+1-1/jjm
     INTEGER :: itau_w
     INTEGER :: i, iinit, iinitend=1, iff, iq, nsrf, k, ll, naero
@@ -287 +286 @@
     REAL, DIMENSION (klon,klev+1) :: zx_tmp_fi3d1
     CHARACTER (LEN=4)              :: bb2
-    INTEGER, DIMENSION(iim*jjmp1)  :: ndex2d
-    INTEGER, DIMENSION(iim*jjmp1*klev) :: ndex3d
+    INTEGER, DIMENSION(nbp_lon*nbp_lat)  :: ndex2d
+    INTEGER, DIMENSION(nbp_lon*nbp_lat*klev) :: ndex3d
     REAL, PARAMETER :: dobson_u = 2.1415e-05 ! Dobson unit, in kg m-2
     REAL, PARAMETER :: missing_val=nf90_fill_real

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90

@@ -18 +18 @@
   USE dimphy
   USE infotrac_phy
-  USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para
   USE iophy
@@ -51 +50 @@
                         annee_ref, day_ref, itau_phy, jD_ref, start_time, &
                         prt_level, lunout
-  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev, grid1dTo2d_glo, klon_glo
 #ifdef REPROBUS
   USE CHEM_REP, ONLY : Init_chem_rep_xjour
@@ -4294 +4293 @@
   RETURN
 END FUNCTION qcheck
-SUBROUTINE gr_fi_ecrit(nfield,nlon,iim,jjmp1,fi,ecrit)
-  IMPLICIT none
-  !
-  ! Tranformer une variable de la grille physique a
-  ! la grille d'ecriture
-  !
-  INTEGER nfield,nlon,iim,jjmp1, jjm
-  REAL fi(nlon,nfield), ecrit(iim*jjmp1,nfield)
-  !
-  INTEGER i, n, ig
-  !
-  jjm = jjmp1 - 1
-  DO n = 1, nfield
-     DO i=1,iim
-        ecrit(i,n) = fi(1,n)
-        ecrit(i+jjm*iim,n) = fi(nlon,n)
-     ENDDO
-     DO ig = 1, nlon - 2
-        ecrit(iim+ig,n) = fi(1+ig,n)
-     ENDDO
-  ENDDO
-  RETURN
-  END SUBROUTINE gr_fi_ecrit
-

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol.F90

@@ -178 +178 @@
 ! 3) Read field month by month
 ! 4) Close file  
-! 5) Transform the global field from 2D(iim, jjp+1) to 1D(klon_glo)
+! 5) Transform the global field from 2D(nbp_lon, jjp+1) to 1D(klon_glo)
 !     - Also the levels and the latitudes have to be inversed
 !
@@ -194 +194 @@
 
     IMPLICIT NONE
-      
-    INCLUDE "dimensions.h"      
 
 ! Input argumets
@@ -223 +221 @@
     REAL, ALLOCATABLE, DIMENSION(:)       :: varktmp
 
-    REAL, DIMENSION(iim,jjm+1,12)         :: psurf_glo2D   ! Surface pression for 12 months on dynamics global grid
+    REAL, DIMENSION(nbp_lon,nbp_lat,12)   :: psurf_glo2D   ! Surface pression for 12 months on dynamics global grid
     REAL, DIMENSION(klon_glo,12)          :: psurf_glo1D   ! -"- on physical global grid
-    REAL, DIMENSION(iim,jjm+1,12)         :: load_glo2D    ! Load for 12 months on dynamics global grid
+    REAL, DIMENSION(nbp_lon,nbp_lat,12)   :: load_glo2D    ! Load for 12 months on dynamics global grid
     REAL, DIMENSION(klon_glo,12)          :: load_glo1D    ! -"- on physical global grid
-    REAL, DIMENSION(iim,jjm+1)            :: vartmp
-    REAL, DIMENSION(iim)                  :: lon_src              ! longitudes in file
-    REAL, DIMENSION(jjm+1)                :: lat_src, lat_src_inv ! latitudes in file
+    REAL, DIMENSION(nbp_lon,nbp_lat)      :: vartmp
+    REAL, DIMENSION(nbp_lon)              :: lon_src              ! longitudes in file
+    REAL, DIMENSION(nbp_lat)              :: lat_src, lat_src_inv ! latitudes in file
     LOGICAL                               :: new_file             ! true if new file format detected
     LOGICAL                               :: invert_lat           ! true if the field has to be inverted for latitudes
@@ -267 +265 @@
 
        ! Invert source latitudes
-       DO j = 1, jjm+1
-          lat_src_inv(j) = lat_src(jjm+1 +1 -j)
+       DO j = 1, nbp_lat
+          lat_src_inv(j) = lat_src(nbp_lat +1 -j)
        END DO
 
@@ -313 +311 @@
        
      ! Allocate variables depending on the number of vertical levels
-       ALLOCATE(varmth(iim, jjm+1, klev_src), varyear(iim, jjm+1, klev_src, 12), stat=ierr)
+       ALLOCATE(varmth(nbp_lon, nbp_lat, klev_src), varyear(nbp_lon, nbp_lat, klev_src, 12), stat=ierr)
        IF (ierr /= 0) CALL abort_physic('get_aero_fromfile', 'pb in allocation 1',1)
 
@@ -435 +433 @@
      
 
-! 5) Transform the global field from 2D(iim, jjp+1) to 1D(klon_glo)
+! 5) Transform the global field from 2D(nbp_lon, jjp+1) to 1D(klon_glo)
 !****************************************************************************************
 ! Test if vertical levels have to be inversed
@@ -448 +446 @@
              varmth(:,:,:) = varyear(:,:,:,imth) ! use varmth temporarly
              DO k=1, klev_src
-                DO j=1, jjm+1
-                   DO i=1,iim 
+                DO j=1, nbp_lat
+                   DO i=1,nbp_lon 
                       varyear(i,j,k,imth) = varmth(i,j,klev_src+1-k)
                    END DO
@@ -482 +480 @@
              varmth(:,:,:) = varyear(:,:,:,imth) ! use varmth temporarly
              DO k=1,klev_src
-                DO j=1,jjm+1
-                   DO i=1,iim
-                      varyear(i,j,k,imth) = varmth(i,jjm+1+1-j,k)
+                DO j=1,nbp_lat
+                   DO i=1,nbp_lon
+                      varyear(i,j,k,imth) = varmth(i,nbp_lat+1-j,k)
                    END DO
                 END DO
@@ -491 +489 @@
              ! Invert latitudes for surface pressure
              vartmp(:,:) = psurf_glo2D(:,:,imth)
-             DO j=1, jjm+1
-                DO i=1,iim
-                   psurf_glo2D(i,j,imth)= vartmp(i,jjm+1+1-j)
+             DO j=1, nbp_lat
+                DO i=1,nbp_lon
+                   psurf_glo2D(i,j,imth)= vartmp(i,nbp_lat+1-j)
                 END DO
              END DO
@@ -499 +497 @@
              ! Invert latitudes for the load
              vartmp(:,:) = load_glo2D(:,:,imth)
-             DO j=1, jjm+1
-                DO i=1,iim
-                   load_glo2D(i,j,imth)= vartmp(i,jjm+1+1-j)
+             DO j=1, nbp_lat
+                DO i=1,nbp_lon
+                   load_glo2D(i,j,imth)= vartmp(i,nbp_lat+1-j)
                 END DO
              END DO
@@ -509 +507 @@
           DO k=1, klev_src
              npole=0.  ! North pole, j=1
-             spole=0.  ! South pole, j=jjm+1         
-             DO i=1,iim
+             spole=0.  ! South pole, j=nbp_lat         
+             DO i=1,nbp_lon
                 npole = npole + varyear(i,1,k,imth)
-                spole = spole + varyear(i,jjm+1,k,imth)
+                spole = spole + varyear(i,nbp_lat,k,imth)
              END DO
-             npole = npole/REAL(iim)
-             spole = spole/REAL(iim)
+             npole = npole/REAL(nbp_lon)
+             spole = spole/REAL(nbp_lon)
              varyear(:,1,    k,imth) = npole
-             varyear(:,jjm+1,k,imth) = spole
+             varyear(:,nbp_lat,k,imth) = spole
           END DO
        END DO ! imth

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol_interp.F90

@@ -28 +28 @@
   INCLUDE "chem.h"      
   INCLUDE "clesphys.h"
-  INCLUDE "dimensions.h"
 !
 ! Input:

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosolstrato.F90

@@ -6 +6 @@
 
     USE phys_cal_mod, ONLY : mth_cur
-    USE mod_grid_phy_lmdz
+    USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat, klon_glo, grid2dTo1d_glo 
     USE mod_phys_lmdz_mpi_data, ONLY :  is_mpi_root
     USE mod_phys_lmdz_para 
@@ -17 +17 @@
 
     include "YOMCST.h"
-    include "dimensions.h"
 
 ! Variable input
@@ -85 +84 @@
     n_lat = size(latitude)
     print *, 'LAT aerosol strato=', n_lat, latitude
-    IF (n_lat.NE.jjm+1) THEN 
-       print *,'Le nombre de lat n est pas egal a jjm+1'
+    IF (n_lat.NE.nbp_lat) THEN 
+       print *,'Le nombre de lat n est pas egal a nbp_lat'
        STOP
     ENDIF
@@ -94 +93 @@
     n_lon = size(longitude)
     print *, 'LON aerosol strato=', n_lon, longitude
-    IF (n_lon.NE.iim) THEN 
-       print *,'Le nombre de lon n est pas egal a iim'
+    IF (n_lon.NE.nbp_lon) THEN 
+       print *,'Le nombre de lon n est pas egal a nbp_lon'
        STOP
     ENDIF

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readchlorophyll.F90

@@ -20 +20 @@
 
     include "YOMCST.h"
-    include "dimensions.h"
 
 ! Variable input
@@ -62 +61 @@
     n_lon = size(longitude)
 !    print *, 'LON chlorophyll=', n_lon, longitude
-    IF (n_lon.NE.iim) THEN
-       print *,'Le nombre de lon n est pas egal a iim'
+    IF (n_lon.NE.nbp_lon) THEN
+       print *,'Le nombre de lon n est pas egal a nbp_lon'
        STOP
     ENDIF
@@ -72 +71 @@
     n_lat = size(latitude)
 !    print *, 'LAT chlorophyll=', n_lat, latitude
-    IF (n_lat.NE.jjm+1) THEN 
-       print *,'Le nombre de lat n est pas egal a jjm+1'
+    IF (n_lat.NE.nbp_lat) THEN 
+       print *,'Le nombre de lat n est pas egal a nbp_lat'
        STOP
     ENDIF

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/regr_lat_time_climoz_m.F90

@@ -65 +65 @@
     ! periodicity for interpolation at the beginning and at the end of the
     ! year.
-
+    use mod_grid_phy_lmdz, ONLY : nbp_lat
     use regr1_step_av_m, only: regr1_step_av
     use regr3_lint_m, only: regr3_lint
@@ -85 +85 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
-    ! (for "jjm")
-
     integer n_plev ! number of pressure levels in the input data
     integer n_lat ! number of latitudes in the input data
@@ -118 +115 @@
 
     real, allocatable:: o3_regr_lat(:, :, :, :)
-    ! (jjm + 1, n_plev, 0:13, read_climoz)
+    ! (nbp_lat, n_plev, 0:13, read_climoz)
     ! mean of "o3_in" over a latitude interval of LMDZ
     ! First dimension is latitude interval.
     ! The latitude interval for "o3_regr_lat(j,:, :, :)" contains "rlatu(j)".
-    ! If "j" is between 2 and "jjm" then the interval is:
+    ! If "j" is between 2 and "nbp_lat-1" then the interval is:
     ! [rlatv(j), rlatv(j-1)]
-    ! If "j" is 1 or "jjm + 1" then the interval is:
+    ! If "j" is 1 or "nbp_lat" then the interval is:
     ! [rlatv(1), pi / 2]
     ! or:
-    ! [- pi / 2, rlatv(jjm)]
+    ! [- pi / 2, rlatv(nbp_lat-1)]
     ! respectively.
     ! "o3_regr_lat(:, k, :, :)" is for pressure level "plev(k)".
@@ -135 +132 @@
 
     real, allocatable:: o3_out(:, :, :, :)
-    ! (jjm + 1, n_plev, 360, read_climoz)
+    ! (nbp_lat, n_plev, 360, read_climoz)
     ! regridded ozone climatology
     ! "o3_out(j, k, l, :)" is at latitude "rlatu(j)", pressure
@@ -286 +283 @@
     call nf95_close(ncid_in)
 
-    allocate(o3_regr_lat(jjm + 1, n_plev, 0:13, read_climoz))
-    allocate(o3_out(jjm + 1, n_plev, 360, read_climoz))
+    allocate(o3_regr_lat(nbp_lat, n_plev, 0:13, read_climoz))
+    allocate(o3_out(nbp_lat, n_plev, 360, read_climoz))
 
     ! Regrid in latitude:
@@ -295 +292 @@
        print *, &
             "Found 12 months in ozone climatologies, assuming periodicity..."
-       o3_regr_lat(jjm+1:1:-1, :, 1:12, :) = regr1_step_av(o3_in, &
-            xs=sin(lat_in_edg), xt=sin((/- pi / 2, rlatv(jjm:1:-1), pi / 2/)))
+       o3_regr_lat(nbp_lat:1:-1, :, 1:12, :) = regr1_step_av(o3_in, &
+            xs=sin(lat_in_edg), xt=sin((/- pi / 2, rlatv(nbp_lat-1:1:-1), pi / 2/)))
        ! (invert order of indices in "o3_regr_lat" because "rlatu" is
        ! in descending order)
@@ -306 +303 @@
     else
        print *, "Using 14 months in ozone climatologies..."
-       o3_regr_lat(jjm+1:1:-1, :, :, :) = regr1_step_av(o3_in, &
-            xs=sin(lat_in_edg), xt=sin((/- pi / 2, rlatv(jjm:1:-1), pi / 2/)))
+       o3_regr_lat(nbp_lat:1:-1, :, :, :) = regr1_step_av(o3_in, &
+            xs=sin(lat_in_edg), xt=sin((/- pi / 2, rlatv(nbp_lat-1:1:-1), pi / 2/)))
        ! (invert order of indices in "o3_regr_lat" because "rlatu" is
        ! in descending order)
@@ -317 +314 @@
     ! Write to file:
     do m = 1, read_climoz
-       call nf95_put_var(ncid_out, varid_out(m), o3_out(jjm+1:1:-1, :, :, m))
+       call nf95_put_var(ncid_out, varid_out(m), o3_out(nbp_lat:1:-1, :, :, m))
        ! (The order of "rlatu" is inverted in the output file)
     end do
@@ -333 +330 @@
     ! dimensions and variables, and writes one of the coordinate variables.
 
+    use mod_grid_phy_lmdz, ONLY : nbp_lat
     use netcdf95, only: nf95_create, nf95_def_dim, nf95_def_var, &
          nf95_put_att, nf95_enddef, nf95_copy_att, nf95_put_var
@@ -349 +347 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
-
     integer ncerr
     integer dimid_rlatu, dimid_plev, dimid_time
@@ -364 +360 @@
     call nf95_def_dim(ncid_out, "time", 360, dimid_time)
     call nf95_def_dim(ncid_out, "plev", n_plev, dimid_plev)
-    call nf95_def_dim(ncid_out, "rlatu", jjm + 1, dimid_rlatu)
+    call nf95_def_dim(ncid_out, "rlatu", nbp_lat, dimid_rlatu)
 
     ! Define coordinate variables:
@@ -425 +421 @@
 
     ! Write one of the coordinate variables:
-    call nf95_put_var(ncid_out, varid_rlatu, rlatu(jjm+1:1:-1) / pi * 180.)
+    call nf95_put_var(ncid_out, varid_rlatu, rlatu(nbp_lat:1:-1) / pi * 180.)
     ! (convert from rad to degrees and sort in ascending order)
 

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/regr_lat_time_coefoz_m.F90

@@ -40 +40 @@
     ! when we regrid in pressure).
 
+    use mod_grid_phy_lmdz, ONLY : nbp_lat
     use regr1_step_av_m, only: regr1_step_av
     use regr3_lint_m, only: regr3_lint
@@ -51 +52 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
-    ! (for "jjm")
-
     integer ncid_in, ncid_out ! NetCDF IDs for input and output files
     integer n_plev ! number of pressure levels in the input data
@@ -73 +71 @@
     ! level "plev(l)". "month" is between 1 and 12.)
 
-    real, allocatable:: v_regr_lat(:, :, :) ! (jjm + 1, n_plev, 0:13)
+    real, allocatable:: v_regr_lat(:, :, :) ! (nbp_lat, n_plev, 0:13)
     ! (mean of a variable "v" over a latitude interval)
     ! (First dimension is latitude interval.
     ! The latitude interval for "v_regr_lat(j,:, :)" contains "rlatu(j)".
-    ! If "j" is between 2 and "jjm" then the interval is:
+    ! If "j" is between 2 and "nbp_lat-1" then the interval is:
     ! [rlatv(j), rlatv(j-1)]
-    ! If "j" is 1 or "jjm + 1" then the interval is:
+    ! If "j" is 1 or "nbp_lat" then the interval is:
     ! [rlatv(1), pi / 2]
     ! or:
-    ! [- pi / 2, rlatv(jjm)]
+    ! [- pi / 2, rlatv(nbp_lat-1)]
     ! respectively.
     ! "v_regr_lat(:, l, :)" is for pressure level "plev(l)".
     ! Last dimension is month number.)
 
-    real, allocatable:: o3_par_out(:, :, :) ! (jjm + 1, n_plev, 360)
+    real, allocatable:: o3_par_out(:, :, :) ! (nbp_lat, n_plev, 360)
     ! (regridded ozone parameter)
     ! ("o3_par_out(j, l, day)" is at latitude "rlatu(j)", pressure
@@ -198 +196 @@
 
     allocate(o3_par_in(n_lat, n_plev, 12))
-    allocate(v_regr_lat(jjm + 1, n_plev, 0:13))
-    allocate(o3_par_out(jjm + 1, n_plev, 360))
+    allocate(v_regr_lat(nbp_lat, n_plev, 0:13))
+    allocate(o3_par_out(nbp_lat, n_plev, 360))
 
     do i_v = 1, n_o3_param
@@ -212 +210 @@
        ! We average with respect to sine of latitude, which is
        ! equivalent to weighting by cosine of latitude:
-       v_regr_lat(jjm+1:1:-1, :, 1:12) = regr1_step_av(o3_par_in, &
-            xs=sin(lat_in_edg), xt=sin((/- pi / 2, rlatv(jjm:1:-1), pi / 2/)))
+       v_regr_lat(nbp_lat:1:-1, :, 1:12) = regr1_step_av(o3_par_in, &
+            xs=sin(lat_in_edg), xt=sin((/- pi / 2, rlatv(nbp_lat-1:1:-1), pi / 2/)))
        ! (invert order of indices in "v_regr_lat" because "rlatu" is
        ! in descending order)
@@ -227 +225 @@
        ! Write to file:
        call nf95_put_var(ncid_out, varid_out(i_v), &
-            o3_par_out(jjm+1:1:-1, :, :))
+            o3_par_out(nbp_lat:1:-1, :, :))
        ! (The order of "rlatu" is inverted in the output file)
     end do
@@ -244 +242 @@
     ! dimensions and variables, and writes one of the coordinate variables.
 
+    use mod_grid_phy_lmdz, ONLY : nbp_lat
     use assert_eq_m, only: assert_eq
 
@@ -260 +259 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
-    ! (for "jjm")
 
     integer ncerr
@@ -279 +276 @@
     call nf95_def_dim(ncid_out, "time", 360, dimid_time)
     call nf95_def_dim(ncid_out, "plev", n_plev, dimid_plev)
-    call nf95_def_dim(ncid_out, "rlatu", jjm + 1, dimid_rlatu)
+    call nf95_def_dim(ncid_out, "rlatu", nbp_lat, dimid_rlatu)
 
     ! Define coordinate variables:
@@ -329 +326 @@
 
     ! Write one of the coordinate variables:
-    call nf95_put_var(ncid_out, varid_rlatu, rlatu(jjm+1:1:-1) / pi * 180.)
+    call nf95_put_var(ncid_out, varid_rlatu, rlatu(nbp_lat:1:-1) / pi * 180.)
     ! (convert from rad to degrees and sort in ascending order)
 

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/regr_pr_av_m.F90

@@ -33 +33 @@
     ! NetCDF variable.
 
-    use dimphy, only: klon
+    use dimphy, only: klon, klev
+    use mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     use netcdf95, only: nf95_inq_varid, handle_err
     use netcdf, only: nf90_get_var
@@ -52 +53 @@
     ! ascending order
 
-    real, intent(in):: paprs(:, :) ! (klon, llm + 1)
+    real, intent(in):: paprs(:, :) ! (klon, klev + 1)
     ! (pression pour chaque inter-couche, en Pa)
 
-    real, intent(out):: v3(:, :, :) ! (klon, llm, size(name))
+    real, intent(out):: v3(:, :, :) ! (klon, klev, size(name))
     ! regridded fields on the partial "physics" grid
     ! "v3(i, k, l)" is at longitude "xlon(i)", latitude
@@ -63 +64 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
     integer varid, ncerr ! for NetCDF
 
-    real  v1(iim, jjm + 1, size(press_in_edg) - 1, size(name))
+    real  v1(nbp_lon, nbp_lat, size(press_in_edg) - 1, size(name))
     ! input fields at day "julien", on the global "dynamics" horizontal grid
     ! First dimension is for longitude.
@@ -84 +84 @@
     !--------------------------------------------
 
-    call assert(size(v3, 1) == klon, size(v3, 2) == llm, "regr_pr_av v3 klon")
+    call assert(size(v3, 1) == klon, size(v3, 2) == klev, "regr_pr_av v3 klon")
     n_var = assert_eq(size(name), size(v3, 3), "regr_pr_av v3 n_var")
-    call assert(shape(paprs) == (/klon, llm+1/), "regr_pr_av paprs")
+    call assert(shape(paprs) == (/klon, klev+1/), "regr_pr_av paprs")
 
     !$omp master
@@ -102 +102 @@
        ! Latitudes are in ascending order in the input file while
        ! "rlatu" is in descending order so we need to invert order:
-       v1(1, :, :, :) = v1(1, jjm+1:1:-1, :, :)
+       v1(1, :, :, :) = v1(1, nbp_lat:1:-1, :, :)
 
        ! Duplicate on all longitudes:
-       v1(2:, :, :, :) = spread(v1(1, :, :, :), dim=1, ncopies=iim-1)
+       v1(2:, :, :, :) = spread(v1(1, :, :, :), dim=1, ncopies=nbp_lon-1)
     end if
     !$omp end master
@@ -113 +113 @@
     ! Regrid in pressure at each horizontal position:
     do i = 1, klon
-       v3(i, llm:1:-1, :) = regr1_step_av(v2(i, :, :), press_in_edg, &
-            paprs(i, llm+1:1:-1))
+       v3(i, klev:1:-1, :) = regr1_step_av(v2(i, :, :), press_in_edg, &
+            paprs(i, klev+1:1:-1))
        ! (invert order of indices because "paprs" is in descending order)
     end do

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/regr_pr_comb_coefoz_m.F90

@@ -39 +39 @@
     ! It allocates module variables.
 
-    use dimphy, only: klon
+    use dimphy, only: klon, klev
 
     ! Variables local to the procedure:
-    include "dimensions.h"
 
     !---------------------------------------
@@ -49 +48 @@
     print *, "Call sequence information: alloc_coefoz"
     !$omp end master
-    allocate(c_Mob(klon, llm), a2(klon, llm), a4_mass(klon, llm))
-    allocate(a6_mass(klon, llm), r_het_interm(klon, llm))
+    allocate(c_Mob(klon, klev), a2(klon, klev), a4_mass(klon, klev))
+    allocate(a6_mass(klon, klev), r_het_interm(klon, klev))
 
   end subroutine alloc_coefoz
@@ -74 +73 @@
     use netcdf, only: nf90_nowrite
     use assert_m, only: assert
-    use dimphy, only: klon
+    use dimphy, only: klon, klev
     use mod_phys_lmdz_mpi_data, only: is_mpi_root
     use regr_pr_av_m, only: regr_pr_av
@@ -85 +84 @@
     ! (latitude on the partial "physics" grid, in degrees)
 
-    real, intent(in):: paprs(:, :) ! (klon, llm + 1)
+    real, intent(in):: paprs(:, :) ! (klon, klev + 1)
     ! (pression pour chaque inter-couche, en Pa)
 
-    real, intent(in):: pplay(:, :) ! (klon, llm)
+    real, intent(in):: pplay(:, :) ! (klon, klev)
     ! (pression pour le mileu de chaque couche, en Pa)
 
     ! Variables local to the procedure:
 
-    include "dimensions.h"
     integer ncid ! for NetCDF
 
-    real coefoz(klon, llm, 7)
+    real coefoz(klon, klev, 7)
     ! (temporary storage for 7 ozone coefficients)
     ! (On the partial "physics" grid.
@@ -102 +100 @@
     ! middle of layer "k".)
 
-    real a6(klon, llm)
+    real a6(klon, klev)
     ! (derivative of "P_net_Mob" with respect to column-density of ozone
     ! above, in cm2 s-1)
@@ -121 +119 @@
     call assert((/size(rlat), size(paprs, 1), size(pplay, 1)/) == klon, &
          "regr_pr_comb_coefoz klon")
-    call assert((/size(paprs, 2) - 1, size(pplay, 2)/) == llm, &
-         "regr_pr_comb_coefoz llm")
+    call assert((/size(paprs, 2) - 1, size(pplay, 2)/) == klev, &
+         "regr_pr_comb_coefoz klev")
 
     !$omp master
@@ -150 +148 @@
     r_het_interm = coefoz(:, :, 7)
     ! Heterogeneous chemistry is only at high latitudes:
-    forall (k = 1: llm)
+    forall (k = 1: klev)
        where (abs(rlat) <= 45.) r_het_interm(:, k) = 0.
     end forall

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/regr_pr_int_m.F90

@@ -24 +24 @@
     ! Regridding is by linear interpolation.
 
-    use dimphy, only: klon
+    use dimphy, only: klon, klev
+    use mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     use netcdf95, only: nf95_inq_varid, handle_err
     use netcdf, only: nf90_get_var
@@ -41 +42 @@
     ! (pressure level of input data, in Pa, in strictly ascending order)
 
-    real, intent(in):: pplay(:, :) ! (klon, llm)
+    real, intent(in):: pplay(:, :) ! (klon, klev)
     ! (pression pour le mileu de chaque couche, en Pa)
 
@@ -47 +48 @@
     ! (extra value of field at 0 pressure)
 
-    real, intent(out):: v3(:, :) ! (klon, llm)
+    real, intent(out):: v3(:, :) ! (klon, klev)
     ! (regridded field on the partial "physics" grid)
     ! ("v3(i, k)" is at longitude "xlon(i)", latitude
@@ -54 +55 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
     integer varid, ncerr ! for NetCDF
 
-    real  v1(iim, jjm + 1, 0:size(plev))
+    real  v1(nbp_lon, nbp_lat, 0:size(plev))
     ! (input field at day "julien", on the global "dynamics" horizontal grid)
     ! (First dimension is for longitude.
@@ -72 +72 @@
     !--------------------------------------------
 
-    call assert(shape(v3) == (/klon, llm/), "regr_pr_int v3")
-    call assert(shape(pplay) == (/klon, llm/), "regr_pr_int pplay")
+    call assert(shape(v3) == (/klon, klev/), "regr_pr_int v3")
+    call assert(shape(pplay) == (/klon, klev/), "regr_pr_int pplay")
 
     !$omp master
@@ -84 +84 @@
        ! Latitudes are in ascending order in the input file while
        ! "rlatu" is in descending order so we need to invert order:
-       v1(1, :, 1:) = v1(1, jjm+1:1:-1, 1:)
+       v1(1, :, 1:) = v1(1, nbp_lat:1:-1, 1:)
 
        ! Complete "v1" with the value at 0 pressure:
@@ -90 +90 @@
 
        ! Duplicate on all longitudes:
-       v1(2:, :, :) = spread(v1(1, :, :), dim=1, ncopies=iim-1)
+       v1(2:, :, :) = spread(v1(1, :, :), dim=1, ncopies=nbp_lon-1)
     end if
     !$omp end master
@@ -98 +98 @@
     ! Regrid in pressure at each horizontal position:
     do i = 1, klon
-       v3(i, llm:1:-1) = regr1_lint(v2(i, :), (/0., plev/), pplay(i, llm:1:-1))
+       v3(i, klev:1:-1) = regr1_lint(v2(i, :), (/0., plev/), pplay(i, klev:1:-1))
        ! (invert order of indices because "pplay" is in descending order)
     end do

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/regr_pr_o3_m.F90

@@ -25 +25 @@
     ! hPa and strictly increasing.
 
+    use dimphy, ONLY : klon, klev
+    use mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, handle_err
     use netcdf, only:  nf90_nowrite, nf90_get_var
@@ -37 +39 @@
     ! for interface "l")
 
-    real, intent(out):: o3_mob_regr(:, :, :) ! (iim + 1, jjm + 1, llm)
+    real, intent(out):: o3_mob_regr(:, :, :) ! (nbp_lon + 1, nbp_lat + 1, klev)
     ! (ozone mole fraction from Mobidic adapted to the LMDZ grid)
     ! ("o3_mob_regr(i, j, l)" is at longitude "rlonv(i)", latitude
@@ -44 +46 @@
     ! Variables local to the procedure:
 
-    include "dimensions.h"
 
     integer ncid, varid, ncerr ! for NetCDF
     integer i, j
 
-    real r_mob(jjm + 1, size(press_in_edg) - 1)
+    real r_mob(nbp_lat, size(press_in_edg) - 1)
     ! (ozone mole fraction from Mobidic at day "dayref")
     ! (r_mob(j, k) is at latitude "rlatu(j)", in pressure interval
@@ -57 +58 @@
 
     print *, "Call sequence information: regr_pr_o3"
-    call assert(shape(o3_mob_regr) == (/iim + 1, jjm + 1, llm/), &
+    call assert(shape(o3_mob_regr) == (/nbp_lon + 1, nbp_lat, klev/), &
          "regr_pr_o3 o3_mob_regr")
-    call assert(shape(p3d) == (/iim + 1, jjm + 1, llm + 1/), "regr_pr_o3 p3d")
+    call assert(shape(p3d) == (/nbp_lon + 1, nbp_lat, klev + 1/), "regr_pr_o3 p3d")
 
     call nf95_open("coefoz_LMDZ.nc", nf90_nowrite, ncid)
@@ -69 +70 @@
     ! Latitudes are in ascending order in the input file while
     ! "rlatu" is in descending order so we need to invert order:
-    r_mob = r_mob(jjm+1:1:-1, :)
+    r_mob = r_mob(nbp_lat:1:-1, :)
 
     call nf95_close(ncid)
@@ -76 +77 @@
 
     ! Poles:
-    do j = 1, jjm + 1, jjm
-       o3_mob_regr(1, j, llm:1:-1) &
-            = regr1_step_av(r_mob(j, :), press_in_edg, p3d(1, j, llm+1:1:-1))
+    do j = 1, nbp_lat, nbp_lat-1
+       o3_mob_regr(1, j, klev:1:-1) &
+            = regr1_step_av(r_mob(j, :), press_in_edg, p3d(1, j, klev+1:1:-1))
        ! (invert order of indices because "p3d" is in descending order)
     end do
 
     ! Other latitudes:
-    do j = 2, jjm
-       do i = 1, iim
-          o3_mob_regr(i, j, llm:1:-1) &
+    do j = 2, nbp_lat-1
+       do i = 1, nbp_lon
+          o3_mob_regr(i, j, klev:1:-1) &
                = regr1_step_av(r_mob(j, :), press_in_edg, &
-               p3d(i, j, llm+1:1:-1))
+               p3d(i, j, klev+1:1:-1))
              ! (invert order of indices because "p3d" is in descending order)
        end do
@@ -93 +94 @@
 
     ! Duplicate pole values on all longitudes:
-    o3_mob_regr(2:, 1, :) = spread(o3_mob_regr(1, 1, :), dim=1, ncopies=iim)
-    o3_mob_regr(2:, jjm + 1, :) &
-         = spread(o3_mob_regr(1, jjm + 1, :), dim=1, ncopies=iim)
+    o3_mob_regr(2:, 1, :) = spread(o3_mob_regr(1, 1, :), dim=1, ncopies=nbp_lon)
+    o3_mob_regr(2:, nbp_lat, :) &
+         = spread(o3_mob_regr(1, nbp_lat, :), dim=1, ncopies=nbp_lon)
 
     ! Duplicate first longitude to last longitude:
-    o3_mob_regr(iim + 1, 2:jjm, :) = o3_mob_regr(1, 2:jjm, :)
+    o3_mob_regr(nbp_lon + 1, 2:nbp_lat-1, :) = o3_mob_regr(1, 2:nbp_lat-1, :)
 
   end subroutine regr_pr_o3

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_old.F90

@@ -327 +327 @@
     ! print*,k,lmax(1,k)
   END DO
-  ! print*,'ZMAX ZMAX ZMAX ',zmax
-  ! call dump2d(iim,jjm-1,zmax(2:ngrid-1),'ZMAX      ')
 
   ! print*,'OKl336'

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_bilKP_ave.h

@@ -11 +11 @@
       itau_w = itau_phy + itap + start_time * day_step / iphysiq
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, ue_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"ue",itau_w,ue_lay)
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, ve_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"ve",itau_w,ve_lay)
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, uq_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"uq",itau_w,uq_lay)
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, vq_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"vq",itau_w,vq_lay)
 c
 c Champs 3D:
 C
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, t_seri, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"temp",itau_w,t_seri)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, qx(1,1,ivap), zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"ovap",itau_w,qx(:,:,ivap))
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zphi, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"geop",itau_w,zphi)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, u_seri, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"vitu",itau_w,u_seri)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, v_seri, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"vitv",itau_w,v_seri)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, omega, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"vitw",itau_w,omega)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, pplay, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"pres",itau_w,pplay)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, paprs, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"play",itau_w,paprs)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cldliq, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"oliq",itau_w,cldliq)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_dyn, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtdyn",itau_w,d_t_dyn)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_dyn, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqdyn",itau_w,d_q_dyn)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_con, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtcon",itau_w,d_t_con)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_con, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"ducon",itau_w,d_u_con)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_con, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dvcon",itau_w,d_v_con)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_con, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqcon",itau_w,d_q_con)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_lsc, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtlsc",itau_w,d_t_lsc)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_lsc, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqlsc",itau_w,d_q_lsc)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtvdf",itau_w,d_t_vdf)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqvdf",itau_w,d_q_vdf)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_ajs, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtajs",itau_w,d_t_ajs)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_ajs, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqajs",itau_w,d_q_ajs)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_eva, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dteva",itau_w,d_t_eva)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_eva, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqeva",itau_w,d_q_eva)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, heat, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtswr",itau_w,heat)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, heat0, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtsw0",itau_w,heat0)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cool, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtlwr",itau_w,cool)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cool0, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtlw0",itau_w,cool0)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"duvdf",itau_w,d_u_vdf)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dvvdf",itau_w,d_v_vdf)
 c
@@ -122 +89 @@
       ENDDO
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_oli, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"duoli",d_u_oli)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_oli, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dvoli",itau_w,d_v_oli)
 c
@@ -131 +96 @@
       ENDIF
 C
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"duphy",itau_w,d_u)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dvphy",itau_w,d_v)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dtphy",itau_w,d_t)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_qx(:,:,1), 
-cymf     .zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqphy",itau_w,d_qx(:,:,1))
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_qx(:,:,2), 
-cym     .zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPave,"dqlphy",itau_w,d_qx(:,:,2))
 c

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_bilKP_ins.h

@@ -11 +11 @@
 c Champs 3D:
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, ue_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"ue",itau_w,ue_lay)
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, ve_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"ve",itau_w,ve_lay)
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, uq_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"uq",itau_w,uq_lay)
 c
-cym      CALL gr_fi_ecrit(klev, klon,iim,jjmp1, vq_lay,zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"vq",itau_w,vq_lay)
 c
 c Champs 3D:
 C
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, t_seri, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"temp",itau_w,t_seri)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, qx(1,1,ivap), zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"ovap",itau_w,qx(:,:,ivap))
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zphi, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"geop",itau_w,zphi)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, u_seri, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"vitu",itau_w,u_seri)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, v_seri, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"vitv",itau_w,v_seri)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, omega, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"vitw",itau_w,omega)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, pplay, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"pres",itau_w,pplay)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, paprs, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"play",itau_w,paprs)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cldliq, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"oliq",itau_w,cldliq)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_dyn, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtdyn",itau_w,d_t_dyn)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_dyn, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqdyn",itau_w,d_q_dyn)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_con, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtcon",itau_w,d_t_con)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_con, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"ducon",itau_w,d_u_con)
-c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_con, zx_tmp_3d)
+c => toi-même !
+
       CALL histwrite_phy(nid_bilKPins,"dvcon",itau_w,d_v_con)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_con, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqcon",itau_w,d_q_con)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_lsc, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtlsc",itau_w,d_t_lsc)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_lsc, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqlsc",itau_w,d_q_lsc)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtvdf",itau_w,d_t_vdf)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqvdf",itau_w,d_q_vdf)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_ajs, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtajs",itau_w,d_t_ajs)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_ajs, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqajs",itau_w,d_q_ajs)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_eva, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dteva",itau_w,d_t_eva)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_q_eva, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqeva",itau_w,d_q_eva)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, heat, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtswr",itau_w,heat)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, heat0, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtsw0",itau_w,heat0)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cool, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtlwr",itau_w,cool)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cool0, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtlw0",itau_w,cool0)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"duvdf",itau_w,d_u_vdf)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_vdf, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dvvdf",itau_w,d_v_vdf)
 c
@@ -122 +90 @@
       ENDDO
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u_oli, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"duoli",itau_w,d_u_oli)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v_oli, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dvoli",itau_w,d_v_oli)
 c
@@ -131 +97 @@
       ENDIF
 C
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_u, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"duphy",itau_w,d_u)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_v, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dvphy",itau_w,d_v)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t, zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dtphy",itau_w,d_t)
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_qx(:,:,1), 
-cym     .zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqphy",itau_w,d_qx(:,:,1))
 c
-cym      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_qx(:,:,2), 
-cym     .zx_tmp_3d)
       CALL histwrite_phy(nid_bilKPins,"dqlphy",itau_w,d_qx(:,:,2))
 c
@@ -161 +120 @@
        IF(bb2.EQ."850") THEN
 c
-cym        CALL gr_fi_ecrit(1, klon,iim,jjmp1,usumSTD(:,k,1),zx_tmp_2d)
         CALL histwrite_phy(nid_bilKPins,"u"//bb2,itau_w,usumSTD(:,k,1))
 c
-cym        CALL gr_fi_ecrit(1, klon,iim,jjmp1,vsumSTD(:,k,1),zx_tmp_2d)
         CALL histwrite_phy(nid_bilKPins,"v"//bb2,itau_w,vsumSTD(:,k,1))
 c

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/write_histday_seri.h

@@ -24 +24 @@
       zx_tmp_fi2d(1:klon)=moyglo
 !
-      CALL gr_fi_ecrit(1, klon,nbp_lon,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"bilTOA",itau_w, &
                      zx_tmp_2d,nbp_lon*jjmp1,ndex2d)
@@ -33 +33 @@
       zx_tmp_fi2d(1:klon)=moyglo
 !
-      CALL gr_fi_ecrit(1, klon,nbp_lon,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"bils",itau_w, &
                      zx_tmp_2d,nbp_lon*jjmp1,ndex2d)
@@ -48 +48 @@
       zx_tmp_fi2d(1:klon)=moyglo
 !
-      CALL gr_fi_ecrit(1, klon,nbp_lon,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"ecin",itau_w, &
                      zx_tmp_2d,nbp_lon*jjmp1,ndex2d) 
@@ -129 +129 @@
 !#endif      
       
-      CALL gr_fi_ecrit(1,klon,nbp_lon,jjmp1,airephy,zx_tmp_2d)
+      CALL grid1dTo2d_glo(airephy,zx_tmp_2d)
       airetot=0.
 !     DO j = 1, jjmp1
@@ -160 +160 @@
 !
       zx_tmp_fi2d(1:klon)=aam/airetot
-      CALL gr_fi_ecrit(1,klon,nbp_lon,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"momang",itau_w,zx_tmp_2d, &
                      nbp_lon*jjmp1,ndex2d)
 !
       zx_tmp_fi2d(1:klon)=torsfc/airetot
-      CALL gr_fi_ecrit(1,klon,nbp_lon,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"torsfc",itau_w,zx_tmp_2d, &
                      nbp_lon*jjmp1,ndex2d)
@@ -175 +175 @@
       zx_tmp_fi2d(1:klon)=moyglo
 !
-      CALL gr_fi_ecrit(1,klon,nbp_lon,jjmp1,zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"tamv",itau_w, &
                      zx_tmp_2d,nbp_lon*jjmp1,ndex2d)
@@ -184 +184 @@
       zx_tmp_fi2d(1:klon)=moyglo
 !
-      CALL gr_fi_ecrit(1, klon,nbp_lon,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"psol",itau_w, &
                      zx_tmp_2d,nbp_lon*jjmp1,ndex2d)
@@ -193 +193 @@
       zx_tmp_fi2d(1:klon)=moyglo
 !
-      CALL gr_fi_ecrit(1, klon,nbp_lon,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"evap",itau_w, &
                      zx_tmp_2d,nbp_lon*jjmp1,ndex2d)
@@ -237 +237 @@
       zx_tmp_fi2d(1:klon)=moyglo
 !
-      CALL gr_fi_ecrit(1, klon,nbp_lon,jjmp1, zx_tmp_fi2d, zx_tmp_2d)
+      CALL grid1dTo2d_glo(zx_tmp_fi2d,zx_tmp_2d)
       CALL histwrite(nid_day_seri,"tsol_"//clnsurf(is_oce), &
                      itau_w,zx_tmp_2d,nbp_lon*jjmp1,ndex2d)