Index: CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_pdControl.orch4/COMP/stomate.card
===================================================================
--- CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_pdControl.orch4/COMP/stomate.card	(revision 6707)
+++ CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_pdControl.orch4/COMP/stomate.card	(revision 6870)
@@ -12,12 +12,11 @@
 STOMATE_IMPOSE_CN=n
 
-
 # Specify output level for output files
 # Only the files stomate_history.nc and stomate_ipcc_history.nc can be set here.
 # output_level_filname=0     : lowest level writing only variables needed for the monitoring
-# output_level_filname=10    : highest level which will output all variables
+# output_level_filname=1     : highest level which will output all variables
 # output_level_filname=NONE  : deactivate the file
-output_level_stomate_history = 10
-output_level_stomate_ipcc_history = 1
+output_level_stomate_history = 0 
+output_level_stomate_ipcc_history = 0
 
 # Specify output frequency for each file [1y, 1mo, 1d]
@@ -26,20 +25,15 @@
 output_freq_stomate_ipcc_history = 1mo
 
-
 [InitialStateFiles]
-# cnleaf_map.nc is needed if STOMATE_IMPOSE_CN=y
-#List=    (${R_IN}/SRF/NITROGEN/CN_LEAF/cn_leaf_1850_v0.nc, cnleaf_map.nc)
-
-# Following files are needed if STOMATE_IMPOSE_CN=n
-List=   (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP/synthetic/historical/Nfer_pasture_2000.nc, nfert_pasture.nc) ,\
-     (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP/synthetic/historical/Nfer_cropland_2000.nc, nfert_cropland.nc) ,\
-     (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP/manure/historical/Nmanure_pasture_2000.nc, nmanure_pasture.nc) ,\
-     (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP/manure/historical/Nmanure_cropland_2000.nc, nmanure_cropland.nc) ,\
-     (${R_IN}/SRF/NITROGEN/N_DEPOSITION/CCMI_ndep/historical/CCMI_ndep_nhx_2000.nc, ndep_nhx.nc), \
-     (${R_IN}/SRF/NITROGEN/N_DEPOSITION/CCMI_ndep/historical/CCMI_ndep_noy_2000.nc, ndep_noy.nc), \
-     (${R_IN}/SRF/NITROGEN/BNF/bnf_1850.nc, bnf.nc)
+List=   (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP2/synthetic/historical/nfer_crop_nh4_2000.nc, Nfert_ammo_cropland.nc) ,\
+        (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP2/synthetic/historical/nfer_crop_no3_2000.nc, Nfert_nitr_cropland.nc) ,\
+        (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP2/synthetic/historical/nfer_pas_nh4_2000.nc,  Nfert_ammo_pasture.nc) ,\
+        (${R_IN}/SRF/NITROGEN/N_FERTILISATION/NMIP2/synthetic/historical/nfer_pas_no3_2000.nc,  Nfert_nitr_pasture.nc) ,\
+        (${R_IN}/SRF/NITROGEN/N_DEPOSITION/CMIP6.2/historical/nhx__2000.nc, Nammonium.nc), \
+        (${R_IN}/SRF/NITROGEN/N_DEPOSITION/CMIP6.2/historical/noy__2000.nc, Nnitrate.nc), \
+        (${R_IN}/SRF/NITROGEN/BNF/bnf_1850.nc, bnf.nc)
 
 [BoundaryFiles]
-List=   ()
+List= ()
 ListNonDel= ()
 
@@ -58,21 +52,24 @@
 [OutputFiles]
 List=   (stomate_history.nc,      ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history.nc,      Post_1M_stomate_history),    \
-        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history)
+        (stomate_ipcc_history.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_ipcc_history.nc, Post_1M_stomate_ipcc_history), \
+        (stomate_history_4dim.nc, ${R_OUT_SBG_O_M}/${PREFIX}_1M_stomate_history_4dim.nc, NONE), \
+        (stomate_fixed_dia.nc, ${R_OUT_SBG_O_Y}/${PREFIX}_1Y_stomate_fixed_dia.nc, NONE)
 
-[Post_1M_stomate_history]
-Patches = ()
-GatherWithInternal = (lon, lat, Areas, time_counter, time_centered, time_centered_bounds)
-TimeSeriesVars2D = (T2M_MONTH,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,HARVEST_ABOVE)
+[Post_1Y_stomate_history]
+Patches= ()
+GatherWithInternal= (lon, lat, time_counter, Areas, CONTFRAC)
+TimeSeriesVars2D= (T2M_MONTH,RESOLUTION_X,RESOLUTION_Y,FLUX_PROD_S_LCC_c,FLUX_PROD_M_LCC_c,FLUX_PROD_L_LCC_c,FLUX_PROD_S_HARVEST_c,FLUX_PROD_M_HARVEST_c,FLUX_PROD_L_HARVEST_c)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (LAI,VEGET_COV_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,CO2_FIRE,TOTAL_TURN,WOOD_HARVEST_PFT)
+TimeSeriesVars3D= (LAI_MEAN,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,TOTAL_M_n,TOTAL_M_c,TOTAL_BM_LITTER_c,TOTAL_BM_LITTER_n,ADAPTATION,REGENERATION,SOIL_ACTIVE_c,SOIL_ACTIVE_n,SOIL_SLOW_c,SOIL_SLOW_n,SOIL_PASSIVE_c,SOIL_PASSIVE_n,SOIL_SURF_c,SOIL_SURF_n,LITTER_STR_AB_c,LITTER_STR_AB_n,LITTER_STR_BE_c,LITTER_STR_BE_n,LITTER_MET_AB_c,LITTER_MET_AB_n,LITTER_MET_BE_c,LITTER_MET_BE_n,LITTER_WOD_AB_c,LITTER_WOD_AB_n,LITTER_WOD_BE_c,LITTER_WOD_BE_n,TOTAL_TURN_c,TOTAL_TURN_n,LEAF_M_n,LEAF_M_c,N_UPTAKE_NO3,N_UPTAKE_NH4,NH3_EMISSION,N2_EMISSION,N2O_EMISSION,NOX_EMISSION,NBP_pool_c,NBP_flux_c,MBC_NBP1_c,MBC_NBP1_n,MBC_NBP2_c,MBC_NBP2_n)
 ChunckJob3D = NONE
-Seasonal = ON
+Seasonal=ON
 
-[Post_1M_stomate_ipcc_history]
-Patches = ()
-GatherWithInternal = (lon, lat, Areas, time_counter, time_centered, time_centered_bounds)
-TimeSeriesVars2D = (cVeg, cLitter, cSoil, cProduct, lai, gpp, ra, npp, rh, fFire, fHarvest, fLuc, nbp, fVegLitter, fLitterSoil, cLeaf, cWood, cRoot, cMisc, cLitterAbove, cLitterBelow, cSoilFast, cSoilMedium, cSoilSlow, landCoverFrac, treeFracPrimDec, treeFracPrimEver, c3PftFrac, c4PftFrac, rGrowth, rMaint, nppLeaf, nppWood, nppRoot, nep, fWoodharvest)
+[Post_1Y_stomate_ipcc_history]
+Patches= ()
+GatherWithInternal= (lon, lat, time_counter, Areas, CONTFRAC)
+TimeSeriesVars2D=(cVeg, cLitter, cSoil, cProduct, cMassVariation, lai, gpp, ra, npp, rh, fFire, fHarvest, fLuc, nbp_c, nbp_n, fVegLitter, fLitterSoil, cLeaf, cWood, cRoot, cMisc, cLitterAbove, cLitterBelow, cSoilFast, cSoilMedium, cSoilSlow, landCoverFrac, treeFracPrimDec, treeFracPrimEver, c3PftFrac, c4PftFrac, rGrowth, rMaint, nppLeaf, nppWood, nppRoot, nep_c, nep_n, fWoodharvest)
 ChunckJob2D = NONE
-TimeSeriesVars3D = ()
+TimeSeriesVars3D=()
 ChunckJob3D = NONE
-Seasonal = ON
+Seasonal=ON
+
