Index: LMDZ6/branches/Amaury_dev/libf/phydev/comcstphy.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phydev/comcstphy.F90	(revision 5113)
+++ LMDZ6/branches/Amaury_dev/libf/phydev/comcstphy.F90	(revision 5116)
@@ -1,8 +1,8 @@
 module comcstphy
   
-  real :: rradius ! planet radius (m)
-  real :: rr      ! recuced gas constant: R/molar mass of atm
-  real :: rg      ! gravity
-  real :: rcpp    ! specific heat of the atmosphere
+  REAL :: rradius ! planet radius (m)
+  REAL :: rr      ! recuced gas constant: R/molar mass of atm
+  REAL :: rg      ! gravity
+  REAL :: rcpp    ! specific heat of the atmosphere
 
 end module comcstphy
Index: LMDZ6/branches/Amaury_dev/libf/phydev/iophy.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phydev/iophy.F90	(revision 5113)
+++ LMDZ6/branches/Amaury_dev/libf/phydev/iophy.F90	(revision 5116)
@@ -25,14 +25,14 @@
 
   SUBROUTINE init_iophy_new(rlat, rlon)
-    USE dimphy, only: klon
-    USE lmdz_phys_para, only: gather, bcast, &
+    USE dimphy, ONLY: klon
+    USE lmdz_phys_para, ONLY: gather, bcast, &
             jj_nb, jj_begin, jj_end, ii_begin, ii_end, &
             mpi_size, mpi_rank, klon_mpi, &
             is_sequential, is_south_pole_dyn
-    USE lmdz_grid_phy, only: nbp_lon, nbp_lat, klon_glo
+    USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat, klon_glo
     USE lmdz_print_control, ONLY: lunout, prt_level
     USE lmdz_grid_phy, ONLY: nbp_lon, nbp_lat
-    USE ioipsl, only: flio_dom_set
-    use wxios, only: wxios_domain_param, using_xios
+    USE ioipsl, ONLY: flio_dom_set
+    use wxios, ONLY: wxios_domain_param, using_xios
     IMPLICIT NONE
     real, dimension(klon), intent(in) :: rlon
@@ -50,5 +50,5 @@
     INTEGER, DIMENSION(2) :: dhe
     INTEGER :: i
-    integer :: data_ibegin, data_iend
+    INTEGER :: data_ibegin, data_iend
 
     CALL gather(rlat, rlat_glo)
@@ -61,5 +61,5 @@
     io_lat(1) = rlat_glo(1)
     io_lat(nbp_lat) = rlat_glo(klon_glo)
-    IF ((nbp_lon * nbp_lat) > 1) then
+    IF ((nbp_lon * nbp_lat) > 1) THEN
       DO i = 2, nbp_lat - 1
         io_lat(i) = rlat_glo(2 + (i - 2) * nbp_lon)
@@ -93,5 +93,5 @@
     dpl = (/ nbp_lon, jj_end /)
     dhs = (/ ii_begin - 1, 0 /)
-    if (mpi_rank==mpi_size - 1) then
+    if (mpi_rank==mpi_size - 1) THEN
       dhe = (/0, 0/)
     else
@@ -117,10 +117,10 @@
       END IF
 
-      if (prt_level>=10) then
-        write(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " iibegin=", ii_begin, " ii_end=", ii_end, " jjbegin=", jj_begin, " jj_nb=", jj_nb, " jj_end=", jj_end
-        write(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " nbp_lon=", nbp_lon, " nbp_lat=", nbp_lat
-        write(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " data_ibegin=", data_ibegin, " data_iend=", data_iend
-        write(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " data_ibegin=", data_ibegin, " data_iend=", data_iend
-        write(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " is_south_pole=", is_south_pole_dyn
+      if (prt_level>=10) THEN
+        WRITE(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " iibegin=", ii_begin, " ii_end=", ii_end, " jjbegin=", jj_begin, " jj_nb=", jj_nb, " jj_end=", jj_end
+        WRITE(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " nbp_lon=", nbp_lon, " nbp_lat=", nbp_lat
+        WRITE(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " data_ibegin=", data_ibegin, " data_iend=", data_iend
+        WRITE(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " data_ibegin=", data_ibegin, " data_iend=", data_iend
+        WRITE(lunout, *) "init_iophy_new: mpirank=", mpi_rank, " is_south_pole=", is_south_pole_dyn
       endif
 
@@ -139,6 +139,6 @@
 
   SUBROUTINE histbeg_phy(name, itau0, zjulian, dtime, nhori, nid_day)
-    USE lmdz_phys_para, only: is_sequential, jj_begin, jj_end, jj_nb
-    use ioipsl, only: histbeg
+    USE lmdz_phys_para, ONLY: is_sequential, jj_begin, jj_end, jj_nb
+    use ioipsl, ONLY: histbeg
     USE lmdz_print_control, ONLY: prt_level, lunout
     USE lmdz_grid_phy, ONLY: nbp_lon
@@ -153,5 +153,5 @@
 
     !$OMP MASTER
-    if (is_sequential) then
+    if (is_sequential) THEN
       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)
@@ -169,6 +169,6 @@
   ! SUBROUTINE histbeg_phyxios(name,itau0,zjulian,dtime,ffreq,lev,nhori,nid_day)
   SUBROUTINE histbeg_phyxios(name, ffreq, lev)
-    USE lmdz_phys_para, only: is_using_mpi, is_mpi_root
-    use wxios, only: wxios_add_file
+    USE lmdz_phys_para, ONLY: is_using_mpi, is_mpi_root
+    use wxios, ONLY: wxios_add_file
     IMPLICIT NONE
 
@@ -198,9 +198,9 @@
 
   SUBROUTINE histwrite2d_phy(nid, lpoint, name, itau, field)
-    USE dimphy, only: klon
-    USE lmdz_phys_para, only: Gather_omp, grid1Dto2D_mpi, &
+    USE dimphy, ONLY: klon
+    USE lmdz_phys_para, ONLY: Gather_omp, grid1Dto2D_mpi, &
             is_sequential, klon_mpi_begin, klon_mpi_end, &
             jj_nb, klon_mpi
-    USE ioipsl, only: histwrite
+    USE ioipsl, ONLY: histwrite
     USE lmdz_grid_phy, ONLY: nbp_lon
     USE lmdz_abort_physic, ONLY: abort_physic
@@ -216,5 +216,5 @@
     REAL :: Field2d(nbp_lon, jj_nb)
 
-    integer :: ip
+    INTEGER :: ip
     real, allocatable, dimension(:) :: fieldok
 
@@ -224,5 +224,5 @@
     !$OMP MASTER
     CALL grid1Dto2D_mpi(buffer_omp, Field2d)
-    if(.NOT.lpoint) THEN
+    IF(.NOT.lpoint) THEN
       ALLOCATE(index2d(nbp_lon * jj_nb))
       ALLOCATE(fieldok(nbp_lon * jj_nb))
@@ -232,5 +232,5 @@
       ALLOCATE(index2d(npstn))
 
-      if(is_sequential) then
+      IF(is_sequential) THEN
         !     klon_mpi_begin=1
         !     klon_mpi_end=klon
@@ -258,9 +258,9 @@
 
   SUBROUTINE histwrite3d_phy(nid, lpoint, name, itau, field)
-    USE dimphy, only: klon
-    USE lmdz_phys_para, only: Gather_omp, grid1Dto2D_mpi, &
+    USE dimphy, ONLY: klon
+    USE lmdz_phys_para, ONLY: Gather_omp, grid1Dto2D_mpi, &
             is_sequential, klon_mpi_begin, klon_mpi_end, &
             jj_nb, klon_mpi
-    USE ioipsl, only: histwrite
+    USE ioipsl, ONLY: histwrite
     USE lmdz_grid_phy, ONLY: nbp_lon
     USE lmdz_abort_physic, ONLY: abort_physic
@@ -284,5 +284,5 @@
     !$OMP MASTER
     CALL grid1Dto2D_mpi(buffer_omp, field3d)
-    if(.NOT.lpoint) THEN
+    IF(.NOT.lpoint) THEN
       ALLOCATE(index3d(nbp_lon * jj_nb * nlev))
       ALLOCATE(fieldok(nbp_lon * jj_nb, nlev))
@@ -293,5 +293,5 @@
       ALLOCATE(fieldok(npstn, nlev))
 
-      if(is_sequential) then
+      IF(is_sequential) THEN
         !      klon_mpi_begin=1
         !      klon_mpi_end=klon
@@ -323,8 +323,8 @@
 
   SUBROUTINE histwrite2d_xios(field_name, field)
-    USE dimphy, only: klon
-    USE lmdz_phys_para, only: gather_omp, grid1Dto2D_mpi, &
+    USE dimphy, ONLY: klon
+    USE lmdz_phys_para, ONLY: gather_omp, grid1Dto2D_mpi, &
             jj_nb, klon_mpi
-    USE lmdz_xios, only: xios_send_field
+    USE lmdz_xios, ONLY: xios_send_field
     USE lmdz_print_control, ONLY: prt_level, lunout
     USE lmdz_grid_phy, ONLY: nbp_lon
@@ -357,8 +357,8 @@
 
   SUBROUTINE histwrite3d_xios(field_name, field)
-    USE dimphy, only: klon, klev
-    USE lmdz_phys_para, only: gather_omp, grid1Dto2D_mpi, &
+    USE dimphy, ONLY: klon, klev
+    USE lmdz_phys_para, ONLY: gather_omp, grid1Dto2D_mpi, &
             jj_nb, klon_mpi
-    USE lmdz_xios, only: xios_send_field
+    USE lmdz_xios, ONLY: xios_send_field
     USE lmdz_print_control, ONLY: prt_level, lunout
     USE lmdz_grid_phy, ONLY: nbp_lon
@@ -373,5 +373,5 @@
     INTEGER :: ip, n, nlev
 
-    IF (prt_level >= 10) write(lunout, *)'Begin histrwrite3d_xios ', trim(field_name)
+    IF (prt_level >= 10) WRITE(lunout, *)'Begin histrwrite3d_xios ', trim(field_name)
 
     !Et on.... écrit
@@ -386,5 +386,5 @@
     !$OMP END MASTER
 
-    IF (prt_level >= 10) write(lunout, *)'End histrwrite3d_xios ', trim(field_name)
+    IF (prt_level >= 10) WRITE(lunout, *)'End histrwrite3d_xios ', trim(field_name)
   END SUBROUTINE histwrite3d_xios
 
Index: LMDZ6/branches/Amaury_dev/libf/phydev/phyetat0.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phydev/phyetat0.F90	(revision 5113)
+++ LMDZ6/branches/Amaury_dev/libf/phydev/phyetat0.F90	(revision 5116)
@@ -6,5 +6,5 @@
 ! and do some resulting initializations
 
-  USE dimphy, only: klon
+  USE dimphy, ONLY: klon
   USE iostart, ONLY: open_startphy,get_field,close_startphy
   USE iophy, ONLY: init_iophy_new
Index: LMDZ6/branches/Amaury_dev/libf/phydev/phys_state_var_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phydev/phys_state_var_mod.F90	(revision 5113)
+++ LMDZ6/branches/Amaury_dev/libf/phydev/phys_state_var_mod.F90	(revision 5116)
@@ -19,8 +19,8 @@
 !  use dimphy, ONLY: klon
 
-!  if (.not.allocated(rlat)) then
+!  if (.not.allocated(rlat)) THEN
 !    ALLOCATE(rlat(klon),rlon(klon))
 !  else
-!    write(*,*) "phys_state_var_init: warning, rlat already allocated"
+!    WRITE(*,*) "phys_state_var_init: warning, rlat already allocated"
 !  endif
   
Index: LMDZ6/branches/Amaury_dev/libf/phydev/physiq_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phydev/physiq_mod.F90	(revision 5113)
+++ LMDZ6/branches/Amaury_dev/libf/phydev/physiq_mod.F90	(revision 5116)
@@ -24,5 +24,5 @@
 
       USE lmdz_xios, ONLY: xios_update_calendar, using_xios
-      USE wxios, only: wxios_add_vaxis, wxios_set_cal, wxios_closedef
+      USE wxios, ONLY: wxios_add_vaxis, wxios_set_cal, wxios_closedef
       USE iophy, ONLY: histwrite_phy
 
@@ -54,23 +54,23 @@
 integer,save :: itau=0 ! counter to count number of calls to physics
 !$OMP THREADPRIVATE(itau)
-real :: temp_newton(klon,klev)
-integer :: k
+REAL :: temp_newton(klon,klev)
+INTEGER :: k
 logical, save :: first=.TRUE.
 !$OMP THREADPRIVATE(first)
 
 ! For I/Os
-integer :: itau0
-real :: zjulian
-real :: dtime
-integer :: nhori ! horizontal coordinate ID
+INTEGER :: itau0
+REAL :: zjulian
+REAL :: dtime
+INTEGER :: nhori ! horizontal coordinate ID
 integer,save :: nid_hist ! output file ID
 !$OMP THREADPRIVATE(nid_hist)
-integer :: zvertid ! vertical coordinate ID
+INTEGER :: zvertid ! vertical coordinate ID
 integer,save :: iwrite_phys ! output every iwrite_phys physics step
 !$OMP THREADPRIVATE(iwrite_phys)
 integer,save :: iwrite_phys_omp ! intermediate variable to read iwrite_phys
                                 ! (must be shared by all threads)
-real :: t_ops ! frequency of the IOIPSL operations (eg average over...)
-real :: t_wrt ! frequency of the IOIPSL outputs
+REAL :: t_ops ! frequency of the IOIPSL operations (eg average over...)
+REAL :: t_wrt ! frequency of the IOIPSL outputs
 
 ! initializations
@@ -165,5 +165,5 @@
 ! IOIPSL
 #ifndef CPP_IOIPSL_NO_OUTPUT 
-IF (modulo(itau,iwrite_phys)==0) then
+IF (modulo(itau,iwrite_phys)==0) THEN
   CALL histwrite_phy(nid_hist,.FALSE.,"temperature",itau,t)
   CALL histwrite_phy(nid_hist,.FALSE.,"u",itau,u)
@@ -191,5 +191,5 @@
 
 ! if lastcall, then it is time to write "restartphy.nc" file
-IF (lafin) then
+IF (lafin) THEN
   CALL phyredem("restartphy.nc")
 END IF