Index: LMDZ5/trunk/libf/phydev/abort_physic.F90
===================================================================
--- LMDZ5/trunk/libf/phydev/abort_physic.F90	(revision 2320)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/abort_physic.F90
Index: LMDZ5/trunk/libf/phydev/ioipsl_getin_p_mod.F90
===================================================================
--- LMDZ5/trunk/libf/phydev/ioipsl_getin_p_mod.F90	(revision 2320)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/ioipsl_getin_p_mod.F90
Index: LMDZ5/trunk/libf/phydev/iophy.F90
===================================================================
--- LMDZ5/trunk/libf/phydev/iophy.F90	(revision 2320)
+++ LMDZ5/trunk/libf/phydev/iophy.F90	(revision 2326)
@@ -46,4 +46,6 @@
                                 is_sequential, is_south_pole
   USE mod_grid_phy_lmdz, only: nbp_lon, nbp_lat, klon_glo
+  USE print_control_mod, ONLY: lunout, prt_level
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
 #ifdef CPP_IOIPSL
   USE ioipsl, only: flio_dom_set
@@ -53,6 +55,4 @@
 #endif
   implicit none
-  include 'dimensions.h'
-  include 'iniprint.h'
     real,dimension(klon),intent(in) :: rlon
     real,dimension(klon),intent(in) :: rlat
@@ -77,15 +77,19 @@
     
 !$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))
+    IF ((nbp_lon*nbp_lat) > 1) THEN
+      io_lon(:)=rlon_glo(2:nbp_lon+1)
+    ELSE
+      io_lon(1)=rlon_glo(1)
+    ENDIF
 !! (I) dtnb   : total number of domains
 !! (I) dnb    : domain number
@@ -103,13 +107,13 @@
 !!              These names are case insensitive.
     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
     
@@ -155,6 +159,7 @@
   USE mod_phys_lmdz_para, only: is_sequential, jj_begin, jj_end, jj_nb
   use ioipsl, only: histbeg
+  USE print_control_mod, ONLY: prt_level, lunout
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
   implicit none
-  include 'dimensions.h'
     
     character*(*), intent(IN) :: name
@@ -167,9 +172,9 @@
 !$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
 !$OMP END MASTER
@@ -186,5 +191,4 @@
   use wxios, only: wxios_add_file
   IMPLICIT NONE
-  include 'dimensions.h'
     
     character*(*), INTENT(IN) :: name
@@ -219,6 +223,6 @@
                                 jj_nb, klon_mpi
   USE ioipsl, only: histwrite
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
   implicit none
-  include 'dimensions.h'
     
     integer,intent(in) :: nid
@@ -229,5 +233,5 @@
     REAL,dimension(klon_mpi) :: buffer_omp
     INTEGER, allocatable, dimension(:) :: index2d
-    REAL :: Field2d(iim,jj_nb)
+    REAL :: Field2d(nbp_lon,jj_nb)
 
     integer :: ip
@@ -240,7 +244,7 @@
     CALL grid1Dto2D_mpi(buffer_omp,Field2d)
     if(.NOT.lpoint) THEN
-     ALLOCATE(index2d(iim*jj_nb))
-     ALLOCATE(fieldok(iim*jj_nb))
-     CALL histwrite(nid,name,itau,Field2d,iim*jj_nb,index2d)
+     ALLOCATE(index2d(nbp_lon*jj_nb))
+     ALLOCATE(fieldok(nbp_lon*jj_nb))
+     CALL histwrite(nid,name,itau,Field2d,nbp_lon*jj_nb,index2d)
     else
      ALLOCATE(fieldok(npstn))
@@ -278,6 +282,6 @@
                                 jj_nb, klon_mpi
   USE ioipsl, only: histwrite
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
   implicit none
-  include 'dimensions.h'
     
     integer,intent(in) :: nid
@@ -287,5 +291,5 @@
     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
@@ -299,7 +303,7 @@
     CALL grid1Dto2D_mpi(buffer_omp,field3d)
     if(.NOT.lpoint) THEN
-     ALLOCATE(index3d(iim*jj_nb*nlev))
-     ALLOCATE(fieldok(iim*jj_nb,nlev))
-     CALL histwrite(nid,name,itau,Field3d,iim*jj_nb*nlev,index3d)
+     ALLOCATE(index3d(nbp_lon*jj_nb*nlev))
+     ALLOCATE(fieldok(nbp_lon*jj_nb,nlev))
+     CALL histwrite(nid,name,itau,Field3d,nbp_lon*jj_nb*nlev,index3d)
     else
       nlev=size(field,2)
@@ -341,9 +345,7 @@
                                 jj_nb, klon_mpi
   USE xios, only: xios_send_field
-
-
+  USE print_control_mod, ONLY: prt_level, lunout
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
@@ -351,5 +353,5 @@
       
     REAL,DIMENSION(klon_mpi) :: buffer_omp
-    REAL :: Field2d(iim,jj_nb)
+    REAL :: Field2d(nbp_lon,jj_nb)
 
     IF (prt_level >= 10) WRITE(lunout,*)'Begin histrwrite2d_xios ',trim(field_name)
@@ -377,9 +379,8 @@
                                 jj_nb, klon_mpi
   USE xios, only: xios_send_field
-
+  USE print_control_mod, ONLY: prt_level,lunout
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon
 
   IMPLICIT NONE
-  INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
@@ -387,5 +388,5 @@
 
     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
 
Index: LMDZ5/trunk/libf/phydev/physiq.F90
===================================================================
--- LMDZ5/trunk/libf/phydev/physiq.F90	(revision 2320)
+++ LMDZ5/trunk/libf/phydev/physiq.F90	(revision 2326)
@@ -18,4 +18,5 @@
       USE mod_phys_lmdz_para, only : jj_nb
       USE phys_state_var_mod, only : phys_state_var_init
+      USE mod_grid_phy_lmdz, ONLY: nbp_lon,nbp_lat
 
 #ifdef CPP_XIOS
@@ -26,8 +27,4 @@
 
       IMPLICIT none
-#include "dimensions.h"
-
-      integer,parameter :: jjmp1=jjm+1-1/jjm
-      integer,parameter :: iip1=iim+1
 !
 ! Routine argument:
@@ -55,5 +52,5 @@
       real,intent(out) :: d_qx(klon,klev,nqtot) ! physics tendency on tracers
       real,intent(out) :: d_ps(klon) ! physics tendency on surface pressure
-      real,intent(in) :: dudyn(iim+1,jjmp1,klev) ! Not used
+      real,intent(in) :: dudyn(nbp_lon+1,nbp_lat,klev) ! Not used
 
 integer,save :: itau=0 ! counter to count number of calls to physics
@@ -114,14 +111,14 @@
   ! define variables which will be written in "histins.nc" file
   call histdef(nid_hist,'temperature','Atmospheric temperature','K', &
-               iim,jj_nb,nhori,klev,1,klev,zvertid,32, &
+               nbp_lon,jj_nb,nhori,klev,1,klev,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   call histdef(nid_hist,'u','Eastward Zonal Wind','m/s', &
-               iim,jj_nb,nhori,klev,1,klev,zvertid,32, &
+               nbp_lon,jj_nb,nhori,klev,1,klev,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   call histdef(nid_hist,'v','Northward Meridional Wind','m/s', &
-               iim,jj_nb,nhori,klev,1,klev,zvertid,32, &
+               nbp_lon,jj_nb,nhori,klev,1,klev,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   call histdef(nid_hist,'ps','Surface Pressure','Pa', &
-               iim,jj_nb,nhori,1,1,1,zvertid,32, &
+               nbp_lon,jj_nb,nhori,1,1,1,zvertid,32, &
                'inst(X)',t_ops,t_wrt)
   ! end definition sequence
Index: LMDZ5/trunk/libf/phydev/print_control_mod.F90
===================================================================
--- LMDZ5/trunk/libf/phydev/print_control_mod.F90	(revision 2320)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/print_control_mod.F90