Index: LMDZ6/trunk/libf/phylmd/conf_phys_m.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/conf_phys_m.F90	(revision 3377)
+++ LMDZ6/trunk/libf/phylmd/conf_phys_m.F90	(revision 3378)
@@ -154,4 +154,5 @@
 
     REAL,SAVE :: R_ecc_omp,R_peri_omp,R_incl_omp,solaire_omp
+    REAL      :: solaire_omp_init
     LOGICAL,SAVE :: ok_suntime_rrtm_omp
     REAL,SAVE :: co2_ppm_omp, RCO2_omp, co2_ppm_per_omp, RCO2_per_omp
@@ -575,4 +576,5 @@
     !valeur AMIP II
     solaire_omp = 1365.
+    solaire_omp_init = solaire_omp     !--we keep track of the default value
     CALL getin('solaire', solaire_omp)
     !
@@ -2432,4 +2434,9 @@
        CALL abort_physic('conf_phys','choice iflag_rrtm not valid',1)
     ENDIF
+    !--here we test that solaire has not been changed if ok_suntime_rrtm is activated
+    IF (ok_suntime_rrtm.AND.ABS(solaire-solaire_omp_init).GT.1.E-10) THEN 
+       WRITE(lunout,*) ' ERROR ok_suntime_rrtm=y and solaire is provided in def file'
+       CALL abort_physic('conf_phys','ok_suntime_rrtm=y and solaire is provided',1)
+    ENDIF
 #ifdef CPP_StratAer
     IF (iflag_rrtm .NE. 1) THEN 
@@ -2469,5 +2476,4 @@
        CALL abort_physic('conf_phys', 'read_climoz need to be to zero if chemistry_couple=y ', 1) 
     ENDIF
-
 
     ! flag_aerosol need to be different to zero if ok_cdnc is activated