Index: CONFIG/UNIFORM/v6/LMDZORINCA_v6.2/GENERAL/DRIVER/inca.driver
===================================================================
--- CONFIG/UNIFORM/v6/LMDZORINCA_v6.2/GENERAL/DRIVER/inca.driver	(revision 4934)
+++ CONFIG/UNIFORM/v6/LMDZORINCA_v6.2/GENERAL/DRIVER/inca.driver	(revision 4971)
@@ -49,19 +49,4 @@
     echo LMDZ physics version : ${LMDZ_Physics}
 
-    enable1=.FALSE.
-    enable2=.FALSE.
-    enable3=.FALSE. 
-
-    for frequency in ${config_CHM_WriteFrequency} ; do
-	case ${frequency} in 
-	    1D|1d) enable1=.TRUE. ;;
-	esac
-	case ${frequency} in
-	    1M|1m) enable2=.TRUE. ;;
-	esac
-	case ${frequency} in 
-	    1H|1h) enable3=.TRUE. ;; 
-	esac
-    done
 
 
@@ -75,26 +60,234 @@
     IGCM_debug_PushStack "CHM_Update"
 
-
+    if [ X${inca_UserChoices_output_frequency_chem} = X ] || [ X${inca_UserChoices_output_frequency_chem} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry name inca1d_chem
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_chem} = X1d ] || [ X${inca_UserChoices_output_frequency_chem} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry name inca${inca_UserChoices_output_frequency_chem}_chem
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry output_freq ${inca_UserChoices_output_frequency_chem}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry name inca1d_chem
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml chemistry output_freq ${inca_UserChoices_output_frequency_chem}
+
+	fi
+    fi
+
+    if [ X${inca_UserChoices_output_frequency_emi} = X ] || [ X${inca_UserChoices_output_frequency_emi} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions name inca1d_emi
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_emi} = X1d ] || [ X${inca_UserChoices_output_frequency_emi} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions name inca${inca_UserChoices_output_frequency_emi}_emi
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions output_freq ${inca_UserChoices_output_frequency_emi}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions name inca1d_emi
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml emissions output_freq ${inca_UserChoices_output_frequency_emi}
+	fi
+    fi
+
+
+    if [ X${inca_UserChoices_output_frequency_species} = X ] || [ X${inca_UserChoices_output_frequency_species} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species name inca1d_species
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_species} = X1d ] || [ X${inca_UserChoices_output_frequency_species} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species name inca${inca_UserChoices_output_frequency_species}_species
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species output_freq ${inca_UserChoices_output_frequency_species}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species name inca1d_species
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml species output_freq ${inca_UserChoices_output_frequency_species}
+	fi
+    fi
+
+
+    if [ X${inca_UserChoices_output_frequency_forcage} = X ] || [ X${inca_UserChoices_output_frequency_forcage} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage name inca1d_forcage
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_forcage} = X1d ] || [ X${inca_UserChoices_output_frequency_forcage} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage name inca${inca_UserChoices_output_frequency_forcage}_forcage
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage output_freq ${inca_UserChoices_output_frequency_forcage}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage name inca1d_forcage
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml forcage output_freq ${inca_UserChoices_output_frequency_forcage}
+	fi
+    fi
+
+
+    if [ X${inca_UserChoices_output_frequency_aero} = X ] || [ X${inca_UserChoices_output_frequency_aero} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero name inca1d_aero
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_aero} = X1d ] || [ X${inca_UserChoices_output_frequency_aero} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero name inca${inca_UserChoices_output_frequency_aero}_aero
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero output_freq ${inca_UserChoices_output_frequency_aero}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero name inca1d_aero
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero output_freq ${inca_UserChoices_output_frequency_aero}
+	fi
+    fi
+
+
+    if [ X${inca_UserChoices_output_frequency_dep} = X ] || [ X${inca_UserChoices_output_frequency_dep} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel name inca1d_dep
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_dep} = X1d ] || [ X${inca_UserChoices_output_frequency_dep} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel name inca${inca_UserChoices_output_frequency_dep}_dep
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel output_freq ${inca_UserChoices_output_frequency_dep}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel name inca1d_dep
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml dvel output_freq ${inca_UserChoices_output_frequency_dep}
+	fi
+    fi
+
+    if [ X${inca_UserChoices_output_frequency_washrate} = X ] || [ X${inca_UserChoices_output_frequency_washrate} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout name inca1d_washrate
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_washrate} = X1d ] || [ X${inca_UserChoices_output_frequency_washrate} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout name inca${inca_UserChoices_output_frequency_washrate}_washrate
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout output_freq ${inca_UserChoices_output_frequency_washrate}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout name inca1d_washrate
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml washout output_freq ${inca_UserChoices_output_frequency_washrate}
+	fi
+    fi
+
+    if [ X${inca_UserChoices_output_frequency_veget} = X ] || [ X${inca_UserChoices_output_frequency_veget} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation name inca1d_veget
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_veget} = X1d ] || [ X${inca_UserChoices_output_frequency_veget} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation name inca${inca_UserChoices_output_frequency_veget}_veget
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation output_freq ${inca_UserChoices_output_frequency_veget}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation name inca1d_veget
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml vegetation output_freq ${inca_UserChoices_output_frequency_veget}
+	fi
+    fi
+
+
+    if [ X${inca_UserChoices_output_frequency_reacflux} = X ] || [ X${inca_UserChoices_output_frequency_reacflux} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux name inca1d_reacflux
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_reacflux} = X1d ] || [ X${inca_UserChoices_output_frequency_reacflux} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux name inca${inca_UserChoices_output_frequency_reacflux}_reacflux
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux output_freq ${inca_UserChoices_output_frequency_reacflux}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux name inca1d_reacflux
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml reacflux output_freq ${inca_UserChoices_output_frequency_reacflux}
+	fi
+    fi
+
+
+    if [ X${inca_UserChoices_output_frequency_phtrate} = X ] || [ X${inca_UserChoices_output_frequency_phtrate} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate name inca1d_phtrate
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_phtrate} = X1d ] || [ X${inca_UserChoices_output_frequency_phtrate} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate name inca${inca_UserChoices_output_frequency_phtrate}_phtrate
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate output_freq ${inca_UserChoices_output_frequency_phtrate}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate name inca1d_phtrate
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml phtrate output_freq ${inca_UserChoices_output_frequency_phtrate}
+	fi
+    fi
+
+    if [ X${inca_UserChoices_output_frequency_ges} = X ] || [ X${inca_UserChoices_output_frequency_ges} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges name inca1d_ges
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_ges} = X1d ] || [ X${inca_UserChoices_output_frequency_ges} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges name inca${inca_UserChoices_output_frequency_ges}_ges
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges output_freq ${inca_UserChoices_output_frequency_ges}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges name inca1d_ges
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml ges output_freq ${inca_UserChoices_output_frequency_ges}
+	fi
+    fi
+
+    if [ X${inca_UserChoices_output_frequency_invariants} = X ] || [ X${inca_UserChoices_output_frequency_invariants} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants name inca1d_invariants
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_invariants} = X1d ] || [ X${inca_UserChoices_output_frequency_invariants} = X1mo ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants name inca${inca_UserChoices_output_frequency_invariants}_invariants
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants output_freq ${inca_UserChoices_output_frequency_invariants}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants name inca1d_invariants
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml invariants output_freq ${inca_UserChoices_output_frequency_invariants}
+	fi
+    fi
+
+    if [ X${inca_UserChoices_output_frequency_aero_chem} = X ] || [ X${inca_UserChoices_output_frequency_aero_chem} = XNONE ] ; then
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem enabled FALSE
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem name inca1d_aero_chem
+	IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem output_freq 1d
+	
+    else
+	if [ X${inca_UserChoices_output_frequency_aero_chem} = X1d ] || [ X${inca_UserChoices_output_frequency_aero_chem} = X1mo ] || [ X${inca_UserChoices_output_frequency_aero_chem} = X1ts ] ; then
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem name inca${inca_UserChoices_output_frequency_aero_chem}_aero_chem
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem output_freq ${inca_UserChoices_output_frequency_aero_chem}
+	else
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem enabled TRUE
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem name inca1ts_aero_chem
+	    IGCM_comp_modifyXmlFile nonblocker file_def_inca.xml aero_chem output_freq ${inca_UserChoices_output_frequency_aero_chem}
+	fi
+    fi
 
     case ${CHEM} in 
 	AER)
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   forcage1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml forcage2     enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   aero1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml aero2        enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   chemistry1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml chemistry2   enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   emissions1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml emissions2   enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   species1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml species2     enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   dvel1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml dvel2        enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   washout1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml washout2     enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   reacflux1    enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml reacflux2    enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml   invariants1  enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml invariants2  enabled ${enable2}
 
 	    if [ X${LMDZ_Physics} = X"AP" ] ; then
@@ -105,15 +298,4 @@
 	;;
 	DUSS)
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml forcage1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml aero1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml emissions1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml species1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml vegetation1  enabled ${enable1}
-
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml forcage2     enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml aero2        enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml emissions2   enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml species2     enabled ${enable2}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml vegetation2  enabled ${enable2}
 
 	    if [ X${LMDZ_Physics} = X"AP" ] ; then
@@ -124,43 +306,8 @@
 	;;
 	NMHC) 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml reacflux1    enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml emissions1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml species1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml chemistry1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml dvel1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml washout1     enabled ${enable1}
-
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml reacflux2  enabled ${enable2}  
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml emissions2 enabled ${enable2}  
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml species2   enabled ${enable2}  
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml chemistry2 enabled ${enable2}  
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml dvel2      enabled ${enable2}  
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml washout2   enabled ${enable2}  
 
 	    IGCM_comp_modifyDefFile nonblocker run.def config_inca chem
 	    ;;
 	NMHC_AER)
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml aero_chem1   enabled ${enable3}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml forcage1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml aero1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml species1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml chemistry1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml emissions1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml dvel1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml phtrate1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml washout1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml reacflux1    enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml vegetation1  enabled ${enable1}
-
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml forcage2    enabled ${enable2}  
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml aero2       enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml species2    enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml chemistry2  enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml emissions2  enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml dvel2       enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml phtrate2    enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml washout2    enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml reacflux2   enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml vegetation2 enabled ${enable2} 
 
 	    if [ X${LMDZ_Physics} = X"AP" ] ; then
@@ -172,27 +319,4 @@
 
 	NMHC_AER_S)
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml aero_chem1  enabled ${enable3}
-
- 	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml forcage1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml aero1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml species1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml chemistry1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml emissions1   enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml dvel1        enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml phtrate1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml washout1     enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml reacflux1    enabled ${enable1}
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml vegetation1  enabled ${enable1}
-
- 	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml forcage2    enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml aero2       enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml species2    enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml chemistry2  enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml emissions2  enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml phtrate2    enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml dvel2       enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml washout2    enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml reacflux2   enabled ${enable2} 
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml vegetation2 enabled ${enable2}  
 
 	    if [ X${LMDZ_Physics} = X"AP" ] ; then
@@ -203,7 +327,4 @@
 	;;
 	GES)
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_daily.xml emissions1    enabled ${enable1}
-
-	    IGCM_comp_modifyXmlFile nonblocker file_def_inca_monthly.xml emissions2    enabled ${enable2}
 
 	    IGCM_comp_modifyDefFile nonblocker run.def config_inca chem
