Index: LMDZ6/trunk/libf/phylmd/phys_output_var_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phys_output_var_mod.F90	(revision 3984)
+++ LMDZ6/trunk/libf/phylmd/phys_output_var_mod.F90	(revision 3987)
@@ -90,17 +90,16 @@
   ! swaerofree_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
   ! dryaod_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
-  !--OB: this needs to be set to TRUE by default and changed back to FALSE after first radiation call
-  !--    and corrected back to TRUE based on output requests
-  LOGICAL, SAVE                                :: swaerofree_diag=.TRUE.
-  LOGICAL, SAVE                                :: swaero_diag=.TRUE.
-  LOGICAL, SAVE                                :: dryaod_diag=.TRUE.
+  !--OB: this needs to be set to FALSE by default and changed back to TRUE based on output requests
+  LOGICAL, SAVE                                :: swaerofree_diag=.FALSE.
+  LOGICAL, SAVE                                :: swaero_diag=.FALSE.
+  LOGICAL, SAVE                                :: dryaod_diag=.FALSE.
   !$OMP THREADPRIVATE(swaerofree_diag, swaero_diag, dryaod_diag)
+ 
   ! ok_4xCO2atm : flag indicates if it is necessary to do a second call of
   ! radiation code with a 4xCO2 or another different GES to assess SW/LW
   ! in this case
-  !--IM: as for swaero_diag or dryaod_diag this needs to be set to TRUE by default and
-  !--    changed back to FALSE after first radiation call and corrected back to TRUE 
-  !--    based on output requests
-  LOGICAL, SAVE                                :: ok_4xCO2atm=.TRUE.
+  !--IM: as for swaero_diag this needs to be set to FALSE by default and 
+  !      changed back to TRUE based on output requests
+  LOGICAL, SAVE                                :: ok_4xCO2atm=.FALSE.
   !$OMP THREADPRIVATE(ok_4xCO2atm)
 
Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/physiq_mod.F90	(revision 3984)
+++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90	(revision 3987)
@@ -4198,17 +4198,5 @@
  
 #ifndef CPP_XIOS
-          !--OB 30/05/2016 modified 21/10/2016
-          !--here we return swaero_diag and dryaod_diag to FALSE
-          !--and histdef will switch it back to TRUE if necessary
-          !--this is necessary to get the right swaero at first step
-          !--but only in the case of no XIOS as XIOS is covered elsewhere 
-          IF (debut) swaerofree_diag = .FALSE.
-          IF (debut) swaero_diag = .FALSE.
-          IF (debut) dryaod_diag = .FALSE.
-          !--IM 15/09/2017 here we return ok_4xCO2atm to FALSE
-          !--as for swaero_diag, see above
-          IF (debut) ok_4xCO2atm = .FALSE.
-
-          !
+
           !IM 2eme calcul radiatif pour le cas perturbe ou au moins un
           !IM des taux doit etre different du taux actuel
@@ -4273,5 +4261,5 @@
                      ZLWFT0_i, ZFLDN0, ZFLUP0, &
                      ZSWFT0_i, ZFSDN0, ZFSUP0)
-          endif !ok_4xCO2atm
+          ENDIF !ok_4xCO2atm
        ENDIF ! aerosol_couple
        itaprad = 0