Index: trunk/LMDZ.COMMON/libf/evolution/config.F90
===================================================================
--- trunk/LMDZ.COMMON/libf/evolution/config.F90	(revision 4170)
+++ trunk/LMDZ.COMMON/libf/evolution/config.F90	(revision 4180)
@@ -17,5 +17,5 @@
 ! DEPENDENCIES
 ! ------------
-use numerics, only: dp, di, k4, minieps
+use numerics, only: dp, di, k4, eps
 
 ! DECLARATION
@@ -240,11 +240,13 @@
 ! DEPENDENCIES
 ! ------------
-use stoppage,  only: stop_clean
-use soil,      only: do_soil, reg_thprop_dependp, flux_geo
-use sorption,  only: do_sorption
-use orbit,     only: evo_orbit
-use evolution, only: pem_ini_date
-use ice_table, only: icetable_equilibrium, icetable_dynamic
-use display,   only: print_msg, LVL_WRN
+use stoppage,         only: stop_clean
+use soil,             only: do_soil, reg_thprop_dependp, flux_geo
+use sorption,         only: do_sorption
+use orbit,            only: evo_orbit
+use evolution,        only: pem_ini_date
+use ice_table,        only: icetable_equilibrium, icetable_dynamic
+use glaciers,         only: h2oice_flow, co2ice_flow
+use layered_deposits, only: do_layering
+use display,          only: print_msg, LVL_WRN
 
 ! DECLARATION
@@ -255,13 +257,15 @@
 ! ----
 ! Warnings (possible incompatibilities)
-if (evo_orbit .and. abs(pem_ini_date) < minieps) call print_msg('''evo_orbit = .true.'' but the initial date of the PEM is set to 0!',LVL_WRN)
+if (evo_orbit .and. abs(pem_ini_date) < eps) call print_msg('''evo_orbit = .true.'' but the initial date of the PEM is set to 0!',LVL_WRN)
+if (abs(flux_geo) > eps .and. .not. do_soil) call print_msg('soil is not activated but flux_geo /= 0!',LVL_WRN)
 
 ! Errors (true incompatibilities)
 if (.not. do_soil) then
     if (icetable_equilibrium .or. icetable_dynamic) call stop_clean(__FILE__,__LINE__,'ice table must be used when do_soil = true!',1)
-    if (abs(flux_geo) > minieps) call stop_clean(__FILE__,__LINE__,'soil is not activated but flux_geo /= 0!',1)
     if (reg_thprop_dependp) call stop_clean(__FILE__,__LINE__,'regolith properties vary according to Ps only when soil = true!',1)
     if (do_sorption) call stop_clean(__FILE__,__LINE__,'do_soil must be true when do_sorption = true!',1)
 end if
+if (do_layering .and. h2oice_flow) call stop_clean(__FILE__,__LINE__,'layering and H2O ice flow cannot be activated at the same time!',1)
+if (do_layering .and. co2ice_flow) call stop_clean(__FILE__,__LINE__,'layering and CO2 ice flow cannot be activated at the same time!',1)
 
 END SUBROUTINE check_config_incompatibility
@@ -458,5 +462,5 @@
 call print_msg('> Initializing soil parameters',LVL_NFO)
 volcapa = controle(35)
-if (abs(volcapa) < minieps) call stop_clean(__FILE__,__LINE__,'volcapa is 0 in "'//startfi_name//'"!',1)
+if (abs(volcapa) < eps) call stop_clean(__FILE__,__LINE__,'volcapa is 0 in "'//startfi_name//'"!',1)
 
 ! Initialize orbital data