Index: LMDZ6/trunk/libf/dyn3d/conf_gcm.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/conf_gcm.F90	(revision 4099)
+++ LMDZ6/trunk/libf/dyn3d/conf_gcm.F90	(revision 4100)
@@ -116,13 +116,13 @@
   CALL getin('calend', calend)
 ! initialize year_len for aquaplanets and 1D
-      if (calend == 'earth_360d') then
-        year_len=360
-      else if (calend == 'earth_365d') then
-        year_len=365
-      else if (calend == 'earth_366d') then
-        year_len=366
-      else 
-        year_len=1
-      endif
+  IF (calend == 'earth_360d') THEN
+     year_len=360
+  ELSE IF (calend == 'earth_365d') THEN
+     year_len=365
+  ELSE IF (calend == 'earth_366d') THEN
+     year_len=366
+  ELSE 
+     year_len=1
+  ENDIF
 
   !Config  Key  = dayref
@@ -315,5 +315,4 @@
   CALL getin('ngroup',ngroup)
 
-
   ! top_bound sponge: only active if ok_strato=.true. and iflag_top_bound!=0
   !                   iflag_top_bound=0 for no sponge
@@ -322,5 +321,5 @@
   iflag_top_bound=1
   CALL getin('iflag_top_bound',iflag_top_bound)
-  if (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
+  IF (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
        call abort_gcm("conf_gcm", 'iflag_top_bound must be 0, 1 or 2', 1)
 
@@ -396,5 +395,5 @@
   !     .........   (  modif  le 17/04/96 )   .........
 
-  test_etatinit: IF (.not. etatinit) then
+  test_etatinit: IF (.not. etatinit) THEN
      !Config  Key  = clon
      !Config  Desc = centre du zoom, longitude
@@ -677,5 +676,5 @@
      write(lunout,*)' ok_dyn_ins = ', ok_dyn_ins 
      write(lunout,*)' ok_dyn_ave = ', ok_dyn_ave 
-  else
+  ELSE
      !Config  Key  = clon
      !Config  Desc = centre du zoom, longitude
@@ -877,6 +876,5 @@
 
      write(lunout,*)' #########################################'
-     write(lunout,*)' Configuration des parametres de cel0' &
-          //'_limit: '
+     write(lunout,*)' Configuration des parametres de cel0_limit: '
      write(lunout,*)' planet_type = ', planet_type
      write(lunout,*)' calend = ', calend
@@ -922,6 +920,7 @@
      write(lunout,*)' ok_limit = ', ok_limit
      write(lunout,*)' ok_etat0 = ', ok_etat0
+     write(lunout,*)' ok_guide = ', ok_guide
      write(lunout,*)' read_orop = ', read_orop
-  end IF test_etatinit
+  ENDIF test_etatinit
 
 END SUBROUTINE conf_gcm
Index: LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90	(revision 4099)
+++ LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90	(revision 4100)
@@ -6,15 +6,15 @@
   USE control_mod
 #ifdef CPP_IOIPSL
-  use IOIPSL
+  USE IOIPSL
 #else
   ! if not using IOIPSL, we still need to use (a local version of) getin
-  use ioipsl_getincom
+  USE ioipsl_getincom
 #endif
-  use misc_mod
-  use mod_filtre_fft, ONLY : use_filtre_fft
-  use mod_filtre_fft_loc, ONLY : use_filtre_fft_loc=>use_filtre_fft
-  use mod_hallo, ONLY : use_mpi_alloc
-  USE infotrac, ONLY : type_trac
-  use assert_m, only: assert
+  USE misc_mod
+  USE mod_filtre_fft, ONLY: use_filtre_fft
+  USE mod_filtre_fft_loc, ONLY: use_filtre_fft_loc=>use_filtre_fft
+  USE mod_hallo, ONLY: use_mpi_alloc
+  USE infotrac, ONLY: type_trac
+  USE assert_m, ONLY: assert
   USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, &
                           iflag_top_bound, mode_top_bound, tau_top_bound, &
@@ -55,8 +55,8 @@
   LOGICAL  fxyhypbb, ysinuss
   INTEGER i
-  character(len=*),parameter :: modname="conf_gcm"
-  character (len=80) :: abort_message
+  CHARACTER(len=*), PARAMETER :: modname="conf_gcm"
+  CHARACTER(len=80) :: abort_message
 #ifdef CPP_OMP
-  integer,external :: OMP_GET_NUM_THREADS
+  INTEGER, EXTERNAL :: OMP_GET_NUM_THREADS
 #endif
 
@@ -102,21 +102,21 @@
 
   adjust=.false.
-  call getin('adjust',adjust)
+  CALL getin('adjust',adjust)
 
 #ifdef CPP_OMP
   ! adjust=y not implemented in case of OpenMP threads...
   !$OMP PARALLEL
-  if ((OMP_GET_NUM_THREADS()>1).and.adjust) then
+  IF ((OMP_GET_NUM_THREADS()>1).and.adjust) then
      write(lunout,*)'conf_gcm: Error, adjust should be set to n' &
           ,' when running with OpenMP threads'
      abort_message = 'Wrong value for adjust'
-     call abort_gcm(modname,abort_message,1)
-  endif
+     CALL abort_gcm(modname,abort_message,1)
+  ENDIF
   !$OMP END PARALLEL         
 #endif
 
   itaumax=0
-  call getin('itaumax',itaumax);
-  if (itaumax<=0) itaumax=HUGE(itaumax)
+  CALL getin('itaumax',itaumax);
+  IF (itaumax<=0) itaumax=HUGE(itaumax)
 
   !Config  Key  = prt_level
@@ -146,14 +146,13 @@
 ! initialize year_len for aquaplanets and 1D
   CALL getin('calend', calend)
-     if (calend == 'earth_360d') then
-        year_len=360
-      else if (calend == 'earth_365d') then
-        year_len=365
-      else if (calend == 'earth_366d') then
-        year_len=366
-      else 
-        year_len=1
-      endif
-  
+  IF (calend == 'earth_360d') THEN
+    year_len=360
+  ELSE IF (calend == 'earth_365d') THEN
+    year_len=365
+  ELSE IF (calend == 'earth_366d') THEN
+    year_len=366
+  ELSE
+    year_len=1
+  ENDIF
 
   !Config  Key  = dayref
@@ -345,7 +344,7 @@
   ngroup=3
   CALL getin('ngroup',ngroup)
-  if (mod(iim, 2**ngroup) /= 0) &
+  IF (mod(iim, 2**ngroup) /= 0) &
        call abort_gcm("conf_gcm", 'iim must be multiple of 2**ngroup', 1)
-  if (2**ngroup > jjm + 1) &
+  IF (2**ngroup > jjm + 1) &
        call abort_gcm("conf_gcm", '2**ngroup must be <= jjm + 1', 1)
 
@@ -357,5 +356,5 @@
   iflag_top_bound=1
   CALL getin('iflag_top_bound',iflag_top_bound)
-  if (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
+  IF (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
        call abort_gcm("conf_gcm", 'iflag_top_bound must be 0, 1 or 2', 1)
 
@@ -394,5 +393,5 @@
   CALL getin('ok_guide',ok_guide)
 
-  if (ok_guide .and. adjust) call abort_gcm("conf_gcm", &
+  IF (ok_guide .and. adjust) call abort_gcm("conf_gcm", &
        "adjust does not work with ok_guide", 1)
 
@@ -634,5 +633,5 @@
         WRITE(lunout,*)  &
              'only the file phystoke.nc will still be created ' 
-     END IF
+     ENDIF
 
      !Config  Key  = type_trac
@@ -756,6 +755,5 @@
 
      IF( grossismx.LT.1. )  THEN
-        write(lunout,*) &
-             'conf_gcm: ***  ATTENTION !! grossismx < 1 .   *** '
+        write(lunout,*) 'conf_gcm: ***ATTENTION !! grossismx < 1 . *** '
         STOP
      ELSE
@@ -770,5 +768,5 @@
      ENDIF
 
-     write(lunout,*)'conf_gcm: alphax alphay ',alphax,alphay
+     write(lunout,*) 'conf_gcm: alphax alphay ',alphax,alphay
 
      !    alphax et alphay sont les anciennes formulat. des grossissements
@@ -837,5 +835,5 @@
         WRITE(lunout,*)  &
              'only the file phystoke.nc will still be created ' 
-     END IF
+     ENDIF
 
      !Config  Key  = type_trac
@@ -955,6 +953,5 @@
 
      write(lunout,*)' #########################################'
-     write(lunout,*)' Configuration des parametres de cel0' &
-          //'_limit: '
+     write(lunout,*)' Configuration des parametres de cel0_limit: '
      write(lunout,*)' planet_type = ', planet_type
      write(lunout,*)' calend = ', calend
@@ -1002,6 +999,7 @@
      write(lunout,*)' ok_limit = ', ok_limit
      write(lunout,*)' ok_etat0 = ', ok_etat0
+     write(lunout,*)' ok_guide = ', ok_guide
      write(lunout,*)' read_orop = ', read_orop
-  end IF test_etatinit
+  ENDIF test_etatinit
 
 END SUBROUTINE conf_gcm