Index: trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml
===================================================================
--- trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml	(revision 3910)
+++ trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml	(revision 3940)
@@ -26,10 +26,10 @@
     -->
     
-    <file_definition type="multiple_file" output_level="10" sync_freq="1d" min_digits="4">
+    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" output_level="10" sync_freq="2mo" min_digits="4">
       <!--
 +++++++++++++++++++++++++++++++++++++++++++++++   daily   ++++++++++++++++++++++++++++++++++++++++++++++++++
         -->
       <file_group id="1d" output_freq="1d"  enabled=".TRUE.">                      <!-- 1d files -->
-	<file id="1d_grid_T" name="auto" name_suffix="_table2.2" >         <!-- grid T  -->
+	<file id="file1" name_suffix="_grid_T_table2.2" >         <!-- grid T  -->
 	  <field field_ref="sst"          name='tos'      long_name="sea_surface_temperature"                              level="2"                      />
 	  <field field_ref="sst2"         name='tossq'    long_name="square_of_sea_surface_temperature"                    level="2"                      />
@@ -43,151 +43,136 @@
 	<!--
 ..............................................    grid T   .................................................
-	  -->
-	<file_group id="1m_grid_T" name="auto" >                                                        <!-- grid T -->
-	  
-	  <file id="1m grid_T table 2.2" name_suffix="_table2.2" >
-	    <field field_ref="botpres"      name="pbo"      long_name="sea_water_pressure_at_sea_floor"                               />
-	    <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
-	    <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                                 />
-	    <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"             level="2" />
-	    <!-- masscello : sea_water_mass_per_unit_area = cellthc*rau0                                          no time changes -->
-	    <field field_ref="cellthc"      name="thkcello" long_name="cell_thickness"                                                 /> <!-- no time changes -->
-	    <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"                                />
-	    <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                              level="1" />
-	    <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"                    level="2" />
-	    <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                                             />
-	    <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                                 level="1" />
-	    <field field_ref="rhop"         name="rhopoto"  long_name="sea_water_potential_density"                          level="2" />
-	    <!-- no agessc : sea_water_age_since_surface_contact -->
-	    <!-- no cfc11  : moles_per_unit_mass_of_cfc11_in_sea_water -->
-	    <!-- msftbarot : ocean_barotropic_mass_streamfunction : offline -->
-	    <!-- mlotst    :           ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
-	    <!-- mlotstsq  : square_of_ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
-	    <field field_ref="mldkz5"       name='omlmax'   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
-	  </file>   
-	  
-	  <file id="1m grid_T table 2.5" name_suffix="_table2.5" >
-	    <field field_ref="rain"         name="pr"       long_name="rainfall_flux"                                           level="1" />
-	    <field field_ref="snow_ao_cea"  name="prsn"     long_name="snowfall_flux"                                           level="1" />
-	    <field field_ref="evap_ao_cea"  name="evs"      long_name="water_evaporation_flux"                                  level="1" />
-	    <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
-	    <field field_ref="calving"      name="ficeberg" long_name="water_flux_into_sea_water_from_icebergs"                 level="1" />
-	    <field field_ref="isnwmlt_cea"  name="fsitherm" long_name="water_flux_into_sea_water_due_to_sea_ice_thermodynamics" level="1" />
-	    <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                               level="1" />
-	    <!-- wfonocorr : water_flux_into_sea_water_without_flux_correction : emp - erp -->  
-	    <field field_ref="erp"          name="wfcorr"   long_name="water_flux_correction"                                   level="1" /> <!-- usually = 0 -->
-	  </file>   
-	  
-	  <file id="1m grid_T table 2.6" name_suffix="_table2.6" >
-	    <!-- vsfpr    : virtual_salt_flux_into_sea_water_due_to_rainfall    = 0 --> 
-	    <!-- vsfevap  : virtual_salt_flux_into_sea_water_due_to_evaporation = 0 --> 
-	    <!-- vsfriver : virtual_salt_flux_into_sea_water_from_rivers        = 0 --> 	  
-	    <field field_ref="fsal_virt_cea" name="vsfsit" long_name="virtual_salt_flux_into_sea_water_due_to_sea_ice_thermodynamics" level="1" />
-	    <!-- vsf      : virtual_salt_flux_into_sea_water = fsal_virtual + fsal_real -->
-	    <!-- wfcorr   : virtual_salt_flux_correction                        = 0 --> 
-	    <field field_ref="fsal_virt_cea" name="sfdsi"  long_name="downward_sea_ice_basal_salt_flux"                               level="1" />
-	    <!-- sfriver  : salt_flux_into_sea_water_from_rivers                = 0 --> 
-	  </file>   
-	  
-	  <file id="1m grid_T table 2.7" name_suffix="_table2.7" >
-	    <!-- hfgeou : upward_geothermal_heat_flux_at_sea_floor : cte, see nambbc and trabbc.F90 -->
-	    <field field_ref="hflx_rain_cea" name="hfrainds"    long_name="temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water"      level="1" />
-	    <field field_ref="hflx_evap_cea" name="hfevapds"    long_name="temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water" level="1" />
-	    <field field_ref="hflx_rnf_cea"  name="hfrunoffds"  long_name="temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water"        level="1" />
-	    <field field_ref="hflx_snow_cea" name="hfsnthermds" long_name="heat_flux_into_sea_water_due_to_snow_thermodynamics"                         level="1" />
-	    <field field_ref="hflx_ice_cea"  name="hfsithermds" long_name="heat_flux_into_sea_water_due_to_sea_ice_thermodynamics"                      level="1" />
-	    <field field_ref="hflx_cal_cea"  name="hfibthermds" long_name="heat_flux_into_sea_water_due_to_iceberg_thermodynamics"                      level="1" />
-	    <!-- rlds   : surface_net_downward_longwave_flux : not available -->
-	    <!-- hfls   : surface_downward_latent_heat_flux  : not available -->
-	    <!-- hfss   : surface_downward_sensible_heat_flux: not available -->
-	    <field field_ref="qns"           name="nshfls"      long_name="surface_net_downward_non_solar_flux"                                         level="1" />
-	    <field field_ref="qsr"           name="rsntds"      long_name="surface_net_downward_shortwave_flux"                                         level="1" />
-	    <field field_ref="qsr3d"         name="rsds"        long_name="downwelling_shortwave_flux_in_sea_water"                                     level="1" />
-	    <field field_ref="qrp"           name="hfcorr"      long_name="heat_flux_correction"                                                        level="1" />
-	  </file>   
-	</file_group>
+	  -->	  
+	<file id="file2" name_suffix="_grid_T_table2.2" >
+	  <field field_ref="botpres"      name="pbo"      long_name="sea_water_pressure_at_sea_floor"                               />
+	  <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
+	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                                 />
+	  <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"             level="2" />
+	  <!-- masscello : sea_water_mass_per_unit_area = cellthc*rau0                                          no time changes -->
+	  <field field_ref="cellthc"      name="thkcello" long_name="cell_thickness"                                                 /> <!-- no time changes -->
+	  <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"                                />
+	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                              level="1" />
+	  <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"                    level="2" />
+	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                                             />
+	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                                 level="1" />
+	  <field field_ref="rhop"         name="rhopoto"  long_name="sea_water_potential_density"                          level="2" />
+	  <!-- no agessc : sea_water_age_since_surface_contact -->
+	  <!-- no cfc11  : moles_per_unit_mass_of_cfc11_in_sea_water -->
+	  <!-- msftbarot : ocean_barotropic_mass_streamfunction : offline -->
+	  <!-- mlotst    :           ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
+	  <!-- mlotstsq  : square_of_ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
+	  <field field_ref="mldkz5"       name='omlmax'   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
+	</file>   
+	
+	<file id="file3" name_suffix="_grid_T_table2.5" >
+	  <field field_ref="rain"         name="pr"       long_name="rainfall_flux"                                           level="1" />
+	  <field field_ref="snow_ao_cea"  name="prsn"     long_name="snowfall_flux"                                           level="1" />
+	  <field field_ref="evap_ao_cea"  name="evs"      long_name="water_evaporation_flux"                                  level="1" />
+	  <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+	  <field field_ref="calving"      name="ficeberg" long_name="water_flux_into_sea_water_from_icebergs"                 level="1" />
+	  <field field_ref="isnwmlt_cea"  name="fsitherm" long_name="water_flux_into_sea_water_due_to_sea_ice_thermodynamics" level="1" />
+	  <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                               level="1" />
+	  <!-- wfonocorr : water_flux_into_sea_water_without_flux_correction : emp - erp -->  
+	  <field field_ref="erp"          name="wfcorr"   long_name="water_flux_correction"                                   level="1" /> <!-- usually = 0 -->
+	</file>   
+	
+	<file id="file4" name_suffix="_grid_T_table2.6" >
+	  <!-- vsfpr    : virtual_salt_flux_into_sea_water_due_to_rainfall    = 0 --> 
+	  <!-- vsfevap  : virtual_salt_flux_into_sea_water_due_to_evaporation = 0 --> 
+	  <!-- vsfriver : virtual_salt_flux_into_sea_water_from_rivers        = 0 --> 	  
+	  <field field_ref="fsal_virt_cea" name="vsfsit" long_name="virtual_salt_flux_into_sea_water_due_to_sea_ice_thermodynamics" level="1" />
+	  <!-- vsf      : virtual_salt_flux_into_sea_water = fsal_virtual + fsal_real -->
+	  <!-- wfcorr   : virtual_salt_flux_correction                        = 0 --> 
+	  <field field_ref="fsal_virt_cea" name="sfdsi"  long_name="downward_sea_ice_basal_salt_flux"                               level="1" />
+	  <!-- sfriver  : salt_flux_into_sea_water_from_rivers                = 0 --> 
+	</file>   
+	
+	<file id="file5" name_suffix="_grid_T_table2.7" >
+	  <!-- hfgeou : upward_geothermal_heat_flux_at_sea_floor : cte, see nambbc and trabbc.F90 -->
+	  <field field_ref="hflx_rain_cea" name="hfrainds"    long_name="temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water"      level="1" />
+	  <field field_ref="hflx_evap_cea" name="hfevapds"    long_name="temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water" level="1" />
+	  <field field_ref="hflx_rnf_cea"  name="hfrunoffds"  long_name="temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water"        level="1" />
+	  <field field_ref="hflx_snow_cea" name="hfsnthermds" long_name="heat_flux_into_sea_water_due_to_snow_thermodynamics"                         level="1" />
+	  <field field_ref="hflx_ice_cea"  name="hfsithermds" long_name="heat_flux_into_sea_water_due_to_sea_ice_thermodynamics"                      level="1" />
+	  <field field_ref="hflx_cal_cea"  name="hfibthermds" long_name="heat_flux_into_sea_water_due_to_iceberg_thermodynamics"                      level="1" />
+	  <!-- rlds   : surface_net_downward_longwave_flux : not available -->
+	  <!-- hfls   : surface_downward_latent_heat_flux  : not available -->
+	  <!-- hfss   : surface_downward_sensible_heat_flux: not available -->
+	  <field field_ref="qns"           name="nshfls"      long_name="surface_net_downward_non_solar_flux"                                         level="1" />
+	  <field field_ref="qsr"           name="rsntds"      long_name="surface_net_downward_shortwave_flux"                                         level="1" />
+	  <field field_ref="qsr3d"         name="rsds"        long_name="downwelling_shortwave_flux_in_sea_water"                                     level="1" />
+	  <field field_ref="qrp"           name="hfcorr"      long_name="heat_flux_correction"                                                        level="1" />
+	</file>   
 	<!--
 ..............................................    grid U   .................................................
-	  -->
-	<file_group id="1m_grid_U" name="auto" >                                                        <!-- grid U -->
-
-	  <file id="1m grid_U table 2.3" name_suffix="_table2.3" >
-	    <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"                                       />
-	    <field field_ref="u_masstr"     name="umo"     long_name="ocean_mass_x_transport"                           level="1" />
-	    <field field_ref="u_heattr"     name="hfx"     long_name="ocean_heat_x_transport"                           level="1" />
-	    <field field_ref="ueiv_heattr"  name="hfxba"   long_name="ocean_heat_x_transport_due_to_bolus_advection"    level="2" />
-	    <field field_ref="udiff_heattr" name="hfxdiff" long_name="ocean_heat_x_transport_due_to_diffusion"          level="2" />
-	  </file>   
-
-	  <file id="1m grid_U table 2.8" name_suffix="_table2.8" >
-	    <field field_ref="utau"         name="tauuo" long_name="surface_downward_x_stress"                          level="1" />
-	    <!-- tauucorr : surface_downward_x_stress_correction = 0 -->
-	  </file>   
-
-	</file_group>
+	-->
+	<file id="file6" name_suffix="_grid_U_table2.3" >
+	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"                                       />
+	  <field field_ref="u_masstr"     name="umo"     long_name="ocean_mass_x_transport"                           level="1" />
+	  <field field_ref="u_heattr"     name="hfx"     long_name="ocean_heat_x_transport"                           level="1" />
+	  <field field_ref="ueiv_heattr"  name="hfxba"   long_name="ocean_heat_x_transport_due_to_bolus_advection"    level="2" />
+	  <field field_ref="udiff_heattr" name="hfxdiff" long_name="ocean_heat_x_transport_due_to_diffusion"          level="2" />
+	</file>   
+	
+	<file id="file7" name_suffix="_grid_U_table2.8" >
+	  <field field_ref="utau"         name="tauuo" long_name="surface_downward_x_stress"                          level="1" />
+	  <!-- tauucorr : surface_downward_x_stress_correction = 0 -->
+	</file>   
 	<!--
 ..............................................    grid V   .................................................
-	  -->
-	<file_group id="1m_grid_V" name="auto" >                                                        <!-- grid V -->
-
-	  <file id="1m grid_V table 2.3" name_suffix="_table2.3" >
-	    <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"                                       />
-	    <field field_ref="v_masstr"     name="vmo"     long_name="ocean_mass_y_transport"                           level="1" />
-	    <field field_ref="v_heattr"     name="hfy"     long_name="ocean_heat_y_transport"                           level="1" />
-	    <field field_ref="veiv_heattr"  name="hfyba"   long_name="ocean_heat_y_transport_due_to_bolus_advection"    level="2" />
-	    <field field_ref="vdiff_heattr" name="hfydiff" long_name="ocean_heat_y_transport_due_to_diffusion"          level="2" />
-	  </file>   
-
-	  <file id="1m grid_V table 2.8" name_suffix="_table2.8" >
-	    <field field_ref="vtau"         name="tauvo" long_name="surface_downward_y_stress"                          level="1" />
-	    <!-- tauvcorr : surface_downward_y_stress_correction = 0 -->
-	  </file>   
-
-	</file_group>
+	-->
+	<file id="file8" name_suffix="_grid_V_table2.3" >
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"                                       />
+	  <field field_ref="v_masstr"     name="vmo"     long_name="ocean_mass_y_transport"                           level="1" />
+	  <field field_ref="v_heattr"     name="hfy"     long_name="ocean_heat_y_transport"                           level="1" />
+	  <field field_ref="veiv_heattr"  name="hfyba"   long_name="ocean_heat_y_transport_due_to_bolus_advection"    level="2" />
+	  <field field_ref="vdiff_heattr" name="hfydiff" long_name="ocean_heat_y_transport_due_to_diffusion"          level="2" />
+	</file>   
+	
+	<file id="file9" name_suffix="_grid_V_table2.8" >
+	  <field field_ref="vtau"         name="tauvo" long_name="surface_downward_y_stress"                          level="1" />
+	  <!-- tauvcorr : surface_downward_y_stress_correction = 0 -->
+	</file>   
 	<!--
 ..............................................    grid W   .................................................
-	  -->
-	<file_group id="1m_grid_W" name="auto" >                                                        <!-- grid W -->
-	  
-	  <file id="1m grid_W table 2.3" name_suffix="_table2.3" >
-	    <field field_ref="w_masstr"   name="wmo"   long_name="upward_ocean_mass_transport"                                    />
-	    <field field_ref="w_masstr2"  name="wmosq" long_name="square_pf_upward_ocean_mass_transport"                          />
-	  </file>   
-	  
-	  <file id="1m grid_W table 2.9" name_suffix="_table2.9" >
-	    <field field_ref="avt"     name="difvho"   long_name="ocean_vertical_heat_diffusivity"                  level="2" />
-	    <field field_ref="avs"     name="difvso"   long_name="ocean_vertical_salt_diffusivity"                  level="2" />
-	    <!-- difvtrbo : ocean_vertical_tracer_diffusivity_due_to_background : cte with time, see namelist parameters nn_avb and  nn_havtb -->
-	    <field field_ref="av_tide" name="difvtrto" long_name="ocean_vertical_tracer_diffusivity_due_to_tides"   level="2" />
-	    <!-- tnpeo     : tendency_of_ocean_potential_energy_content                   : not available -->
-	    <!-- tnpeot    : tendency_of_ocean_potential_energy_content_due_to_tides      : not available -->
-	    <!-- tnpeotb   : tendency_of_ocean_potential_energy_content_due_to_background : not available -->
-	    <field field_ref="avm"     name="difvmo"   long_name="ocean_vertical_momentum_diffusivity"              level="2" />
-	    <!-- difvmbo : ocean_vertical_momentum_diffusivity_due_to_background : cte with time, see namelist parameters nn_avb -->
-	    <field field_ref="av_tide" name="difvmto"  long_name="ocean_vertical_momentum_diffusivity_due_to_tides" level="2" /> <!-- same as tracer -->
-	    <!-- difvmfdo : ocean_vertical_momentum_diffusivity_due_to_form_drag : ??? -->
-	    <!-- dispkevfo : ocean_kinetic_energy_dissipation_per_unit_area_due_to_vertical_friction : not available -->
-	  </file>
-
-	  <file id="1m grid_W table 2.10" name_suffix="_table2.10" >
-	    <!-- if ln_traldf_lap    =  .true. -->
-	    <field field_ref="aht2d_eiv" name="diftrblo" long_name="ocean_tracer_bolus_laplacian_diffusivity"                     level="2" />
-	    <!-- diftrelo : ocean_tracer_epineutral_laplacian_diffusivity : cte with time, see ln_traldf_iso -->
-	    <!-- diftrxylo : ocean_tracer_xy_laplacian_diffusivity : cte with time -->
-	    <!-- if ln_traldf_bilap  =  .true. -->
-	    <!-- field field_ref="diftrbbo" name="aht2d_eiv" long_name="ocean_tracer_bolus_biharmonic_diffusivity"                    level="2" /-->
-	    <!-- diftrebo : ocean_tracer_epineutral_biharmonic_diffusivity : cte with time, see ln_traldf_iso -->
-	    <!-- diftrxybo : ocean_tracer_xy_biharmonic_diffusivity : cte with time -->
-	    <!-- tnkebto : tendency_of_ocean_eddy_kinetic_energy_content_due_to_bolus_transport : not available -->
-	    <!-- difmxylo : ocean_momentum_xy_laplacian_diffusivity : cte with time, see ln_dynldf_lap -->
-	    <!-- difmxybo : ocean_momentum_xy_biharmonic_diffusivity : cte with time, see ln_dynldf_bilap -->
-	    <!-- dispkexyfo : ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction : not available -->
-	  </file>   
-
-	</file_group>
+	-->
+	<file id="file10" name_suffix="_grid_W_table2.3" >
+	  <field field_ref="w_masstr"   name="wmo"   long_name="upward_ocean_mass_transport"                                    />
+	  <field field_ref="w_masstr2"  name="wmosq" long_name="square_pf_upward_ocean_mass_transport"                          />
+	</file>   
+	
+	<file id="file11" name_suffix="_grid_W_table2.9" >
+	  <field field_ref="avt"     name="difvho"   long_name="ocean_vertical_heat_diffusivity"                  level="2" />
+	  <field field_ref="avs"     name="difvso"   long_name="ocean_vertical_salt_diffusivity"                  level="2" />
+	  <!-- difvtrbo : ocean_vertical_tracer_diffusivity_due_to_background : cte with time, see namelist parameters nn_avb and  nn_havtb -->
+	  <field field_ref="av_tide" name="difvtrto" long_name="ocean_vertical_tracer_diffusivity_due_to_tides"   level="2" />
+	  <!-- tnpeo     : tendency_of_ocean_potential_energy_content                   : not available -->
+	  <!-- tnpeot    : tendency_of_ocean_potential_energy_content_due_to_tides      : not available -->
+	  <!-- tnpeotb   : tendency_of_ocean_potential_energy_content_due_to_background : not available -->
+	  <field field_ref="avm"     name="difvmo"   long_name="ocean_vertical_momentum_diffusivity"              level="2" />
+	  <!-- difvmbo : ocean_vertical_momentum_diffusivity_due_to_background : cte with time, see namelist parameters nn_avb -->
+	  <field field_ref="av_tide" name="difvmto"  long_name="ocean_vertical_momentum_diffusivity_due_to_tides" level="2" /> <!-- same as tracer -->
+	  <!-- difvmfdo : ocean_vertical_momentum_diffusivity_due_to_form_drag : ??? -->
+	  <!-- dispkevfo : ocean_kinetic_energy_dissipation_per_unit_area_due_to_vertical_friction : not available -->
+	</file>
+	
+	<file id="file12" name_suffix="_grid_W_table2.10" >
+	  <!-- if ln_traldf_lap    =  .true. -->
+	  <field field_ref="aht2d_eiv" name="diftrblo" long_name="ocean_tracer_bolus_laplacian_diffusivity"                     level="2" />
+	  <!-- diftrelo : ocean_tracer_epineutral_laplacian_diffusivity : cte with time, see ln_traldf_iso -->
+	  <!-- diftrxylo : ocean_tracer_xy_laplacian_diffusivity : cte with time -->
+	  <!-- if ln_traldf_bilap  =  .true. -->
+	  <!-- field field_ref="diftrbbo" name="aht2d_eiv" long_name="ocean_tracer_bolus_biharmonic_diffusivity"                    level="2" /-->
+	  <!-- diftrebo : ocean_tracer_epineutral_biharmonic_diffusivity : cte with time, see ln_traldf_iso -->
+	  <!-- diftrxybo : ocean_tracer_xy_biharmonic_diffusivity : cte with time -->
+	  <!-- tnkebto : tendency_of_ocean_eddy_kinetic_energy_content_due_to_bolus_transport : not available -->
+	  <!-- difmxylo : ocean_momentum_xy_laplacian_diffusivity : cte with time, see ln_dynldf_lap -->
+	  <!-- difmxybo : ocean_momentum_xy_biharmonic_diffusivity : cte with time, see ln_dynldf_bilap -->
+	  <!-- dispkexyfo : ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction : not available -->
+	</file>   
 	<!--
 ..............................................    scalar   .................................................
-	  -->
-	<file id="1m_scalar" name="auto" name_suffix="_table2.2" >         <!-- scalar -->
+	-->
+	<file id="file13" name_suffix="_scalar_table2.2" >         <!-- scalar -->
 	  <field field_ref="masstot"    name="masso"    long_name="sea_water_mass"                                />
 	  <field field_ref="voltot"     name="volo"     long_name="sea_water_volume"                              />
@@ -200,6 +185,6 @@
 	<!--
 ..............................................    icemod   .................................................
-	  -->
-	<file id="1m_icemod" name="auto" name_suffix="_table2.2" >         <!-- scalar -->
+	-->
+	<file id="file14" name_suffix="_icemod_table2.2" >         <!-- scalar -->
 	  <field field_ref="ice_pres"                     />
 	  <field field_ref="ice_cover"    name="sic"        long_name="sea_ice_area_fraction"                            />
Index: trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml
===================================================================
--- trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml	(revision 3910)
+++ trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml	(revision 3940)
@@ -21,6 +21,8 @@
     -->
     
-    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
+    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4">
     
+      <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+
       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
       <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
@@ -31,5 +33,5 @@
       <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files -->
 
-	<file id="1d_grid_T" name="auto" description="ocean T grid variables" >
+	<file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
 	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
@@ -37,18 +39,19 @@
 	</file>
 
-	<file id="1d_grid_U" name="auto" description="ocean U grid variables" >
+	<file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="suoce"        name="uos"     long_name="sea_surface_x_velocity"    />
 	</file>
 	
-	<file id="1d_grid_V" name="auto" description="ocean V grid variables" >
+	<file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="svoce"        name="vos"     long_name="sea_surface_y_velocity"    />
 	</file>
 	
       </file_group>
+
       <file_group id="3d" output_freq="3d"  output_level="10" enabled=".TRUE."/> <!-- 3d files -->    
 
       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
 
-	<file id="5d_grid_T" name="auto" description="ocean T grid variables" >
+	<file id="file4" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"               />
 	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                            />
@@ -66,5 +69,5 @@
 	</file>
 	
-	<file id="5d_grid_U" name="auto" description="ocean U grid variables" >
+	<file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      />
 	  <field field_ref="suoce"        name="uos"     long_name="sea_surface_x_velocity"    />
@@ -72,5 +75,5 @@
 	</file>
 	
-	<file id="5d_grid_V" name="auto" description="ocean V grid variables" >
+	<file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"      />
 	  <field field_ref="svoce"        name="vos"     long_name="sea_surface_y_velocity"    />
@@ -78,10 +81,10 @@
 	</file>
 	
-	<file id="5d_grid_W" name="auto" description="ocean W grid variables" >
+	<file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >
 	  <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         />
 	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
 	</file>
 	
-	<file id="5d_icemod" name="auto" description="ice variables" >
+	<file id="file8" name_suffix="_icemod" description="ice variables" >
 	  <field field_ref="ice_pres"                     />
 	  <field field_ref="snowthic_cea" name="snd"     long_name="surface_snow_thickness"   />
Index: trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml
===================================================================
--- trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml	(revision 3910)
+++ trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml	(revision 3940)
@@ -21,8 +21,8 @@
     -->
     
-    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
+    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4">
     
       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."> <!-- 1h files -->
-	<file id="1h_grid_T" name="auto" description="ocean T grid variables" >
+	<file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="sst"  />
 	  <field field_ref="qsr"  />
@@ -32,44 +32,41 @@
      
       <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files -->
-
-	<file_group id="1d_grid_T" name="auto" description="ocean T grid variables" >
-
-	  <!-- example of "hand made" zoom  -->
-	  <file id="blabla_1" name_suffix="_myzoom" >
-	    <!-- group of variables sharing the same zoom. see zoom definition in domain_def.xml -->
-	    <field_group id="blabla" domain_ref="myzoom" >    
-	      <field field_ref="toce" />
-	      <field field_ref="soce" />
-	    </field_group>
-	  </file>
-
-	  <!-- mooring: automatic definition of the file name suffix based on id="0n180wT"  -->
-	  <!-- include a group of variables. see field_def.xml for mooring variables definition  -->
-	  <file id="0n180wT" name_suffix="auto" >
-	      <field_group group_ref="mooring"/>  
-	  </file>
-
-	  <!-- Equatorial section: automatic definition of the file name suffix based on id="EqT" -->
-	  <!-- Zoom over vertical axis. def of axis_ref in the axis_definition bellow -->
-	  <file id="EqT" name_suffix="auto" >
-	    <field_group id="EqT" domain_ref="EqT" >
-	      <field field_ref="toce" name="votemper" axis_ref="deptht_zoom"  />
-	    </field_group>
-	  </file>
-
-	  <!-- global file with different operations on data   -->
-	  <file id="blabla_2" >
-	    <field field_ref="toce"   default_value="-10" />    <!-- redefine the missing value -->
-	    <field field_ref="sst"    name="sstmooring1" domain_ref="0n180wT"  />   <!-- include a mooring -->
-	    <field field_ref="sst"    name="sst_1d_ave"  />                         <!-- mean -->
-	    <field field_ref="sst"    name="sst_1d_inst" operation="instant" />     <!-- instant value -->
-	    <field field_ref="sst"    name="sst_1d_max"  operation="maximum" />     <!-- max -->
-	    <field field_ref="suoce"  />   <!-- include a U-grid variable in the list -->
-	  </file>
-
-	</file_group>
+	
+	<!-- example of "hand made" zoom  -->
+	<file id="file2" name_suffix="_grid_T_myzoom" >
+	  <!-- group of variables sharing the same zoom. see zoom definition in domain_def.xml -->
+	  <field_group id="blabla" domain_ref="myzoom" >    
+	    <field field_ref="toce" />
+	    <field field_ref="soce" />
+	  </field_group>
+	</file>
+	
+	<!-- mooring: automatic definition of the file name suffix based on id="0n180wT"  -->
+	<!-- include a group of variables. see field_def.xml for mooring variables definition  -->
+	<file id="0n180wT" >
+	  <field_group group_ref="mooring"/>  
+	</file>
+	
+	<!-- Equatorial section: automatic definition of the file name suffix based on id="EqT" -->
+	<!-- Zoom over vertical axis. def of axis_ref in the axis_definition bellow -->
+	<file id="EqT" >
+	  <field_group id="EqT" domain_ref="EqT" >
+	    <field field_ref="toce" name="votemper" axis_ref="deptht_myzoom"  />
+	  </field_group>
+	</file>
+	
+	<!-- global file with different operations on data   -->
+	<file id="file3" >
+	  <field field_ref="toce"   default_value="-10" />    <!-- redefine the missing value -->
+	  <field field_ref="sst"    name="sstmooring1" domain_ref="0n180wT"  />   <!-- include a mooring -->
+	  <field field_ref="sst"    name="sst_1d_ave"  />                         <!-- mean -->
+	  <field field_ref="sst"    name="sst_1d_inst" operation="instant" />     <!-- instant value -->
+	  <field field_ref="sst"    name="sst_1d_max"  operation="maximum" />     <!-- max -->
+	  <field field_ref="suoce"  />   <!-- include a U-grid variable in the list -->
+	</file>
+	
       </file_group>
-
-   </file_definition>
+      
+    </file_definition>
     
     <!-- 
@@ -82,5 +79,5 @@
      <axis_group id="deptht" long_name="Vertical T levels" unit="m" positive="down" >
        <axis id="deptht" />
-       <axis id="deptht_zoom" zoom_begin="1" zoom_end="10" />
+       <axis id="deptht_myzoom" zoom_begin="1" zoom_end="10" />
      </axis_group>
       <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
Index: trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml
===================================================================
--- trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml	(revision 3910)
+++ trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml	(revision 3940)
@@ -21,6 +21,8 @@
     -->
     
-    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
+    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1mo" min_digits="4">
     
+      <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+
       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
       <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
@@ -33,5 +35,5 @@
       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
 
-	<file id="5d_grid_T" name="auto" description="ocean T grid variables" >
+	<file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="toce"         name="votemper"  />
 	  <field field_ref="soce"         name="vosaline"  />
@@ -52,5 +54,5 @@
 	</file>
 	
-	<file id="5d_grid_U" name="auto" description="ocean U grid variables" >
+	<file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="uoce"         name="vozocrtx"  />
 	  <field field_ref="uoce_eiv"     name="vozoeivu"  />
@@ -58,5 +60,5 @@
 	</file>
 	
-	<file id="5d_grid_V" name="auto" description="ocean V grid variables" >
+	<file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="voce"         name="vomecrty"  />
 	  <field field_ref="voce_eiv"     name="vomeeivv"  />
@@ -64,5 +66,5 @@
 	</file>
 	
-	<file id="5d_grid_W" name="auto" description="ocean W grid variables" >
+	<file id="file4" name_suffix="_grid_W" description="ocean V grid variables" >
 	  <field field_ref="woce"         name="vovecrtz" />
 	  <field field_ref="avt"          name="votkeavt" />
@@ -71,5 +73,5 @@
 	</file>
 	
-	<file id="5d_icemod" name="auto" description="ice variables" >
+	<file id="file5" name_suffix="_icemod" description="ocean V grid variables" >
 	  <field field_ref="ice_pres"                     />
 	  <field field_ref="snowthic_cea" name="isnowthi" />
