Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml	(revision 3771)
@@ -55,8 +55,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -64,5 +64,14 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>  
   
   </context>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml	(revision 3771)
@@ -21,5 +21,5 @@
     -->
     
-    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
+    <file_definition type="one_file" sync_freq="1d" min_digits="4">
     
       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
@@ -85,8 +85,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -94,6 +94,15 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
-  
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition> 
+
   </context>
   
@@ -109,5 +118,5 @@
 	  <variable id="buffer_server_factor_size" type="integer">2</variable>
 	  <variable id="info_level"                type="integer">0</variable>
-	  <variable id="using_server"              type="boolean">false</variable>
+	  <variable id="using_server"              type="boolean">true</variable>
 	  <variable id="using_oasis"               type="boolean">false</variable>
 	  <variable id="oasis_codes_id"            type="string" >oceanx</variable>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml	(revision 3771)
@@ -55,8 +55,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -64,5 +64,14 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>    
   
   </context>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml	(revision 3771)
@@ -121,8 +121,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -130,5 +130,14 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>    
   
   </context>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml	(revision 3771)
@@ -1,159 +1,1 @@
-<?xml version="1.0"?>
-<simulation> 
-
- <context id="nemo" time_origin="1900-01-01 00:00:00" >
-    
-    <!-- $id$ -->
-    
-    <!-- 
-============================================================================================================
-=                                  definition of all existing variables                                    =
-=                                            DO NOT CHANGE                                                 =
-============================================================================================================
-    -->
-    <field_definition src="./field_def.xml"/>
-    <!-- 
-============================================================================================================
-=                                           output files definition                                        =
-=                                            Define your own files                                         =
-=                                         put the variables you want...                                    =
-============================================================================================================
-    -->
-    
-    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
-    
-      <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 -->
-      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->
-     
-      <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" >
-	  <field field_ref="sst"          name="sosstsst"  />
-	  <field field_ref="sss"          name="sosaline"  />
-	  <field field_ref="ssh"          name="sossheig"  />
-	</file>
-
-	<file id="1d_grid_U" name="auto" description="ocean U grid variables" >
-	  <field field_ref="suoce"         name="vozocrtx"  />
-	</file>
-	
-	<file id="1d_grid_V" name="auto" description="ocean V grid variables" >
-	  <field field_ref="svoce"         name="vomecrty"  />
-	</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" >
-	  <field field_ref="toce"         name="votemper"  />
-	  <field field_ref="soce"         name="vosaline"  />
-	  <field field_ref="sst"          name="sosstsst"  />
-	  <field field_ref="sss"          name="sosaline"  />
-	  <field field_ref="ssh"          name="sossheig"  />
-	  <field field_ref="empmr"        name="sowaflup"  />
-	  <field field_ref="qsr"          name="soshfldo"  />
-          <field field_ref="saltflx"      name="sosfldow"  />
-	  <field field_ref="qt"           name="sohefldo"  />
-	  <field field_ref="mldr10_1"     name="somxl010"  />
-	  <field field_ref="mldkz5"       name="somixhgt"  />
-	  <field field_ref="ice_cover"    name="soicecov"  />
-	  <field field_ref="wspd"         name="sowindsp"  />
-	  <field field_ref="erp"          name="sowafldp"  />
-	  <field field_ref="ist_ipa"      name="soicetem"  />
-	  <field field_ref="icealb_cea"   name="soicealb"  />   
-	</file>
-	
-	<file id="5d_grid_U" name="auto" description="ocean U grid variables" >
-	  <field field_ref="uoce"         name="vozocrtx"  />
-	  <field field_ref="uoce_eiv"     name="vozoeivu"  />
-	  <field field_ref="utau"         name="sozotaux"  />
-	</file>
-	
-	<file id="5d_grid_V" name="auto" description="ocean V grid variables" >
-	  <field field_ref="voce"         name="vomecrty"  />
-	  <field field_ref="voce_eiv"     name="vomeeivv"  />
-	  <field field_ref="vtau"         name="sometauy"  />
-	</file>
-	
-	<file id="5d_grid_W" name="auto" description="ocean W grid variables" >
-	  <field field_ref="woce"         name="vovecrtz" />
-	  <field field_ref="avt"          name="votkeavt" />
-	  <field field_ref="avs"          name="voddmavs" />
-	  <field field_ref="aht2d_eiv"    name="soleaeiw" />
-	</file>
-	
-	<file id="5d_icemod" name="auto" description="ice variables" >
-	  <field field_ref="ice_pres"                     />
-	  <field field_ref="snowthic_cea" name="isnowthi" />
-	  <field field_ref="icethic_cea"  name="iicethic" />
-	  <field field_ref="iceprod_cea"  name="iiceprod" />
-	  <field field_ref="ist_ipa"      name="iicetemp" />
-	  <field field_ref="ioceflxb"     name="ioceflxb" />
-	  <field field_ref="uice_ipa"     name="iicevelu" />
-	  <field field_ref="vice_ipa"     name="iicevelv" />
-	  <field field_ref="utau_ice"     name="iicestru" />
-	  <field field_ref="vtau_ice"     name="iicestrv" />
-	  <field field_ref="qsr_io_cea"   name="iicesflx" />
-	  <field field_ref="qns_io_cea"   name="iicenflx" />
-	  <field field_ref="snowpre"      name="isnowpre" />
-	</file>
-	
-      </file_group>
-
-      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files -->
-      <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-
-      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
-      <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
-
-   </file_definition>
-    
-    <!-- 
-============================================================================================================
-= grid definition = = DO NOT CHANGE =
-============================================================================================================
-    -->
-    
-   <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="nfloat" long_name="Float number"      unit="-"  />
-   </axis_definition> 
-    
-   <domain_definition src="./domain_def.xml"/>
-   
-   <grid_definition />    
-  
-  </context>
-  
-
-  <context id="xios">
-
-      <variable_definition>
-	
-     <!-- 
-        We must have buffer_size > jpi*jpj*jpk*8 (with jpi and jpj the subdomain size)
--->
-	  <variable id="buffer_size"               type="integer">10000000</variable>
-	  <variable id="buffer_server_factor_size" type="integer">2</variable>
-	  <variable id="info_level"                type="integer">0</variable>
-	  <variable id="using_server"              type="boolean">false</variable>
-	  <variable id="using_oasis"               type="boolean">false</variable>
-	  <variable id="oasis_codes_id"            type="string" >oceanx</variable>
-	
-      </variable_definition>
-               
-  </context>
-  
-</simulation>
+link iodef_default.xml
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml	(revision 3771)
@@ -2,5 +2,5 @@
 <simulation> 
   
-  <context id="nemo">
+  <context id="nemo" time_origin="1900-01-01 00:00:00" >
 
     <!-- $id$ -->
@@ -12,200 +12,5 @@
 ============================================================================================================
     -->
-    
-    <field_definition level="0" prec="4" operation="ave(X)" enabled=".TRUE."> <!-- time step automaticaly defined -->
-
-      <!-- T grid -->
-      
-      <group id="grid_T" axis_ref="none" grid_ref="grid_T">
-	<field id="toce"         description="temperature"                               unit="degC" axis_ref="deptht"   />
-       	<field id="soce"         description="salinity"                                  unit="psu"  axis_ref="deptht"   />
-	<field id="sst"          description="sea surface temperature"                   unit="degC"                     />
-	<field id="sst2"         description="square of sea surface temperature"         unit="degC2"                    />
-	<field id="sstgrad"      description="module of sst gradient"                    unit="degC/m"                   />
-	<field id="sstgrad2"     description="square of module of sst gradient"          unit="degC2/m2"                 />
-	<field id="sss"          description="sea surface salinity"                      unit="psu"                      />
-	<field id="sss2"         description="square of sea surface salinity"            unit="psu2"                     />
-	<field id="ssh"          description="sea surface height"                        unit="m"                        />
-	<field id="ssh2"         description="square of sea surface height"              unit="m2"                       />
-	<field id="mldkz5"       description="mixing layer depth (Turbocline)"           unit="m"                        />
-	<field id="mldr10_1"     description="Mixed Layer Depth 0.01 ref.10m"            unit="m"                        />
-       	<field id="rhop"         description="potential density (sigma0)"                unit="kg/m3" axis_ref="deptht"  />
-	<!-- next variables available with key_diahth -->
-	<field id="mlddzt"       description="Thermocline Depth (max dT/dz)"             unit="m"                        />
-	<field id="mldr10_3"     description="Mixed Layer Depth dr=0.03 (ref.10m)"       unit="m"                        />
-	<field id="mldr0_1"      description="Mixed Layer Depth dr=0.01 (ref.surf)"      unit="m"                        />
-	<field id="mldr0_3"      description="Mixed Layer Depth dr=0.03 (ref.surf)"      unit="m"                        />
-	<field id="mld_dt02"     description="Mixed Layer Depth |dt|=0.2 (ref.10m)"      unit="m"                        />
-	<field id="topthdep"     description="Top of the thermocline dt=-0.2 (ref.10m)"  unit="m"                        />
-	<field id="pycndep"      description="Pycnocline depth dr~dt=-0.2 (ref.10m)"     unit="m"                        />
-	<field id="BLT"          description="Barrier Layer Thickness"                   unit="m"                        />
-	<field id="tinv"         description="Max of vertical invertion of temperature"  unit="degC"                     />
-	<field id="depti"        description="Depth of max. vert. inv. of temperature"   unit="m"                        />
-        <field id="20d"          description="Depth of 20C isotherm"                     unit="m"                        />
-	<field id="28d"          description="Depth of 28C isotherm"                     unit="m"                        />
-	<field id="hc300"        description="Heat content 300 m"                        unit="W"                        />
-	<!-- variables available with key_diaar5 -->
-	<field id="botpres"      description="Pressure at sea floor"                     unit="dbar"                     />
-	<field id="cellthc"      description="Cell thickness"                            unit="m"     axis_ref="deptht"  />
-     </group>
-
-      <!-- SBC -->
-      
-      <group id="SBC" axis_ref="none" grid_ref="grid_T" > <!-- time step automaticaly defined based on nn_fsbc -->
-
-	<field id="empmr"        description="Net Upward Water Flux"                                        unit="kg/m2/s"  />
-	<field id="empsmr"       description="concentration/dilution water flux"                            unit="kg/m2/s"  />
-	<field id="snowpre"      description="Snow precipitation"                                           unit="kg/m2/s"  />
-	<field id="runoffs"      description="River Runoffs"                                                unit="Kg/m2/s"  />
-
-	<field id="qt"           description="Net Downward Heat Flux"                                       unit="W/m2"     />
-	<field id="qns"          description="non solar Downward Heat Flux"                                 unit="W/m2"     />
-	<field id="qsr"          description="Shortwave Radiation"                                          unit="W/m2"     />
-	<field id="qsr3d"        description="Shortwave Radiation 3D distribution"        axis_ref="deptht" unit="W/m2"     />
-	<field id="qrp"          description="Surface Heat Flux: Damping"                                   unit="W/m2"     />
-	<field id="erp"          description="Surface Water Flux: Damping"                                  unit="Kg/m2/s"  />
-	<field id="taum"         description="wind stress module"                                           unit="N/m2"     />
-	<field id="wspd"         description="Wind speed module at 10 m"                                    unit="m/s"      />
-
-        <!-- * variable relative to atmospheric pressure forcing : available with ln_apr_dyn -->
-        <field id="ssh_ib"       description="Inverse barometer sea surface height"                         unit="m"        />
-	
-	<!-- *_oce variables available with ln_blk_clio or ln_blk_core -->
-	<field id="qns_oce"      description="Non solar Downward Heat Flux over open ocean"                 unit="W/m2"     />
-	<field id="qlw_oce"      description="Longwave Downward Heat Flux over open ocean"                  unit="W/m2"     />
-	<field id="qsb_oce"      description="Sensible Downward Heat Flux over open ocean"                  unit="W/m2"     />
-	<field id="qla_oce"      description="Latent Downward Heat Flux over open ocean"                    unit="W/m2"     />
-	<field id="taum_oce"     description="wind stress module over open ocean"                           unit="N/m2"     />
-
-	<field id="ice_cover"    description="Ice fraction"                                                 unit="1"        />
-
-	<field id="ioceflxb"     description="Oceanic flux at the ice base"                                 unit="W/m2"     />
-	<field id="qsr_ai_cea"   description="Air-Ice downward solar heat flux (cell average)"              unit="W/m2"     />
-	<field id="qns_ai_cea"   description="Air-Ice downward non-solar heat flux (cell average)"          unit="W/m2"     />
-	<field id="qla_ai_cea"   description="Air-Ice downward Latent heat flux (cell average)"             unit="W/m2"     />
-	
-	<field id="qsr_io_cea"   description="Ice-Oce downward solar heat flux (cell average)"              unit="W/m2"     />
-	<field id="qns_io_cea"   description="Ice-Oce downward non-solar heat flux (cell average)"          unit="W/m2"     />
-	
-	<field id="snowthic_cea" description="Snow thickness (cell average)"                                unit="m"        />
-	<field id="icethic_cea"  description="Ice thickness (cell average)"                                 unit="m"        />
-	<field id="iceprod_cea"  description="Ice production (cell average)"                                unit="m/s"      />
-	
-	<field id="ice_pres"     description="Ice presence"                                                 unit="-"        />
-	<field id="ist_cea"      description="Ice surface temperature (cell average)"                       unit="degC"     />
-	<field id="ist_ipa"      description="Ice surface temperature (ice presence average)"               unit="degC"     />      
-	<field id="uice_ipa"     description="Ice velocity along i-axis at I-point (ice presence average)"  unit="m/s"      />      
-	<field id="vice_ipa"     description="Ice velocity along j-axis at I-point (ice presence average)"  unit="m/s"      />      
-	
-	<field id="utau_ice"     description="Wind stress along i-axis over the ice at i-point"             unit="N/m2"     />
-	<field id="vtau_ice"     description="Wind stress along j-axis over the ice at i-point"             unit="N/m2"     />
-	
-	<field id="u_imasstr"    description="Sea-ice mass transport along i-axis"                          unit="kg/s"     />
-	<field id="v_imasstr"    description="Sea-ice mass transport along j-axis"                          unit="kg/s"     />
-
-	<!-- available key_coupled -->
-	<field id="snow_ao_cea"  description="Snow over ice-free ocean (cell average)"                      unit="kg/m2/s"  />
-	<field id="snow_ai_cea"  description="Snow over sea-ice (cell average)"                             unit="kg/m2/s"  />
-	<field id="subl_ai_cea"  description="Sublimation over sea-ice (cell average)"                      unit="kg/m2/s"  />
-	<field id="icealb_cea"   description="Ice albedo (cell average)"                                    unit="1"        />
-	<field id="calving"      description="Calving"                                                      unit="kg/m2/s"  />
-	<!-- available if key_coupled + conservative method -->
-	<field id="rain"         description="Liquid precipitation"                                         unit="Kg/m2/s"  />
-	<field id="evap_ao_cea"  description="Evaporation over ice-free ocean (cell average)"               unit="kg/m2/s"  />
-	<!-- variables available with key_diaar5 -->
-	<field id="isnwmlt_cea"   description="Snow over Ice melting (cell average)"                        unit="kg/m2/s"  />
-	<field id="fsal_virt_cea" description="Virtual salt flux due to ice formation (cell average)"       unit="kg/m2/s"  />
-	<field id="fsal_real_cea" description="Real salt flux due to ice formation (cell average)"          unit="kg/m2/s"  />
-	<field id="hflx_rain_cea" description="heat flux due to rainfall"                                   unit="W/m2"     />
-	<field id="hflx_evap_cea" description="heat flux due to evaporation"                                unit="W/m2"     />
-	<field id="hflx_snow_cea" description="heat flux due to snow falling over ice-free ocean"           unit="W/m2"     />
-	<field id="hflx_ice_cea"  description="heat flux due to ice thermodynamics"                         unit="W/m2"     />
-	<field id="hflx_rnf_cea"  description="heat flux due to runoffs"                                    unit="W/m2"     />
-	<field id="hflx_cal_cea"  description="heat flux due to calving"                                    unit="W/m2"     />
-	<field id="bicemel_cea"  description="Rate of Melt at Sea Ice Base (cell average)"                  unit="kg/m2/s"  />
-	<field id="licepro_cea"  description="Lateral Sea Ice Growth Rate (cell average)"                   unit="kg/m2/s"  />
-	<field id="snowmel_cea"  description="Snow Melt Rate (cell average)"                                unit="kg/m2/s"  />
-	<field id="sntoice_cea"  description="Snow-Ice Formation Rate (cell average)"                       unit="kg/m2/s"  />
-	<field id="ticemel_cea"  description="Rate of Melt at Upper Surface of Sea Ice (cell average)"      unit="kg/m2/s"  />
-
-      </group>
-
-      <!-- U grid -->
-      
-      <group id="grid_U"  axis_ref="depthu" grid_ref="grid_U">
-	<field id="utau"         description="Wind Stress along i-axis"                    unit="N/m2" axis_ref="none" />
-	<field id="uoce"         description="ocean current along i-axis"                  unit="m/s"                  />
-	<field id="uocetr_eff"   description="Effective ocean transport along i-axis"      unit="m3/s"                 />
-	<!-- uoce_eiv: available with key_traldf_eiv and key_diaeiv -->
-	<field id="uoce_eiv"     description="EIV ocean current along i-axis"              unit="m/s"                  />
-	<!-- uoce_eiv: available with key_trabbl -->
-	<field id="uoce_bbl"     description="BBL ocean current along i-axis"              unit="m/s" axis_ref="none"  />
-	<field id="ahu_bbl"      description="BBL diffusive flux along i-axis"             unit="m3/s" axis_ref="none" />
- 	<!-- variables available with key_diaar5 -->
-	<field id="u_masstr"     description="ocean eulerian mass transport along i-axis"  unit="kg/s"                 />
-	<field id="u_heattr"     description="ocean eulerian heat transport along i-axis"  unit="W"    axis_ref="none" />
-	<field id="ueiv_heattr"  description="ocean bolus heat transport along i-axis"     unit="W"    axis_ref="none" />
-	<field id="udiff_heattr" description="ocean diffusion heat transport along i-axis" unit="W"    axis_ref="none" />
-     </group>
-      
-      <!-- V grid -->
-      
-      <group id="grid_V"  axis_ref="depthv" grid_ref="grid_V">
-	<field id="vtau"         description="Wind Stress along j-axis"                    unit="N/m2" axis_ref="none" />
-	<field id="voce"         description="ocean current along j-axis"                  unit="m/s"                  />
-	<field id="vocetr_eff"   description="Effective ocean transport along j-axis"      unit="m3/s"                  />
-	<!-- voce_eiv: available with key_traldf_eiv and key_diaeiv -->
-	<field id="voce_eiv"     description="EIV ocean current along j-axis"              unit="m/s"                  />
-	<!-- voce_eiv: available with key_trabbl -->
-	<field id="voce_bbl"     description="BBL ocean current along j-axis"              unit="m/s"  axis_ref="none" />
-	<field id="ahv_bbl"      description="BBL diffusive flux along j-axis"             unit="m3/s" axis_ref="none" />
-	<!-- variables available with key_diaar5 -->
-	<field id="v_masstr"     description="ocean eulerian mass transport along j-axis"  unit="kg/s"                 />
-	<field id="v_heattr"     description="ocean eulerian heat transport along j-axis"  unit="W"    axis_ref="none" />
-	<field id="veiv_heattr"  description="ocean bolus heat transport along j-axis"     unit="W"    axis_ref="none" />
-	<field id="vdiff_heattr" description="ocean diffusion heat transport along j-axis" unit="W"    axis_ref="none" />
-      </group>
-      
-      <!-- W grid -->
-      
-      <group id="grid_W"  axis_ref="depthw" grid_ref="grid_W">
-	<field id="woce"         description="ocean vertical velocity"                     unit="m/s"                  />
-	<field id="wocetr_eff"   description="effective ocean vertical transport"          unit="m3/s"                 />
-	<!-- woce_eiv: available with key_traldf_eiv and key_diaeiv -->
-	<field id="woce_eiv"     description="EIV ocean vertical velocity"                 unit="m/s"                  />
-	<!-- woce_eiv: available with key_trabbl_adv -->
-	<field id="avt"          description="vertical eddy diffusivity"                   unit="m2/s"                 />
-	<field id="avm"          description="vertical eddy viscosity"                     unit="m2/s"                 />
-	<!-- avs: available with key_zdfddm -->
-	<field id="avs"          description="salt vertical eddy diffusivity"              unit="m2/s"                 />
-	<!-- avt_evd and avm_evd: available with ln_zdfevd -->
-	<field id="avt_evd"      description="enhanced vertical diffusivity"               unit="m2/s"                 />
-	<field id="avm_evd"      description="enhanced vertical viscosity"                 unit="m2/s"                 />
-	<!-- aht2d and  aht2d_eiv: available with key_traldf_eiv and key_traldf_c2d -->
-	<field id="aht2d"        description="lateral eddy diffusivity"                    unit="m2/s" axis_ref="none" />
-	<field id="aht2d_eiv"    description="EIV lateral eddy diffusivity"                unit="m2/s" axis_ref="none" />
-	<!-- avt_tide: available with key_zdftmx -->
-	<field id="av_tide"      description="tidal vertical diffusivity"                  unit="m2/s"                 />
-	<!-- variables available with key_diaar5 -->   
-	<field id="w_masstr"     description="vertical mass trasport"                      unit="kg/s"                 />
-	<field id="w_masstr2"    description="square of vertical mass trasport"            unit="kg2/s2"               />
-      </group>
-          
-      <!-- scalar -->
-      
-      <!-- variables available with key_diaar5 -->
-      <group id="scalar" axis_ref="none" grid_ref="scalarpoint" zoom_ref="1point" >
-	<field id="voltot"     description="global mean volume"                         unit="m3"   />
-	<field id="sshtot"     description="global mean ssh"                            unit="m"    />
-	<field id="sshsteric"  description="global mean ssh steric"                     unit="m"    />
-	<field id="sshthster"  description="global mean ssh thermosteric"               unit="m"    />
-	<field id="masstot"    description="global mean mass"                           unit="kg"   />
-	<field id="temptot"    description="global mean temperature"                    unit="degC" />
-	<field id="saltot"     description="global mean salinity"                       unit="psu"  />
-	<field id="fram_trans" description="Sea Ice Mass Transport Through Fram Strait" unit="kg/s" />
-      </group>
-
-    </field_definition>
-    
+    <field_definition src="./field_def.xml"/>    
     <!-- 
 ============================================================================================================
@@ -221,37 +26,37 @@
     -->
     
-    <file_definition output_level="10" >
+    <file_definition type="multiple_file" output_level="10" sync_freq="1d" min_digits="4">
       <!--
 +++++++++++++++++++++++++++++++++++++++++++++++   daily   ++++++++++++++++++++++++++++++++++++++++++++++++++
         -->
-      <group id="1d" output_freq="86400"  enabled=".TRUE.">                      <!-- 1d files -->
-	<file id="1d_grid_T" name="auto" name_suffix="_table2.2" description="table 2.2" >         <!-- grid T  -->
-	  <field ref="sst"          name='tos'      description="sea_surface_temperature"                              level="2"                      />
-	  <field ref="sst2"         name='tossq'    description="square_of_sea_surface_temperature"                    level="2"                      />
-	  <field ref="mldkz5"       name='omldamax' description="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="t_max(X)" />
+      <file_group id="1d" output_freq="1d"  enabled=".TRUE.">                      <!-- 1d files -->
+	<file id="1d_grid_T" name="auto" name_suffix="_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"                      />
+	  <field field_ref="mldkz5"       name='omldamax' long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" />
 	</file>   
-      </group>
+      </file_group>
 	<!--
 ++++++++++++++++++++++++++++++++++++++++++++++   monthly   +++++++++++++++++++++++++++++++++++++++++++++++++
 	  -->
-      <group id="1m" output_freq="-1"     enabled=".TRUE.">                      <!-- real monthly files -->
+      <file_group id="1m" output_freq="1mo"     enabled=".TRUE.">                      <!-- real monthly files -->
 	<!--
 ..............................................    grid T   .................................................
 	  -->
-	<group id="1m_grid_T" name="auto" >                                                        <!-- 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 ref="botpres"      name="pbo"      description="sea_water_pressure_at_sea_floor"                               />
+	    <field field_ref="botpres"      name="pbo"      long_name="sea_water_pressure_at_sea_floor"                               />
 	    <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
-	    <field ref="ssh"          name="zos"      description="sea_surface_height_above_geoid"                                 />
-	    <field ref="ssh2"         name="zossq"    description="square_of_sea_surface_height_above_geoid"             level="2" />
+	    <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 ref="cellthc"      name="thkcello" description="cell_thickness"                                                 /> <!-- no time changes -->
-	    <field ref="toce"         name="thetao"   description="sea_water_potential_temperature"                                />
-	    <field ref="sst"          name="tos"      description="sea_surface_temperature"                              level="1" />
-	    <field ref="sst2"         name="tossq"    description="square_of_sea_surface_temperature"                    level="2" />
-	    <field ref="soce"         name="so"       description="sea_water_salinity"                                             />
-	    <field ref="sss"          name="sos"      description="sea_surface_salinity"                                 level="1" />
-	    <field ref="rhop"         name="rhopoto"  description="sea_water_potential_density"                          level="2" />
+	    <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 -->
@@ -259,17 +64,17 @@
 	    <!-- 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 ref="mldkz5"       name='omlmax'   description="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="t_max(X)" />
+	    <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 ref="rain"         name="pr"       description="rainfall_flux"                                           level="1" />
-	    <field ref="snow_ao_cea"  name="prsn"     description="snowfall_flux"                                           level="1" />
-	    <field ref="evap_ao_cea"  name="evs"      description="water_evaporation_flux"                                  level="1" />
-	    <field ref="runoffs"      name="friver"   description="water_flux_into_sea_water_from_rivers"                   level="1" />
-	    <field ref="calving"      name="ficeberg" description="water_flux_into_sea_water_from_icebergs"                 level="1" />
-	    <field ref="isnwmlt_cea"  name="fsitherm" description="water_flux_into_sea_water_due_to_sea_ice_thermodynamics" level="1" />
-	    <field ref="empmr"        name="wfo"      description="water_flux_into_sea_water"                               level="1" />
+	    <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 ref="erp"          name="wfcorr"   description="water_flux_correction"                                   level="1" /> <!-- usually = 0 -->
+	    <field field_ref="erp"          name="wfcorr"   long_name="water_flux_correction"                                   level="1" /> <!-- usually = 0 -->
 	  </file>   
 	  
@@ -278,8 +83,8 @@
 	    <!-- vsfevap  : virtual_salt_flux_into_sea_water_due_to_evaporation = 0 --> 
 	    <!-- vsfriver : virtual_salt_flux_into_sea_water_from_rivers        = 0 --> 	  
-	    <field ref="fsal_virt_cea" name="vsfsit" description="virtual_salt_flux_into_sea_water_due_to_sea_ice_thermodynamics" level="1" />
+	    <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 ref="fsal_virt_cea" name="sfdsi"  description="downward_sea_ice_basal_salt_flux"                               level="1" />
+	    <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>   
@@ -287,78 +92,78 @@
 	  <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 ref="hflx_rain_cea" name="hfrainds"    description="temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water"      level="1" />
-	    <field ref="hflx_evap_cea" name="hfevapds"    description="temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water" level="1" />
-	    <field ref="hflx_rnf_cea"  name="hfrunoffds"  description="temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water"        level="1" />
-	    <field ref="hflx_snow_cea" name="hfsnthermds" description="heat_flux_into_sea_water_due_to_snow_thermodynamics"                         level="1" />
-	    <field ref="hflx_ice_cea"  name="hfsithermds" description="heat_flux_into_sea_water_due_to_sea_ice_thermodynamics"                      level="1" />
-	    <field ref="hflx_cal_cea"  name="hfibthermds" description="heat_flux_into_sea_water_due_to_iceberg_thermodynamics"                      level="1" />
+	    <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 ref="qns"           name="nshfls"      description="surface_net_downward_non_solar_flux"                                         level="1" />
-	    <field ref="qsr"           name="rsntds"      description="surface_net_downward_shortwave_flux"                                         level="1" />
-	    <field ref="qsr3d"         name="rsds"        description="downwelling_shortwave_flux_in_sea_water"                                     level="1" />
-	    <field ref="qrp"           name="hfcorr"      description="heat_flux_correction"                                                        level="1" />
-	  </file>   
-	</group>
+	    <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>
 	<!--
 ..............................................    grid U   .................................................
 	  -->
-	<group id="1m_grid_U" name="auto" >                                                        <!-- 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 ref="uoce"         name="uo"      description="sea_water_x_velocity"                                       />
-	    <field ref="u_masstr"     name="umo"     description="ocean_mass_x_transport"                           level="1" />
-	    <field ref="u_heattr"     name="hfx"     description="ocean_heat_x_transport"                           level="1" />
-	    <field ref="ueiv_heattr"  name="hfxba"   description="ocean_heat_x_transport_due_to_bolus_advection"    level="2" />
-	    <field ref="udiff_heattr" name="hfxdiff" description="ocean_heat_x_transport_due_to_diffusion"          level="2" />
+	    <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 ref="utau"         name="tauuo" description="surface_downward_x_stress"                          level="1" />
+	    <field field_ref="utau"         name="tauuo" long_name="surface_downward_x_stress"                          level="1" />
 	    <!-- tauucorr : surface_downward_x_stress_correction = 0 -->
 	  </file>   
 
-	</group>
+	</file_group>
 	<!--
 ..............................................    grid V   .................................................
 	  -->
-	<group id="1m_grid_V" name="auto" >                                                        <!-- 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 ref="voce"         name="vo"      description="sea_water_y_velocity"                                       />
-	    <field ref="v_masstr"     name="vmo"     description="ocean_mass_y_transport"                           level="1" />
-	    <field ref="v_heattr"     name="hfy"     description="ocean_heat_y_transport"                           level="1" />
-	    <field ref="veiv_heattr"  name="hfyba"   description="ocean_heat_y_transport_due_to_bolus_advection"    level="2" />
-	    <field ref="vdiff_heattr" name="hfydiff" description="ocean_heat_y_transport_due_to_diffusion"          level="2" />
+	    <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 ref="vtau"         name="tauvo" description="surface_downward_y_stress"                          level="1" />
+	    <field field_ref="vtau"         name="tauvo" long_name="surface_downward_y_stress"                          level="1" />
 	    <!-- tauvcorr : surface_downward_y_stress_correction = 0 -->
 	  </file>   
 
-	</group>
+	</file_group>
 	<!--
 ..............................................    grid W   .................................................
 	  -->
-	<group id="1m_grid_W" name="auto" >                                                        <!-- 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 ref="w_masstr"   name="wmo"   description="upward_ocean_mass_transport"                                    />
-	    <field ref="w_masstr2"  name="wmosq" description="square_pf_upward_ocean_mass_transport"                          />
+	    <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 ref="avt"     name="difvho"   description="ocean_vertical_heat_diffusivity"                  level="2" />
-	    <field ref="avs"     name="difvso"   description="ocean_vertical_salt_diffusivity"                  level="2" />
+	    <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 ref="av_tide" name="difvtrto" description="ocean_vertical_tracer_diffusivity_due_to_tides"   level="2" />
+	    <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 ref="avm"     name="difvmo"   description="ocean_vertical_momentum_diffusivity"              level="2" />
+	    <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 ref="av_tide" name="difvmto"  description="ocean_vertical_momentum_diffusivity_due_to_tides" level="2" /> <!-- same as tracer -->
+	    <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 -->
@@ -367,9 +172,9 @@
 	  <file id="1m grid_W table 2.10" name_suffix="_table2.10" >
 	    <!-- if ln_traldf_lap    =  .true. -->
-	    <field ref="aht2d_eiv" name="diftrblo" description="ocean_tracer_bolus_laplacian_diffusivity"                     level="2" />
+	    <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 ref="diftrbbo" name="aht2d_eiv" description="ocean_tracer_bolus_biharmonic_diffusivity"                    level="2" /-->
+	    <!-- 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 -->
@@ -380,43 +185,43 @@
 	  </file>   
 
-	</group>
+	</file_group>
 	<!--
 ..............................................    scalar   .................................................
 	  -->
-	<file id="1m_scalar" name="auto" name_suffix="_table2.2" description="table 2.2" >         <!-- scalar -->
-	  <field ref="masstot"    name="masso"    description="sea_water_mass"                                />
-	  <field ref="voltot"     name="volo"     description="sea_water_volume"                              />
-	  <field ref="sshtot"     name="zosga"    description="global_average_sea_level_change"               />
-	  <field ref="sshsteric"  name="zossga"   description="global_average_steric_sea_level_change"        />
-	  <field ref="sshthster"  name="zostoga"  description="global_average_thermosteric_sea_level_change"  />
-	  <field ref="temptot"    name="thetaoga" description="sea_water_potential_temperature"               />
-	  <field ref="saltot"     name="soga"     description="sea_water_salinity"                            />
+	<file id="1m_scalar" name="auto" name_suffix="_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"                              />
+	  <field field_ref="sshtot"     name="zosga"    long_name="global_average_sea_level_change"               />
+	  <field field_ref="sshsteric"  name="zossga"   long_name="global_average_steric_sea_level_change"        />
+	  <field field_ref="sshthster"  name="zostoga"  long_name="global_average_thermosteric_sea_level_change"  />
+	  <field field_ref="temptot"    name="thetaoga" long_name="sea_water_potential_temperature"               />
+	  <field field_ref="saltot"     name="soga"     long_name="sea_water_salinity"                            />
 	</file>   
 	<!--
 ..............................................    icemod   .................................................
 	  -->
-	<file id="1m_icemod" name="auto" name_suffix="_table2.2" description="table 2.2" >         <!-- scalar -->
-	  <field ref="ice_pres"                     />
-	  <field ref="ice_cover"    name="sic"        description="sea_ice_area_fraction"                            />
-	  <field ref="icethic_cea"  name="sit"        description="sea_ice_thickness"                                />
-	  <field ref="subl_ai_cea"  name="evap"       description="water_evaporation_flux"                           />
-	  <field ref="snowthic_cea" name="snd"        description="surface_snow_thickness"                           />
+	<file id="1m_icemod" name="auto" name_suffix="_table2.2" >         <!-- scalar -->
+	  <field field_ref="ice_pres"                     />
+	  <field field_ref="ice_cover"    name="sic"        long_name="sea_ice_area_fraction"                            />
+	  <field field_ref="icethic_cea"  name="sit"        long_name="sea_ice_thickness"                                />
+	  <field field_ref="subl_ai_cea"  name="evap"       long_name="water_evaporation_flux"                           />
+	  <field field_ref="snowthic_cea" name="snd"        long_name="surface_snow_thickness"                           />
 	  <!-- snc : surface_snow_area_fraction : same as sic -->
-	  <field ref="icealb_cea"   name="ialb"       description="Bare Sea Ice Albedo"                              />
+	  <field field_ref="icealb_cea"   name="ialb"       long_name="Bare Sea Ice Albedo"                              />
 	  <!-- ssi : Sea Ice Salinity : cte = sice = 6, expect in baltic sea = 2 -->
-	  <field ref="ist_cea"      name="tsice"      description="Surface Temperature of Sea Ice"                   />
+	  <field field_ref="ist_cea"      name="tsice"      long_name="Surface Temperature of Sea Ice"                   />
 	  <!-- tsnint : Temperature at Interface Between Sea Ice and Snow : not available -->
 	  <!-- pr : Surface Rainfall Rate into the Sea Ice Portion of the Grid Cell = 0 -->
-	  <field ref="snow_ai_cea"  name="prsn"       description="Surface Snowfall Rate into the Sea Ice Portion of the Grid Cell" />
+	  <field field_ref="snow_ai_cea"  name="prsn"       long_name="Surface Snowfall Rate into the Sea Ice Portion of the Grid Cell" />
 	  <!-- ageice   : Age of Sea Ice : not available ??? -->
 	  <!-- grFrazil : Frazil Sea Ice Growth (Leads) Rate ??? -->
 	  <!-- grCongel : Congelation Sea Ice Growth Rate ??? -->
-	  <field ref="licepro_cea"  name="grLateral"  description="Lateral Sea Ice Growth Rate"                      />
-	  <field ref="sntoice_cea"  name="snoToIce"   description="Snow-Ice Formation Rate"                          />
-	  <field ref="snowmel_cea"  name="snomelt"    description="Snow Melt Rate"                                   />
-	  <field ref="ticemel_cea"  name="tmelt"      description="Rate of Melt at Upper Surface of Sea Ice"         />
-	  <field ref="bicemel_cea"  name="bmelt"      description="Rate of Melt at Sea Ice Base"                     />
+	  <field field_ref="licepro_cea"  name="grLateral"  long_name="Lateral Sea Ice Growth Rate"                      />
+	  <field field_ref="sntoice_cea"  name="snoToIce"   long_name="Snow-Ice Formation Rate"                          />
+	  <field field_ref="snowmel_cea"  name="snomelt"    long_name="Snow Melt Rate"                                   />
+	  <field field_ref="ticemel_cea"  name="tmelt"      long_name="Rate of Melt at Upper Surface of Sea Ice"         />
+	  <field field_ref="bicemel_cea"  name="bmelt"      long_name="Rate of Melt at Sea Ice Base"                     />
 	  <!-- hcice  : Sea Ice Total Heat Content ??? -->
-	  <field ref="qsr_ai_cea"   name="rsdssi"     description="surface_downwelling_shortwave_flux_in_air"        />
+	  <field field_ref="qsr_ai_cea"   name="rsdssi"     long_name="surface_downwelling_shortwave_flux_in_air"        />
 	  <!-- rsussi : surface_upwelling_shortwave_flux_in_air ??? -->
 	  <!-- rldssi : surface_downwelling_longwave_flux_in_air ??? -->
@@ -424,10 +229,10 @@
 	  <!-- hfssi  : surface_upward_sensible_heat_flux ??? -->
 	  <!-- hflssi : surface_upward_latent_heat_flux ??? -->
-	  <field ref="subl_ai_cea"  name="sblsi"      description="surface_snow_and_ice_sublimation_flux"             />
-	  <field ref="u_imasstr"    name="transix"    description="Eastward Sea Ice Transport"                        />
-	  <field ref="v_imasstr"    name="transiy"    description="Northward Sea Ice Transport"                       />
-	  <field ref="fram_trans"   name="transifs"   description="Sea Ice Mass Transport Through Fram Strait"        />
-	  <field ref="utau_ice"     name="strairx"    description="Eastward Atmospheric Stress On Sea Ice"            />
-	  <field ref="vtau_ice"     name="strairy"    description="Northward Atmospheric Stress On Sea Ice"           />
+	  <field field_ref="subl_ai_cea"  name="sblsi"      long_name="surface_snow_and_ice_sublimation_flux"             />
+	  <field field_ref="u_imasstr"    name="transix"    long_name="Eastward Sea Ice Transport"                        />
+	  <field field_ref="v_imasstr"    name="transiy"    long_name="Northward Sea Ice Transport"                       />
+	  <field field_ref="fram_trans"   name="transifs"   long_name="Sea Ice Mass Transport Through Fram Strait"        />
+	  <field field_ref="utau_ice"     name="strairx"    long_name="Eastward Atmospheric Stress On Sea Ice"            />
+	  <field field_ref="vtau_ice"     name="strairy"    long_name="Northward Atmospheric Stress On Sea Ice"           />
 	  <!-- strocnx : Eastward Ocean Stress On Sea Ice ??? -->
 	  <!-- strocny : Northward Ocean Stress On Sea Ice ??? -->
@@ -437,5 +242,5 @@
 	  <!-- ridgice : Sea Ice Ridging Rate ??? -->
 	</file>   
-      </group>
+      </file_group>
 
       <!-- 
@@ -451,184 +256,47 @@
     -->
     
-    <axis_definition>  
-      <axis id="deptht" description="Vertical T levels" unit="m" positive=".false." />
-      <axis id="depthu" description="Vertical U levels" unit="m" positive=".false." />
-      <axis id="depthv" description="Vertical V levels" unit="m" positive=".false." />
-      <axis id="depthw" description="Vertical W levels" unit="m" positive=".false." />
-      <axis id="none" description="axe non defini" unit="none" size="1" />
-    </axis_definition> 
-    
-    <grid_definition>
-      <grid id="grid_T" description="grid T" >
-    <!--   Eq section   -->
-	<zoom id="EqT" ibegin="1" jbegin="0000" ni="0000" nj="1" />
-    <!--   TAO   -->
-      <!--   137e   -->
-	<zoom id="2n137eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n137eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n137eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   147e   -->
-	<zoom id="0n147eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n147eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n147eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   156e   -->
-	<zoom id="5s156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   165e   -->
-	<zoom id="8s165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   180w   -->
-	<zoom id="8s180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   170w   -->
-	<zoom id="8s170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   155w   -->
-	<zoom id="8s155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   140w   -->
-	<zoom id="8s140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   125w   -->
-	<zoom id="8s125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   110w   -->
-	<zoom id="8s110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   95w   -->
-	<zoom id="8s95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-    <!--   RAMA   -->
-      <!--   55e   -->
-	<zoom id="16s55eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s55eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
- 	<zoom id="8s55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4s55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5s55eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n55eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   65e   -->
-	<zoom id="15n65eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   67e   -->
-	<zoom id="16s67eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s67eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4s67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5s67eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n67eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   80.5e   -->
-	<zoom id="16s80.5eT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s80.5eT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4s80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5s80.5eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n80.5eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   90e   -->
-	<zoom id="1.5s90eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n90eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n90eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n90eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n90eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12n90eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="15n90eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   95e   -->
-	<zoom id="16s95eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s95eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s95eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s95eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-    <!--   PIRATA   -->
-      <!--   38w-30w   -->
-	<zoom id="19s34wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="14s32wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s30wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n35wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n38wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n38wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12n38wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="15n38wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="20n38wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   23w   -->
-	<zoom id="0n23wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n23wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12n23wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="21n23wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   10w   -->
-	<zoom id="10s10wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="6s10wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n10wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   0e   -->
-	<zoom id="0n0eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      </grid>
-
-      <grid id="grid_U" description="grid U" >
-    <!--   Eq section   -->
-	<zoom id="EqU" ibegin="1" jbegin="0000" ni="0000" nj="1" />
-      </grid>
-
-      <grid id="grid_V" description="grid V" >
-      </grid>
-
-      <grid id="grid_W" description="grid W" >
-    <!--   Eq section   -->
-	<zoom id="EqW" ibegin="1" jbegin="0000" ni="0000" nj="1" />
-      </grid>
-
-      <grid id="scalarpoint" description="scalar" >
-	<zoom id="1point" ibegin="1" jbegin="1" ni="1" nj="1" />
-      </grid>
-
+
+   <axis_definition>  
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
+      <axis id="nfloat" long_name="Float number"      unit="-"  />
+   </axis_definition> 
+    
+   <domain_definition src="./domain_def.xml"/>
+   
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
     </grid_definition>    
-    
+
+  </context>
+  
+
+  <context id="xios">
+
+      <variable_definition>
+	
+     <!-- 
+        We must have buffer_size > jpi*jpj*jpk*8*3 (with jpi and jpj the subdomain size)
+-->
+	  <variable id="buffer_size"               type="integer">25000000</variable>
+	  <variable id="buffer_server_factor_size" type="integer">2</variable>
+	  <variable id="info_level"                type="integer">0</variable>
+	  <variable id="using_server"              type="boolean">false</variable>
+	  <variable id="using_oasis"               type="boolean">false</variable>
+	  <variable id="oasis_codes_id"            type="string" >oceanx</variable>
+	
+      </variable_definition>
+               
   </context>
   
 </simulation>
+  
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml	(revision 3771)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml	(revision 3771)
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<simulation> 
+
+ <context id="nemo" time_origin="1950-01-01 00:00:00" >
+    
+    <!-- $id$ -->
+    
+    <!-- 
+============================================================================================================
+=                                  definition of all existing variables                                    =
+=                                            DO NOT CHANGE                                                 =
+============================================================================================================
+    -->
+    <field_definition src="./field_def.xml"/>
+    <!-- 
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files                                         =
+=                                         put the variables you want...                                    =
+============================================================================================================
+    -->
+    
+    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
+    
+      <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 -->
+      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->
+     
+      <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" >
+	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
+	  <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                />
+	</file>
+
+	<file id="1d_grid_U" name="auto" 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" >
+	  <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" >
+	  <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"               />
+	  <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                            />
+	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
+	  <field field_ref="sst2"         name="tossq"    long_name="square_of_sea_surface_temperature"             />
+	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
+	  <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"      />
+	  <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     />
+	  <field field_ref="qsr"          name="rsntds"   long_name="surface_net_downward_shortwave_flux"           />
+	  <field field_ref="qt"           name="tohfls"   long_name="surface_net_downward_total_heat_flux"          />
+	  <field field_ref="taum"         />
+	  <field field_ref="mldkz5"       />
+	  <field field_ref="mldr10_1"     />
+	</file>
+	
+	<file id="5d_grid_U" name="auto" 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"    />
+	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
+	</file>
+	
+	<file id="5d_grid_V" name="auto" 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"    />
+	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
+	</file>
+	
+	<file id="5d_grid_W" name="auto" 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" >
+	  <field field_ref="ice_pres"                     />
+	  <field field_ref="snowthic_cea" name="snd"     long_name="surface_snow_thickness"   />
+	  <field field_ref="icethic_cea"  name="sit"     long_name="sea_ice_thickness"        />
+	  <field field_ref="iceprod_cea"  name="sip"     long_name="sea_ice_thickness"        />
+	  <field field_ref="ist_ipa"      />
+	  <field field_ref="ioceflxb"     />
+	  <field field_ref="uice_ipa"     />
+	  <field field_ref="vice_ipa"     />
+	  <field field_ref="utau_ice"     />
+	  <field field_ref="vtau_ice"     />
+	  <field field_ref="qsr_io_cea"   />
+	  <field field_ref="qns_io_cea"   />
+	  <field field_ref="snowpre"      />
+	</file>
+	
+      </file_group>
+
+      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files -->
+      <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+
+      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
+      <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+   </file_definition>
+    
+    <!-- 
+============================================================================================================
+= grid definition = = DO NOT CHANGE =
+============================================================================================================
+    -->
+    
+   <axis_definition>  
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
+      <axis id="nfloat" long_name="Float number"      unit="-"  />
+   </axis_definition> 
+    
+   <domain_definition src="./domain_def.xml"/>
+   
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>   
+  </context>
+  
+
+  <context id="xios">
+
+      <variable_definition>
+	
+     <!-- 
+        We must have buffer_size > jpi*jpj*jpk*8 (with jpi and jpj the subdomain size)
+-->
+	  <variable id="buffer_size"               type="integer">25000000</variable>
+	  <variable id="buffer_server_factor_size" type="integer">2</variable>
+	  <variable id="info_level"                type="integer">0</variable>
+	  <variable id="using_server"              type="boolean">false</variable>
+	  <variable id="using_oasis"               type="boolean">false</variable>
+	  <variable id="oasis_codes_id"            type="string" >oceanx</variable>
+	
+      </variable_definition>
+               
+  </context>
+  
+</simulation>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml	(revision 3771)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml	(revision 3771)
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<simulation> 
+
+  <context id="nemo" time_origin="1900-01-01 00:00:00" >
+    
+    <!-- $id$ -->
+    
+    <!-- 
+============================================================================================================
+=                                  definition of all existing variables                                    =
+=                                            DO NOT CHANGE                                                 =
+============================================================================================================
+    -->
+    <field_definition src="./field_def.xml"/>
+    <!-- 
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files                                         =
+=                                         put the variables you want...                                    =
+============================================================================================================
+    -->
+    
+    <file_definition type="multiple_file" 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" >
+	  <field field_ref="sst"  />
+	  <field field_ref="qsr"  />
+	</file>
+      </file_group>
+
+     
+      <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>
+      </file_group>
+
+   </file_definition>
+    
+    <!-- 
+============================================================================================================
+= grid definition = = DO NOT CHANGE =
+============================================================================================================
+    -->
+    
+   <axis_definition>  
+     <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_group>
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
+      <axis id="nfloat" long_name="Float number"      unit="-"  />
+   </axis_definition> 
+    
+   <domain_definition src="./domain_def.xml"/>
+   
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>    
+
+  </context>
+  
+
+  <context id="xios">
+
+      <variable_definition>
+	
+     <!-- 
+        We must have buffer_size > jpi*jpj*jpk*8*3 (with jpi and jpj the subdomain size)
+-->
+	  <variable id="buffer_size"               type="integer">25000000</variable>
+	  <variable id="buffer_server_factor_size" type="integer">2</variable>
+	  <variable id="info_level"                type="integer">0</variable>
+	  <variable id="using_server"              type="boolean">false</variable>
+	  <variable id="using_oasis"               type="boolean">false</variable>
+	  <variable id="oasis_codes_id"            type="string" >oceanx</variable>
+	
+      </variable_definition>
+               
+  </context>
+  
+</simulation>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml	(revision 3771)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml	(revision 3771)
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<simulation> 
+
+ <context id="nemo" time_origin="1900-01-01 00:00:00" >
+    
+    <!-- $id$ -->
+    
+    <!-- 
+============================================================================================================
+=                                  definition of all existing variables                                    =
+=                                            DO NOT CHANGE                                                 =
+============================================================================================================
+    -->
+    <field_definition src="./field_def.xml"/>
+    <!-- 
+============================================================================================================
+=                                           output files definition                                        =
+=                                            Define your own files                                         =
+=                                         put the variables you want...                                    =
+============================================================================================================
+    -->
+    
+    <file_definition type="multiple_file" sync_freq="1d" min_digits="4">
+    
+      <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 -->
+      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->
+     
+      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."/> <!-- 1d files -->
+      <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" >
+	  <field field_ref="toce"         name="votemper"  />
+	  <field field_ref="soce"         name="vosaline"  />
+	  <field field_ref="sst"          name="sosstsst"  />
+	  <field field_ref="sss"          name="sosaline"  />
+	  <field field_ref="ssh"          name="sossheig"  />
+	  <field field_ref="empmr"        name="sowaflup"  />
+	  <field field_ref="qsr"          name="soshfldo"  />
+          <field field_ref="saltflx"      name="sosfldow"  />
+	  <field field_ref="qt"           name="sohefldo"  />
+	  <field field_ref="mldr10_1"     name="somxl010"  />
+	  <field field_ref="mldkz5"       name="somixhgt"  />
+	  <field field_ref="ice_cover"    name="soicecov"  />
+	  <field field_ref="wspd"         name="sowindsp"  />
+	  <field field_ref="erp"          name="sowafldp"  />
+	  <field field_ref="ist_ipa"      name="soicetem"  />
+	  <field field_ref="icealb_cea"   name="soicealb"  />   
+	</file>
+	
+	<file id="5d_grid_U" name="auto" description="ocean U grid variables" >
+	  <field field_ref="uoce"         name="vozocrtx"  />
+	  <field field_ref="uoce_eiv"     name="vozoeivu"  />
+	  <field field_ref="utau"         name="sozotaux"  />
+	</file>
+	
+	<file id="5d_grid_V" name="auto" description="ocean V grid variables" >
+	  <field field_ref="voce"         name="vomecrty"  />
+	  <field field_ref="voce_eiv"     name="vomeeivv"  />
+	  <field field_ref="vtau"         name="sometauy"  />
+	</file>
+	
+	<file id="5d_grid_W" name="auto" description="ocean W grid variables" >
+	  <field field_ref="woce"         name="vovecrtz" />
+	  <field field_ref="avt"          name="votkeavt" />
+	  <field field_ref="avs"          name="voddmavs" />
+	  <field field_ref="aht2d_eiv"    name="soleaeiw" />
+	</file>
+	
+	<file id="5d_icemod" name="auto" description="ice variables" >
+	  <field field_ref="ice_pres"                     />
+	  <field field_ref="snowthic_cea" name="isnowthi" />
+	  <field field_ref="icethic_cea"  name="iicethic" />
+	  <field field_ref="iceprod_cea"  name="iiceprod" />
+	  <field field_ref="ist_ipa"      name="iicetemp" />
+	  <field field_ref="ioceflxb"     name="ioceflxb" />
+	  <field field_ref="uice_ipa"     name="iicevelu" />
+	  <field field_ref="vice_ipa"     name="iicevelv" />
+	  <field field_ref="utau_ice"     name="iicestru" />
+	  <field field_ref="vtau_ice"     name="iicestrv" />
+	  <field field_ref="qsr_io_cea"   name="iicesflx" />
+	  <field field_ref="qns_io_cea"   name="iicenflx" />
+	  <field field_ref="snowpre"      name="isnowpre" />
+	</file>
+	
+      </file_group>
+
+      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files -->
+      <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+
+      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
+      <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+
+   </file_definition>
+    
+    <!-- 
+============================================================================================================
+= grid definition = = DO NOT CHANGE =
+============================================================================================================
+    -->
+    
+   <axis_definition>  
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
+      <axis id="nfloat" long_name="Float number"      unit="-"  />
+   </axis_definition> 
+    
+   <domain_definition src="./domain_def.xml"/>
+   
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>   
+  </context>
+
+  <context id="xios">
+
+      <variable_definition>
+	
+     <!-- 
+        We must have buffer_size > jpi*jpj*jpk*8 (with jpi and jpj the subdomain size)
+-->
+	  <variable id="buffer_size"               type="integer">25000000</variable>
+	  <variable id="buffer_server_factor_size" type="integer">2</variable>
+	  <variable id="info_level"                type="integer">0</variable>
+	  <variable id="using_server"              type="boolean">false</variable>
+	  <variable id="using_oasis"               type="boolean">false</variable>
+	  <variable id="oasis_codes_id"            type="string" >oceanx</variable>
+	
+      </variable_definition>
+               
+  </context>
+  
+</simulation>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml	(revision 3771)
@@ -55,8 +55,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -64,5 +64,14 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>  
   
   </context>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml	(revision 3771)
@@ -224,8 +224,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -233,5 +233,14 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>  
   
   </context>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml	(revision 3771)
@@ -152,8 +152,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -161,5 +161,14 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>    
   
   </context>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml	(revision 3771)
@@ -55,8 +55,8 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthu" long_name="Vertical U levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthv" long_name="Vertical V levels" unit="m"  /><!-- positive=".FALSE." -->
-      <axis id="depthw" long_name="Vertical W levels" unit="m"  /><!-- positive=".FALSE." -->
+      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
+      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
+      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
+      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
       <axis id="nfloat" long_name="Float number"      unit="-"  />
    </axis_definition> 
@@ -64,5 +64,14 @@
    <domain_definition src="./domain_def.xml"/>
    
-   <grid_definition />    
+   <grid_definition>    
+     <grid id="grid_T_2D" domain_ref="grid_T"/>
+     <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/>
+     <grid id="grid_U_2D" domain_ref="grid_U"/>
+     <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/>
+     <grid id="grid_V_2D" domain_ref="grid_V"/>
+     <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/>
+     <grid id="grid_W_2D" domain_ref="grid_W"/>
+     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/>
+    </grid_definition>    
   
   </context>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef_ar5.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef_ar5.xml	(revision 3770)
+++ 	(revision )
@@ -1,634 +1,0 @@
-<?xml version="1.0"?>
-<simulation> 
-  
-  <context id="nemo">
-
-    <!-- $id$ -->
-    
-    <!-- 
-============================================================================================================
-=                                  definition of all existing variables                                    =
-=                                            DO NOT CHANGE                                                 =
-============================================================================================================
-    -->
-    
-    <field_definition level="0" prec="4" operation="ave(X)" enabled=".TRUE."> <!-- time step automaticaly defined -->
-
-      <!-- T grid -->
-      
-      <group id="grid_T" axis_ref="none" grid_ref="grid_T">
-	<field id="toce"         description="temperature"                               unit="degC" axis_ref="deptht"   />
-       	<field id="soce"         description="salinity"                                  unit="psu"  axis_ref="deptht"   />
-	<field id="sst"          description="sea surface temperature"                   unit="degC"                     />
-	<field id="sst2"         description="square of sea surface temperature"         unit="degC2"                    />
-	<field id="sstgrad"      description="module of sst gradient"                    unit="degC/m"                   />
-	<field id="sstgrad2"     description="square of module of sst gradient"          unit="degC2/m2"                 />
-	<field id="sss"          description="sea surface salinity"                      unit="psu"                      />
-	<field id="sss2"         description="square of sea surface salinity"            unit="psu2"                     />
-	<field id="ssh"          description="sea surface height"                        unit="m"                        />
-	<field id="ssh2"         description="square of sea surface height"              unit="m2"                       />
-	<field id="mldkz5"       description="mixing layer depth (Turbocline)"           unit="m"                        />
-	<field id="mldr10_1"     description="Mixed Layer Depth 0.01 ref.10m"            unit="m"                        />
-       	<field id="rhop"         description="potential density (sigma0)"                unit="kg/m3" axis_ref="deptht"  />
-	<!-- next variables available with key_diahth -->
-	<field id="mlddzt"       description="Thermocline Depth (max dT/dz)"             unit="m"                        />
-	<field id="mldr10_3"     description="Mixed Layer Depth dr=0.03 (ref.10m)"       unit="m"                        />
-	<field id="mldr0_1"      description="Mixed Layer Depth dr=0.01 (ref.surf)"      unit="m"                        />
-	<field id="mldr0_3"      description="Mixed Layer Depth dr=0.03 (ref.surf)"      unit="m"                        />
-	<field id="mld_dt02"     description="Mixed Layer Depth |dt|=0.2 (ref.10m)"      unit="m"                        />
-	<field id="topthdep"     description="Top of the thermocline dt=-0.2 (ref.10m)"  unit="m"                        />
-	<field id="pycndep"      description="Pycnocline depth dr~dt=-0.2 (ref.10m)"     unit="m"                        />
-	<field id="BLT"          description="Barrier Layer Thickness"                   unit="m"                        />
-	<field id="tinv"         description="Max of vertical invertion of temperature"  unit="degC"                     />
-	<field id="depti"        description="Depth of max. vert. inv. of temperature"   unit="m"                        />
-        <field id="20d"          description="Depth of 20C isotherm"                     unit="m"                        />
-	<field id="28d"          description="Depth of 28C isotherm"                     unit="m"                        />
-	<field id="hc300"        description="Heat content 300 m"                        unit="W"                        />
-	<!-- variables available with key_diaar5 -->
-	<field id="botpres"      description="Pressure at sea floor"                     unit="dbar"                     />
-	<field id="cellthc"      description="Cell thickness"                            unit="m"     axis_ref="deptht"  />
-     </group>
-
-      <!-- SBC -->
-      
-      <group id="SBC" axis_ref="none" grid_ref="grid_T" > <!-- time step automaticaly defined based on nn_fsbc -->
-
-	<field id="empmr"        description="Net Upward Water Flux"                                        unit="kg/m2/s"  />
-	<field id="empsmr"       description="concentration/dilution water flux"                            unit="kg/m2/s"  />
-	<field id="snowpre"      description="Snow precipitation"                                           unit="kg/m2/s"  />
-	<field id="runoffs"      description="River Runoffs"                                                unit="Kg/m2/s"  />
-
-	<field id="qt"           description="Net Downward Heat Flux"                                       unit="W/m2"     />
-	<field id="qns"          description="non solar Downward Heat Flux"                                 unit="W/m2"     />
-	<field id="qsr"          description="Shortwave Radiation"                                          unit="W/m2"     />
-	<field id="qsr3d"        description="Shortwave Radiation 3D distribution"        axis_ref="deptht" unit="W/m2"     />
-	<field id="qrp"          description="Surface Heat Flux: Damping"                                   unit="W/m2"     />
-	<field id="erp"          description="Surface Water Flux: Damping"                                  unit="Kg/m2/s"  />
-	<field id="taum"         description="wind stress module"                                           unit="N/m2"     />
-	<field id="wspd"         description="Wind speed module at 10 m"                                    unit="m/s"      />
-
-        <!-- * variable relative to atmospheric pressure forcing : available with ln_apr_dyn -->
-        <field id="ssh_ib"       description="Inverse barometer sea surface height"                         unit="m"        />
-	
-	<!-- *_oce variables available with ln_blk_clio or ln_blk_core -->
-	<field id="qns_oce"      description="Non solar Downward Heat Flux over open ocean"                 unit="W/m2"     />
-	<field id="qlw_oce"      description="Longwave Downward Heat Flux over open ocean"                  unit="W/m2"     />
-	<field id="qsb_oce"      description="Sensible Downward Heat Flux over open ocean"                  unit="W/m2"     />
-	<field id="qla_oce"      description="Latent Downward Heat Flux over open ocean"                    unit="W/m2"     />
-	<field id="taum_oce"     description="wind stress module over open ocean"                           unit="N/m2"     />
-
-	<field id="ice_cover"    description="Ice fraction"                                                 unit="1"        />
-
-	<field id="ioceflxb"     description="Oceanic flux at the ice base"                                 unit="W/m2"     />
-	<field id="qsr_ai_cea"   description="Air-Ice downward solar heat flux (cell average)"              unit="W/m2"     />
-	<field id="qns_ai_cea"   description="Air-Ice downward non-solar heat flux (cell average)"          unit="W/m2"     />
-	<field id="qla_ai_cea"   description="Air-Ice downward Latent heat flux (cell average)"             unit="W/m2"     />
-	
-	<field id="qsr_io_cea"   description="Ice-Oce downward solar heat flux (cell average)"              unit="W/m2"     />
-	<field id="qns_io_cea"   description="Ice-Oce downward non-solar heat flux (cell average)"          unit="W/m2"     />
-	
-	<field id="snowthic_cea" description="Snow thickness (cell average)"                                unit="m"        />
-	<field id="icethic_cea"  description="Ice thickness (cell average)"                                 unit="m"        />
-	<field id="iceprod_cea"  description="Ice production (cell average)"                                unit="m/s"      />
-	
-	<field id="ice_pres"     description="Ice presence"                                                 unit="-"        />
-	<field id="ist_cea"      description="Ice surface temperature (cell average)"                       unit="degC"     />
-	<field id="ist_ipa"      description="Ice surface temperature (ice presence average)"               unit="degC"     />      
-	<field id="uice_ipa"     description="Ice velocity along i-axis at I-point (ice presence average)"  unit="m/s"      />      
-	<field id="vice_ipa"     description="Ice velocity along j-axis at I-point (ice presence average)"  unit="m/s"      />      
-	
-	<field id="utau_ice"     description="Wind stress along i-axis over the ice at i-point"             unit="N/m2"     />
-	<field id="vtau_ice"     description="Wind stress along j-axis over the ice at i-point"             unit="N/m2"     />
-	
-	<field id="u_imasstr"    description="Sea-ice mass transport along i-axis"                          unit="kg/s"     />
-	<field id="v_imasstr"    description="Sea-ice mass transport along j-axis"                          unit="kg/s"     />
-
-	<!-- available key_coupled -->
-	<field id="snow_ao_cea"  description="Snow over ice-free ocean (cell average)"                      unit="kg/m2/s"  />
-	<field id="snow_ai_cea"  description="Snow over sea-ice (cell average)"                             unit="kg/m2/s"  />
-	<field id="subl_ai_cea"  description="Sublimation over sea-ice (cell average)"                      unit="kg/m2/s"  />
-	<field id="icealb_cea"   description="Ice albedo (cell average)"                                    unit="1"        />
-	<field id="calving"      description="Calving"                                                      unit="kg/m2/s"  />
-	<!-- available if key_coupled + conservative method -->
-	<field id="rain"         description="Liquid precipitation"                                         unit="Kg/m2/s"  />
-	<field id="evap_ao_cea"  description="Evaporation over ice-free ocean (cell average)"               unit="kg/m2/s"  />
-	<!-- variables available with key_diaar5 -->
-	<field id="isnwmlt_cea"   description="Snow over Ice melting (cell average)"                        unit="kg/m2/s"  />
-	<field id="fsal_virt_cea" description="Virtual salt flux due to ice formation (cell average)"       unit="kg/m2/s"  />
-	<field id="fsal_real_cea" description="Real salt flux due to ice formation (cell average)"          unit="kg/m2/s"  />
-	<field id="hflx_rain_cea" description="heat flux due to rainfall"                                   unit="W/m2"     />
-	<field id="hflx_evap_cea" description="heat flux due to evaporation"                                unit="W/m2"     />
-	<field id="hflx_snow_cea" description="heat flux due to snow falling over ice-free ocean"           unit="W/m2"     />
-	<field id="hflx_ice_cea"  description="heat flux due to ice thermodynamics"                         unit="W/m2"     />
-	<field id="hflx_rnf_cea"  description="heat flux due to runoffs"                                    unit="W/m2"     />
-	<field id="hflx_cal_cea"  description="heat flux due to calving"                                    unit="W/m2"     />
-	<field id="bicemel_cea"  description="Rate of Melt at Sea Ice Base (cell average)"                  unit="kg/m2/s"  />
-	<field id="licepro_cea"  description="Lateral Sea Ice Growth Rate (cell average)"                   unit="kg/m2/s"  />
-	<field id="snowmel_cea"  description="Snow Melt Rate (cell average)"                                unit="kg/m2/s"  />
-	<field id="sntoice_cea"  description="Snow-Ice Formation Rate (cell average)"                       unit="kg/m2/s"  />
-	<field id="ticemel_cea"  description="Rate of Melt at Upper Surface of Sea Ice (cell average)"      unit="kg/m2/s"  />
-
-      </group>
-
-      <!-- U grid -->
-      
-      <group id="grid_U"  axis_ref="depthu" grid_ref="grid_U">
-	<field id="utau"         description="Wind Stress along i-axis"                    unit="N/m2" axis_ref="none" />
-	<field id="uoce"         description="ocean current along i-axis"                  unit="m/s"                  />
-	<field id="uocetr_eff"   description="Effective ocean transport along i-axis"      unit="m3/s"                 />
-	<!-- uoce_eiv: available with key_traldf_eiv and key_diaeiv -->
-	<field id="uoce_eiv"     description="EIV ocean current along i-axis"              unit="m/s"                  />
-	<!-- uoce_eiv: available with key_trabbl -->
-	<field id="uoce_bbl"     description="BBL ocean current along i-axis"              unit="m/s" axis_ref="none"  />
-	<field id="ahu_bbl"      description="BBL diffusive flux along i-axis"             unit="m3/s" axis_ref="none" />
- 	<!-- variables available with key_diaar5 -->
-	<field id="u_masstr"     description="ocean eulerian mass transport along i-axis"  unit="kg/s"                 />
-	<field id="u_heattr"     description="ocean eulerian heat transport along i-axis"  unit="W"    axis_ref="none" />
-	<field id="ueiv_heattr"  description="ocean bolus heat transport along i-axis"     unit="W"    axis_ref="none" />
-	<field id="udiff_heattr" description="ocean diffusion heat transport along i-axis" unit="W"    axis_ref="none" />
-     </group>
-      
-      <!-- V grid -->
-      
-      <group id="grid_V"  axis_ref="depthv" grid_ref="grid_V">
-	<field id="vtau"         description="Wind Stress along j-axis"                    unit="N/m2" axis_ref="none" />
-	<field id="voce"         description="ocean current along j-axis"                  unit="m/s"                  />
-	<field id="vocetr_eff"   description="Effective ocean transport along j-axis"      unit="m3/s"                  />
-	<!-- voce_eiv: available with key_traldf_eiv and key_diaeiv -->
-	<field id="voce_eiv"     description="EIV ocean current along j-axis"              unit="m/s"                  />
-	<!-- voce_eiv: available with key_trabbl -->
-	<field id="voce_bbl"     description="BBL ocean current along j-axis"              unit="m/s"  axis_ref="none" />
-	<field id="ahv_bbl"      description="BBL diffusive flux along j-axis"             unit="m3/s" axis_ref="none" />
-	<!-- variables available with key_diaar5 -->
-	<field id="v_masstr"     description="ocean eulerian mass transport along j-axis"  unit="kg/s"                 />
-	<field id="v_heattr"     description="ocean eulerian heat transport along j-axis"  unit="W"    axis_ref="none" />
-	<field id="veiv_heattr"  description="ocean bolus heat transport along j-axis"     unit="W"    axis_ref="none" />
-	<field id="vdiff_heattr" description="ocean diffusion heat transport along j-axis" unit="W"    axis_ref="none" />
-      </group>
-      
-      <!-- W grid -->
-      
-      <group id="grid_W"  axis_ref="depthw" grid_ref="grid_W">
-	<field id="woce"         description="ocean vertical velocity"                     unit="m/s"                  />
-	<field id="wocetr_eff"   description="effective ocean vertical transport"          unit="m3/s"                 />
-	<!-- woce_eiv: available with key_traldf_eiv and key_diaeiv -->
-	<field id="woce_eiv"     description="EIV ocean vertical velocity"                 unit="m/s"                  />
-	<!-- woce_eiv: available with key_trabbl_adv -->
-	<field id="avt"          description="vertical eddy diffusivity"                   unit="m2/s"                 />
-	<field id="avm"          description="vertical eddy viscosity"                     unit="m2/s"                 />
-	<!-- avs: available with key_zdfddm -->
-	<field id="avs"          description="salt vertical eddy diffusivity"              unit="m2/s"                 />
-	<!-- avt_evd and avm_evd: available with ln_zdfevd -->
-	<field id="avt_evd"      description="enhanced vertical diffusivity"               unit="m2/s"                 />
-	<field id="avm_evd"      description="enhanced vertical viscosity"                 unit="m2/s"                 />
-	<!-- aht2d and  aht2d_eiv: available with key_traldf_eiv and key_traldf_c2d -->
-	<field id="aht2d"        description="lateral eddy diffusivity"                    unit="m2/s" axis_ref="none" />
-	<field id="aht2d_eiv"    description="EIV lateral eddy diffusivity"                unit="m2/s" axis_ref="none" />
-	<!-- avt_tide: available with key_zdftmx -->
-	<field id="av_tide"      description="tidal vertical diffusivity"                  unit="m2/s"                 />
-	<!-- variables available with key_diaar5 -->   
-	<field id="w_masstr"     description="vertical mass trasport"                      unit="kg/s"                 />
-	<field id="w_masstr2"    description="square of vertical mass trasport"            unit="kg2/s2"               />
-      </group>
-          
-      <!-- scalar -->
-      
-      <!-- variables available with key_diaar5 -->
-      <group id="scalar" axis_ref="none" grid_ref="scalarpoint" zoom_ref="1point" >
-	<field id="voltot"     description="global mean volume"                         unit="m3"   />
-	<field id="sshtot"     description="global mean ssh"                            unit="m"    />
-	<field id="sshsteric"  description="global mean ssh steric"                     unit="m"    />
-	<field id="sshthster"  description="global mean ssh thermosteric"               unit="m"    />
-	<field id="masstot"    description="global mean mass"                           unit="kg"   />
-	<field id="temptot"    description="global mean temperature"                    unit="degC" />
-	<field id="saltot"     description="global mean salinity"                       unit="psu"  />
-	<field id="fram_trans" description="Sea Ice Mass Transport Through Fram Strait" unit="kg/s" />
-      </group>
-
-    </field_definition>
-    
-    <!-- 
-============================================================================================================
-=                                                                                                          =
-=                                           output files definition                                        =
-=                                                                                                          =
-=                  http://www2-pcmdi.llnl.gov/svn/repository/cmor/trunk/Tables/CMIP5_Oclim                 =
-=                  http://www2-pcmdi.llnl.gov/svn/repository/cmor/trunk/Tables/CMIP5_Omon                  =
-=                  http://www2-pcmdi.llnl.gov/svn/repository/cmor/trunk/Tables/CMIP5_Oimon                 =              
-=          http://www.clivar.org/organization/wgomd/references/WGOMD_CMIP5_ocean_fields.June2009.pdf       =
-=                                                                                                          =
-============================================================================================================
-    -->
-    
-    <file_definition output_level="10" >
-      <!--
-+++++++++++++++++++++++++++++++++++++++++++++++   daily   ++++++++++++++++++++++++++++++++++++++++++++++++++
-        -->
-      <group id="1d" output_freq="86400"  enabled=".TRUE.">                      <!-- 1d files -->
-	<file id="1d_grid_T" name="auto" name_suffix="_table2.2" description="table 2.2" >         <!-- grid T  -->
-	  <field ref="sst"          name='tos'      description="sea_surface_temperature"                              level="2"                      />
-	  <field ref="sst2"         name='tossq'    description="square_of_sea_surface_temperature"                    level="2"                      />
-	  <field ref="mldkz5"       name='omldamax' description="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="t_max(X)" />
-	</file>   
-      </group>
-	<!--
-++++++++++++++++++++++++++++++++++++++++++++++   monthly   +++++++++++++++++++++++++++++++++++++++++++++++++
-	  -->
-      <group id="1m" output_freq="-1"     enabled=".TRUE.">                      <!-- real monthly files -->
-	<!--
-..............................................    grid T   .................................................
-	  -->
-	<group id="1m_grid_T" name="auto" >                                                        <!-- grid T -->
-	  
-	  <file id="1m grid_T table 2.2" name_suffix="_table2.2" >
-	    <field ref="botpres"      name="pbo"      description="sea_water_pressure_at_sea_floor"                               />
-	    <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
-	    <field ref="ssh"          name="zos"      description="sea_surface_height_above_geoid"                                 />
-	    <field ref="ssh2"         name="zossq"    description="square_of_sea_surface_height_above_geoid"             level="2" />
-	    <!-- masscello : sea_water_mass_per_unit_area = cellthc*rau0                                          no time changes -->
-	    <field ref="cellthc"      name="thkcello" description="cell_thickness"                                                 /> <!-- no time changes -->
-	    <field ref="toce"         name="thetao"   description="sea_water_potential_temperature"                                />
-	    <field ref="sst"          name="tos"      description="sea_surface_temperature"                              level="1" />
-	    <field ref="sst2"         name="tossq"    description="square_of_sea_surface_temperature"                    level="2" />
-	    <field ref="soce"         name="so"       description="sea_water_salinity"                                             />
-	    <field ref="sss"          name="sos"      description="sea_surface_salinity"                                 level="1" />
-	    <field ref="rhop"         name="rhopoto"  description="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 ref="mldkz5"       name='omlmax'   description="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="t_max(X)" />
-	  </file>   
-	  
-	  <file id="1m grid_T table 2.5" name_suffix="_table2.5" >
-	    <field ref="rain"         name="pr"       description="rainfall_flux"                                           level="1" />
-	    <field ref="snow_ao_cea"  name="prsn"     description="snowfall_flux"                                           level="1" />
-	    <field ref="evap_ao_cea"  name="evs"      description="water_evaporation_flux"                                  level="1" />
-	    <field ref="runoffs"      name="friver"   description="water_flux_into_sea_water_from_rivers"                   level="1" />
-	    <field ref="calving"      name="ficeberg" description="water_flux_into_sea_water_from_icebergs"                 level="1" />
-	    <field ref="isnwmlt_cea"  name="fsitherm" description="water_flux_into_sea_water_due_to_sea_ice_thermodynamics" level="1" />
-	    <field ref="empmr"        name="wfo"      description="water_flux_into_sea_water"                               level="1" />
-	    <!-- wfonocorr : water_flux_into_sea_water_without_flux_correction : emp - erp -->  
-	    <field ref="erp"          name="wfcorr"   description="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 ref="fsal_virt_cea" name="vsfsit" description="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 ref="fsal_virt_cea" name="sfdsi"  description="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 ref="hflx_rain_cea" name="hfrainds"    description="temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water"      level="1" />
-	    <field ref="hflx_evap_cea" name="hfevapds"    description="temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water" level="1" />
-	    <field ref="hflx_rnf_cea"  name="hfrunoffds"  description="temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water"        level="1" />
-	    <field ref="hflx_snow_cea" name="hfsnthermds" description="heat_flux_into_sea_water_due_to_snow_thermodynamics"                         level="1" />
-	    <field ref="hflx_ice_cea"  name="hfsithermds" description="heat_flux_into_sea_water_due_to_sea_ice_thermodynamics"                      level="1" />
-	    <field ref="hflx_cal_cea"  name="hfibthermds" description="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 ref="qns"           name="nshfls"      description="surface_net_downward_non_solar_flux"                                         level="1" />
-	    <field ref="qsr"           name="rsntds"      description="surface_net_downward_shortwave_flux"                                         level="1" />
-	    <field ref="qsr3d"         name="rsds"        description="downwelling_shortwave_flux_in_sea_water"                                     level="1" />
-	    <field ref="qrp"           name="hfcorr"      description="heat_flux_correction"                                                        level="1" />
-	  </file>   
-	</group>
-	<!--
-..............................................    grid U   .................................................
-	  -->
-	<group id="1m_grid_U" name="auto" >                                                        <!-- grid U -->
-
-	  <file id="1m grid_U table 2.3" name_suffix="_table2.3" >
-	    <field ref="uoce"         name="uo"      description="sea_water_x_velocity"                                       />
-	    <field ref="u_masstr"     name="umo"     description="ocean_mass_x_transport"                           level="1" />
-	    <field ref="u_heattr"     name="hfx"     description="ocean_heat_x_transport"                           level="1" />
-	    <field ref="ueiv_heattr"  name="hfxba"   description="ocean_heat_x_transport_due_to_bolus_advection"    level="2" />
-	    <field ref="udiff_heattr" name="hfxdiff" description="ocean_heat_x_transport_due_to_diffusion"          level="2" />
-	  </file>   
-
-	  <file id="1m grid_U table 2.8" name_suffix="_table2.8" >
-	    <field ref="utau"         name="tauuo" description="surface_downward_x_stress"                          level="1" />
-	    <!-- tauucorr : surface_downward_x_stress_correction = 0 -->
-	  </file>   
-
-	</group>
-	<!--
-..............................................    grid V   .................................................
-	  -->
-	<group id="1m_grid_V" name="auto" >                                                        <!-- grid V -->
-
-	  <file id="1m grid_V table 2.3" name_suffix="_table2.3" >
-	    <field ref="voce"         name="vo"      description="sea_water_y_velocity"                                       />
-	    <field ref="v_masstr"     name="vmo"     description="ocean_mass_y_transport"                           level="1" />
-	    <field ref="v_heattr"     name="hfy"     description="ocean_heat_y_transport"                           level="1" />
-	    <field ref="veiv_heattr"  name="hfyba"   description="ocean_heat_y_transport_due_to_bolus_advection"    level="2" />
-	    <field ref="vdiff_heattr" name="hfydiff" description="ocean_heat_y_transport_due_to_diffusion"          level="2" />
-	  </file>   
-
-	  <file id="1m grid_V table 2.8" name_suffix="_table2.8" >
-	    <field ref="vtau"         name="tauvo" description="surface_downward_y_stress"                          level="1" />
-	    <!-- tauvcorr : surface_downward_y_stress_correction = 0 -->
-	  </file>   
-
-	</group>
-	<!--
-..............................................    grid W   .................................................
-	  -->
-	<group id="1m_grid_W" name="auto" >                                                        <!-- grid W -->
-	  
-	  <file id="1m grid_W table 2.3" name_suffix="_table2.3" >
-	    <field ref="w_masstr"   name="wmo"   description="upward_ocean_mass_transport"                                    />
-	    <field ref="w_masstr2"  name="wmosq" description="square_pf_upward_ocean_mass_transport"                          />
-	  </file>   
-	  
-	  <file id="1m grid_W table 2.9" name_suffix="_table2.9" >
-	    <field ref="avt"     name="difvho"   description="ocean_vertical_heat_diffusivity"                  level="2" />
-	    <field ref="avs"     name="difvso"   description="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 ref="av_tide" name="difvtrto" description="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 ref="avm"     name="difvmo"   description="ocean_vertical_momentum_diffusivity"              level="2" />
-	    <!-- difvmbo : ocean_vertical_momentum_diffusivity_due_to_background : cte with time, see namelist parameters nn_avb -->
-	    <field ref="av_tide" name="difvmto"  description="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 ref="aht2d_eiv" name="diftrblo" description="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 ref="diftrbbo" name="aht2d_eiv" description="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>   
-
-	</group>
-	<!--
-..............................................    scalar   .................................................
-	  -->
-	<file id="1m_scalar" name="auto" name_suffix="_table2.2" description="table 2.2" >         <!-- scalar -->
-	  <field ref="masstot"    name="masso"    description="sea_water_mass"                                />
-	  <field ref="voltot"     name="volo"     description="sea_water_volume"                              />
-	  <field ref="sshtot"     name="zosga"    description="global_average_sea_level_change"               />
-	  <field ref="sshsteric"  name="zossga"   description="global_average_steric_sea_level_change"        />
-	  <field ref="sshthster"  name="zostoga"  description="global_average_thermosteric_sea_level_change"  />
-	  <field ref="temptot"    name="thetaoga" description="sea_water_potential_temperature"               />
-	  <field ref="saltot"     name="soga"     description="sea_water_salinity"                            />
-	</file>   
-	<!--
-..............................................    icemod   .................................................
-	  -->
-	<file id="1m_icemod" name="auto" name_suffix="_table2.2" description="table 2.2" >         <!-- scalar -->
-	  <field ref="ice_pres"                     />
-	  <field ref="ice_cover"    name="sic"        description="sea_ice_area_fraction"                            />
-	  <field ref="icethic_cea"  name="sit"        description="sea_ice_thickness"                                />
-	  <field ref="subl_ai_cea"  name="evap"       description="water_evaporation_flux"                           />
-	  <field ref="snowthic_cea" name="snd"        description="surface_snow_thickness"                           />
-	  <!-- snc : surface_snow_area_fraction : same as sic -->
-	  <field ref="icealb_cea"   name="ialb"       description="Bare Sea Ice Albedo"                              />
-	  <!-- ssi : Sea Ice Salinity : cte = sice = 6, expect in baltic sea = 2 -->
-	  <field ref="ist_cea"      name="tsice"      description="Surface Temperature of Sea Ice"                   />
-	  <!-- tsnint : Temperature at Interface Between Sea Ice and Snow : not available -->
-	  <!-- pr : Surface Rainfall Rate into the Sea Ice Portion of the Grid Cell = 0 -->
-	  <field ref="snow_ai_cea"  name="prsn"       description="Surface Snowfall Rate into the Sea Ice Portion of the Grid Cell" />
-	  <!-- ageice   : Age of Sea Ice : not available ??? -->
-	  <!-- grFrazil : Frazil Sea Ice Growth (Leads) Rate ??? -->
-	  <!-- grCongel : Congelation Sea Ice Growth Rate ??? -->
-	  <field ref="licepro_cea"  name="grLateral"  description="Lateral Sea Ice Growth Rate"                      />
-	  <field ref="sntoice_cea"  name="snoToIce"   description="Snow-Ice Formation Rate"                          />
-	  <field ref="snowmel_cea"  name="snomelt"    description="Snow Melt Rate"                                   />
-	  <field ref="ticemel_cea"  name="tmelt"      description="Rate of Melt at Upper Surface of Sea Ice"         />
-	  <field ref="bicemel_cea"  name="bmelt"      description="Rate of Melt at Sea Ice Base"                     />
-	  <!-- hcice  : Sea Ice Total Heat Content ??? -->
-	  <field ref="qsr_ai_cea"   name="rsdssi"     description="surface_downwelling_shortwave_flux_in_air"        />
-	  <!-- rsussi : surface_upwelling_shortwave_flux_in_air ??? -->
-	  <!-- rldssi : surface_downwelling_longwave_flux_in_air ??? -->
-	  <!-- rlussi : surface_upwelling_longwave_flux_in_air ??? -->
-	  <!-- hfssi  : surface_upward_sensible_heat_flux ??? -->
-	  <!-- hflssi : surface_upward_latent_heat_flux ??? -->
-	  <field ref="subl_ai_cea"  name="sblsi"      description="surface_snow_and_ice_sublimation_flux"             />
-	  <field ref="u_imasstr"    name="transix"    description="Eastward Sea Ice Transport"                        />
-	  <field ref="v_imasstr"    name="transiy"    description="Northward Sea Ice Transport"                       />
-	  <field ref="fram_trans"   name="transifs"   description="Sea Ice Mass Transport Through Fram Strait"        />
-	  <field ref="utau_ice"     name="strairx"    description="Eastward Atmospheric Stress On Sea Ice"            />
-	  <field ref="vtau_ice"     name="strairy"    description="Northward Atmospheric Stress On Sea Ice"           />
-	  <!-- strocnx : Eastward Ocean Stress On Sea Ice ??? -->
-	  <!-- strocny : Northward Ocean Stress On Sea Ice ??? -->
-	  <!-- streng  : Compressive Sea Ice Strength ??? -->
-	  <!-- divice  : Strain Rate Divergence of Sea Ice ??? -->
-	  <!-- shrice  : Strain Rate Shear of Sea Ice ??? -->
-	  <!-- ridgice : Sea Ice Ridging Rate ??? -->
-	</file>   
-      </group>
-
-      <!-- 
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-        -->
-    </file_definition>
-    
-    <!-- 
-============================================================================================================
-=                                           grid definition                                                =
-=                                            DO NOT CHANGE                                                 =
-============================================================================================================
-    -->
-    
-    <axis_definition>  
-      <axis id="deptht" description="Vertical T levels" unit="m" positive=".false." />
-      <axis id="depthu" description="Vertical U levels" unit="m" positive=".false." />
-      <axis id="depthv" description="Vertical V levels" unit="m" positive=".false." />
-      <axis id="depthw" description="Vertical W levels" unit="m" positive=".false." />
-      <axis id="none" description="axe non defini" unit="none" size="1" />
-    </axis_definition> 
-    
-    <grid_definition>
-      <grid id="grid_T" description="grid T" >
-    <!--   Eq section   -->
-	<zoom id="EqT" ibegin="1" jbegin="0000" ni="0000" nj="1" />
-    <!--   TAO   -->
-      <!--   137e   -->
-	<zoom id="2n137eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n137eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n137eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   147e   -->
-	<zoom id="0n147eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n147eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n147eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   156e   -->
-	<zoom id="5s156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n156eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   165e   -->
-	<zoom id="8s165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n165eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   180w   -->
-	<zoom id="8s180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n180wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   170w   -->
-	<zoom id="8s170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n170wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   155w   -->
-	<zoom id="8s155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n155wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   140w   -->
-	<zoom id="8s140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n140wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   125w   -->
-	<zoom id="8s125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n125wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   110w   -->
-	<zoom id="8s110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n110wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   95w   -->
-	<zoom id="8s95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2s95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="2n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n95wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-    <!--   RAMA   -->
-      <!--   55e   -->
-	<zoom id="16s55eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s55eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
- 	<zoom id="8s55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4s55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5s55eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n55eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n55eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   65e   -->
-	<zoom id="15n65eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   67e   -->
-	<zoom id="16s67eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s67eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4s67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5s67eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n67eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n67eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   80.5e   -->
-	<zoom id="16s80.5eT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s80.5eT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4s80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5s80.5eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n80.5eT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n80.5eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   90e   -->
-	<zoom id="1.5s90eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n90eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="1.5n90eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n90eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n90eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12n90eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="15n90eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   95e   -->
-	<zoom id="16s95eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12s95eT"    ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s95eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="5s95eT"     ibegin="0000" jbegin="0000" ni="1" nj="1" />
-    <!--   PIRATA   -->
-      <!--   38w-30w   -->
-	<zoom id="19s34wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="14s32wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8s30wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n35wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n38wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="8n38wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12n38wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="15n38wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="20n38wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   23w   -->
-	<zoom id="0n23wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="4n23wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="12n23wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="21n23wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   10w   -->
-	<zoom id="10s10wT" ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="6s10wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-	<zoom id="0n10wT"  ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      <!--   0e   -->
-	<zoom id="0n0eT"   ibegin="0000" jbegin="0000" ni="1" nj="1" />
-      </grid>
-
-      <grid id="grid_U" description="grid U" >
-    <!--   Eq section   -->
-	<zoom id="EqU" ibegin="1" jbegin="0000" ni="0000" nj="1" />
-      </grid>
-
-      <grid id="grid_V" description="grid V" >
-      </grid>
-
-      <grid id="grid_W" description="grid W" >
-    <!--   Eq section   -->
-	<zoom id="EqW" ibegin="1" jbegin="0000" ni="0000" nj="1" />
-      </grid>
-
-      <grid id="scalarpoint" description="scalar" >
-	<zoom id="1point" ibegin="1" jbegin="1" ni="1" nj="1" />
-      </grid>
-
-    </grid_definition>    
-    
-  </context>
-  
-</simulation>
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/domain_def.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/domain_def.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/domain_def.xml	(revision 3771)
@@ -2,6 +2,8 @@
    <domain_definition>
       <domain_group id="grid_T">
-      <!--   Eq section   -->
          <domain id="grid_T" long_name="grid T"/>
+	 <!--   My zoom: example of hand defined zoom   -->
+         <domain id="myzoom" zoom_ibegin="10" zoom_jbegin="10" zoom_ni="5" zoom_nj="5" />
+	 <!--   Eq section   -->
          <domain id="EqT" zoom_ibegin="1" zoom_jbegin="0000" zoom_ni="0000" zoom_nj="1" />
          <!--   TAO   -->
Index: branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/field_def.xml
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/field_def.xml	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/SHARED/field_def.xml	(revision 3771)
@@ -11,11 +11,11 @@
 ============================================================================================================
     -->
-   <field_definition level="1" prec="4" operation="average" enabled=".TRUE."> <!-- time step automaticaly defined -->
+   <field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > <!-- time step automaticaly defined -->
 
       <!-- T grid -->
       
-      <field_group id="grid_T" domain_ref="grid_T">
-         <field id="toce"         long_name="temperature"                               unit="degC" axis_ref="deptht"   />
-         <field id="soce"         long_name="salinity"                                  unit="psu"  axis_ref="deptht"   />
+     <field_group id="grid_T" grid_ref="grid_T_2D">
+         <field id="toce"         long_name="temperature"                               unit="degC" grid_ref="grid_T_3D"/>
+         <field id="soce"         long_name="salinity"                                  unit="psu"  grid_ref="grid_T_3D"/>
          <field id="sst"          long_name="sea surface temperature"                   unit="degC"                     />
          <field id="sst2"         long_name="square of sea surface temperature"         unit="degC2"                    />
@@ -28,5 +28,5 @@
          <field id="mldkz5"       long_name="mixing layer depth (Turbocline)"           unit="m"                        />
          <field id="mldr10_1"     long_name="Mixed Layer Depth 0.01 ref.10m"            unit="m"                        />
-         <field id="rhop"         long_name="potential density (sigma0)"                unit="kg/m3" axis_ref="deptht"  />
+         <field id="rhop"         long_name="potential density (sigma0)"                unit="kg/m3" grid_ref="grid_T_3D"/>
          <!-- next variables available with key_diahth -->
          <field id="mlddzt"       long_name="Thermocline Depth (max dT/dz)"             unit="m"                        />
@@ -45,10 +45,10 @@
          <!-- variables available with key_diaar5 -->
          <field id="botpres"      long_name="Pressure at sea floor"                     unit="dbar"                     />
-         <field id="cellthc"      long_name="Cell thickness"                            unit="m"     axis_ref="deptht"  />
+         <field id="cellthc"      long_name="Cell thickness"                            unit="m"    grid_ref="grid_T_3D"/>
      </field_group>
 
       <!-- SBC -->
       
-      <field_group id="SBC" domain_ref="grid_T" > <!-- time step automaticaly defined based on nn_fsbc -->
+      <field_group id="SBC" grid_ref="grid_T_2D" > <!-- time step automaticaly defined based on nn_fsbc -->
 
          <field id="empmr"        long_name="Net Upward Water Flux"                                        unit="kg/m2/s"  />
@@ -60,5 +60,5 @@
          <field id="qns"          long_name="non solar Downward Heat Flux"                                 unit="W/m2"     />
          <field id="qsr"          long_name="Shortwave Radiation"                                          unit="W/m2"     />
-         <field id="qsr3d"        long_name="Shortwave Radiation 3D distribution"        axis_ref="deptht" unit="W/m2"     />
+         <field id="qsr3d"        long_name="Shortwave Radiation 3D distribution"  grid_ref="grid_T_3D"    unit="W/m2"     />
          <field id="qrp"          long_name="Surface Heat Flux: Damping"                                   unit="W/m2"     />
          <field id="erp"          long_name="Surface Water Flux: Damping"                                  unit="Kg/m2/s"  />
@@ -134,16 +134,16 @@
       <!-- U grid -->
       
-      <field_group id="grid_U"   domain_ref="grid_U">
+      <field_group id="grid_U"   grid_ref="grid_U_2D">
          <field id="utau"         long_name="Wind Stress along i-axis"                    unit="N/m2" />
          <field id="suoce"        long_name="ocean surface current along i-axis"          unit="m/s"  />
-         <field id="uoce"         long_name="ocean current along i-axis"                  unit="m/s"  axis_ref="depthu" />
-         <field id="uocetr_eff"   long_name="Effective ocean transport along i-axis"      unit="m3/s" axis_ref="depthu" />
+         <field id="uoce"         long_name="ocean current along i-axis"                  unit="m/s"  grid_ref="grid_U_3D" />
+         <field id="uocetr_eff"   long_name="Effective ocean transport along i-axis"      unit="m3/s" grid_ref="grid_U_3D" />
          <!-- uoce_eiv: available with key_traldf_eiv and key_diaeiv -->
-         <field id="uoce_eiv"     long_name="EIV ocean current along i-axis"              unit="m/s"  axis_ref="depthu" />
+         <field id="uoce_eiv"     long_name="EIV ocean current along i-axis"              unit="m/s"  grid_ref="grid_U_3D" />
          <!-- uoce_eiv: available with key_trabbl -->
-         <field id="uoce_bbl"     long_name="BBL ocean current along i-axis"              unit="m/s"  axis_ref="depthu" />
-	 <field id="ahu_bbl"      long_name="BBL diffusive flux along i-axis"             unit="m3/s"                   />
+         <field id="uoce_bbl"     long_name="BBL ocean current along i-axis"              unit="m/s"  grid_ref="grid_U_3D" />
+	 <field id="ahu_bbl"      long_name="BBL diffusive flux along i-axis"             unit="m3/s" />
          <!-- variables available with key_diaar5 -->
-         <field id="u_masstr"     long_name="ocean eulerian mass transport along i-axis"  unit="kg/s" axis_ref="depthu" />
+         <field id="u_masstr"     long_name="ocean eulerian mass transport along i-axis"  unit="kg/s" grid_ref="grid_U_3D" />
          <field id="u_heattr"     long_name="ocean eulerian heat transport along i-axis"  unit="W"    />
          <field id="ueiv_heattr"  long_name="ocean bolus heat transport along i-axis"     unit="W"    />
@@ -153,16 +153,16 @@
       <!-- V grid -->
       
-      <field_group id="grid_V"   domain_ref="grid_V">
+      <field_group id="grid_V"   grid_ref="grid_V_2D">
          <field id="vtau"         long_name="Wind Stress along j-axis"                    unit="N/m2" />
          <field id="svoce"        long_name="ocean surface current along j-axis"          unit="m/s"  />
-         <field id="voce"         long_name="ocean current along j-axis"                  unit="m/s"  axis_ref="depthv" />
-         <field id="vocetr_eff"   long_name="Effective ocean transport along j-axis"      unit="m3/s" axis_ref="depthv" />
+         <field id="voce"         long_name="ocean current along j-axis"                  unit="m/s"  grid_ref="grid_V_3D" />
+         <field id="vocetr_eff"   long_name="Effective ocean transport along j-axis"      unit="m3/s" grid_ref="grid_V_3D" />
          <!-- voce_eiv: available with key_traldf_eiv and key_diaeiv -->
-         <field id="voce_eiv"     long_name="EIV ocean current along j-axis"              unit="m/s"  axis_ref="depthv" />
+         <field id="voce_eiv"     long_name="EIV ocean current along j-axis"              unit="m/s"  grid_ref="grid_V_3D" />
          <!-- voce_eiv: available with key_trabbl -->
-         <field id="voce_bbl"     long_name="BBL ocean current along j-axis"              unit="m/s"  axis_ref="depthv" />
+         <field id="voce_bbl"     long_name="BBL ocean current along j-axis"              unit="m/s"  grid_ref="grid_V_3D" />
 	 <field id="ahv_bbl"      long_name="BBL diffusive flux along j-axis"             unit="m3/s"                   />
          <!-- variables available with key_diaar5 -->
-         <field id="v_masstr"     long_name="ocean eulerian mass transport along j-axis"  unit="kg/s" axis_ref="depthv" />
+         <field id="v_masstr"     long_name="ocean eulerian mass transport along j-axis"  unit="kg/s" grid_ref="grid_V_3D" />
          <field id="v_heattr"     long_name="ocean eulerian heat transport along j-axis"  unit="W"     />
          <field id="veiv_heattr"  long_name="ocean bolus heat transport along j-axis"     unit="W"     />
@@ -172,28 +172,26 @@
       <!-- W grid -->
       
-      <field_group id="grid_W" domain_ref="grid_W">
-         <field_group axis_ref="depthw">
-            <field id="woce"         long_name="ocean vertical velocity"                  unit="m/s"    />
-            <field id="wocetr_eff"   long_name="effective ocean vertical transport"       unit="m3/s"   />
-            <!-- woce_eiv: available with key_traldf_eiv and key_diaeiv -->
-            <field id="woce_eiv"     long_name="EIV ocean vertical velocity"              unit="m/s"    />
-            <!-- woce_eiv: available with key_trabbl_adv -->
-            <field id="avt"          long_name="vertical eddy diffusivity"                unit="m2/s"   />
-            <field id="avm"          long_name="vertical eddy viscosity"                  unit="m2/s"   />
-            <!-- avs: available with key_zdfddm -->
-            <field id="avs"          long_name="salt vertical eddy diffusivity"           unit="m2/s"   />
-            <!-- avt_evd and avm_evd: available with ln_zdfevd -->
-            <field id="avt_evd"      long_name="enhanced vertical diffusivity"            unit="m2/s"   />
-            <field id="avm_evd"      long_name="enhanced vertical viscosity"              unit="m2/s"   />
-            <!-- avt_tide: available with key_zdftmx -->
-            <field id="av_tide"      long_name="tidal vertical diffusivity"               unit="m2/s"   />
-            <!-- variables available with key_diaar5 -->   
-            <field id="w_masstr"     long_name="vertical mass trasport"                   unit="kg/s"   />
-            <field id="w_masstr2"    long_name="square of vertical mass trasport"         unit="kg2/s2" />
-         </field_group>
-         
-         <!-- aht2d and  aht2d_eiv: available with key_traldf_eiv and key_traldf_c2d -->
-         <field id="aht2d"        long_name="lateral eddy diffusivity"                    unit="m2/s"   />
-         <field id="aht2d_eiv"    long_name="EIV lateral eddy diffusivity"                unit="m2/s"   />
+      <field_group id="grid_W" grid_ref="grid_W_3D">
+        <field id="woce"         long_name="ocean vertical velocity"                  unit="m/s"    />
+        <field id="wocetr_eff"   long_name="effective ocean vertical transport"       unit="m3/s"   />
+        <!-- woce_eiv: available with key_traldf_eiv and key_diaeiv -->
+        <field id="woce_eiv"     long_name="EIV ocean vertical velocity"              unit="m/s"    />
+        <!-- woce_eiv: available with key_trabbl_adv -->
+        <field id="avt"          long_name="vertical eddy diffusivity"                unit="m2/s"   />
+        <field id="avm"          long_name="vertical eddy viscosity"                  unit="m2/s"   />
+        <!-- avs: available with key_zdfddm -->
+        <field id="avs"          long_name="salt vertical eddy diffusivity"           unit="m2/s"   />
+        <!-- avt_evd and avm_evd: available with ln_zdfevd -->
+        <field id="avt_evd"      long_name="enhanced vertical diffusivity"            unit="m2/s"   />
+        <field id="avm_evd"      long_name="enhanced vertical viscosity"              unit="m2/s"   />
+        <!-- avt_tide: available with key_zdftmx -->
+        <field id="av_tide"      long_name="tidal vertical diffusivity"               unit="m2/s"   />
+        <!-- variables available with key_diaar5 -->   
+        <field id="w_masstr"     long_name="vertical mass trasport"                   unit="kg/s"   />
+        <field id="w_masstr2"    long_name="square of vertical mass trasport"         unit="kg2/s2" />
+        
+        <!-- aht2d and  aht2d_eiv: available with key_traldf_eiv and key_traldf_c2d -->
+        <field id="aht2d"        long_name="lateral eddy diffusivity"                    unit="m2/s"   grid_ref="grid_W_2D" />
+        <field id="aht2d_eiv"    long_name="EIV lateral eddy diffusivity"                unit="m2/s"   grid_ref="grid_W_2D"/>
       </field_group>
           
@@ -224,5 +222,5 @@
       <!-- ptrc on T grid -->
 
-      <field_group id="ptrc_T" axis_ref="deptht" domain_ref="grid_T">
+      <field_group id="ptrc_T" grid_ref="grid_T_3D">
        <field id="DIC"      long_name="Dissolved inorganic Concentration"        unit="mmol/m3" />
        <field id="Alkalini" long_name="Total Alkalinity Concentration"           unit="mmol/m3" />
@@ -259,43 +257,43 @@
       <!-- diad on T grid : variables available with key_diatrc -->
 
-     <field_group id="diad_T" domain_ref="grid_T">
-       <field id="PH"          long_name="PH"                                      unit="-"          axis_ref="deptht" />
-       <field id="CO3"         long_name="Bicarbonates"                            unit="mol/m3"     axis_ref="deptht" />
-       <field id="CO3sat"      long_name="CO3 saturation"                          unit="mol/m3"     axis_ref="deptht" />
-       <field id="PAR"         long_name="Photosynthetically Available Radiation"  unit="W/m2"       axis_ref="deptht" />
-       <field id="PPPHY"       long_name="Primary production of nanophyto"         unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="PPPHY2"      long_name="Primary production of diatoms"           unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="PPNEWN"      long_name="New Primary production of nanophyto"     unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="PPNEWD"      long_name="New Primary production of diatoms"       unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="PBSi"        long_name="Primary production of Si diatoms"        unit="molSi/m3/s" axis_ref="deptht" />
-       <field id="PFeN"        long_name="Primary production of nano iron"         unit="molFe/m3/s" axis_ref="deptht" />
-       <field id="PFeD"        long_name="Primary production of diatoms iron"      unit="molFe/m3/s" axis_ref="deptht" />
-       <field id="xfracal"     long_name="Calcifying fraction"                     unit="-"          axis_ref="deptht" />
-       <field id="PCAL"        long_name="Calcite production"                      unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="DCAL"        long_name="Calcite dissolution"                     unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="GRAZ1"       long_name="Grazing by microzooplankton"             unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="GRAZ2"       long_name="Grazing by mesozooplankton"              unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="REMIN"       long_name="Oxic remineralization of OM"             unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="DENIT"       long_name="Anoxic remineralization of OM"           unit="molC/m3/s"  axis_ref="deptht" />
-       <field id="Nfix"        long_name="Nitrogen fixation"                       unit="molN/m3/s"  axis_ref="deptht" />
-       <field id="Mumax"       long_name="Maximum growth rate"                     unit="s-1"        axis_ref="deptht" />
-       <field id="MuN"         long_name="Realized growth rate for nanophyto"      unit="s-1"        axis_ref="deptht" />
-       <field id="MuD"         long_name="Realized growth rate for diatomes"       unit="s-1"        axis_ref="deptht" />
-       <field id="LNnut"       long_name="Nutrient limitation term in Nanophyto"   unit="-"          axis_ref="deptht" />
-       <field id="LDnut"       long_name="Nutrient limitation term in Diatoms"     unit="-"          axis_ref="deptht" />
-       <field id="LNFe"        long_name="Iron limitation term in Nanophyto"       unit="-"          axis_ref="deptht" />
-       <field id="LDFe"        long_name="Iron limitation term in Diatoms"         unit="-"          axis_ref="deptht" />
-       <field id="LNlight"     long_name="Light limitation term in Nanophyto"      unit="-"          axis_ref="deptht" />
-       <field id="LDlight"     long_name="Light limitation term in Diatoms"        unit="-"          axis_ref="deptht" />
-       <field id="Fe2"         long_name="Iron II concentration"                   unit="nmol/L"     axis_ref="deptht" />
-       <field id="Fe3"         long_name="Iron III concentration"                  unit="nmol/L"     axis_ref="deptht" />
-       <field id="FeL1"        long_name="Complexed Iron concentration with L1"    unit="nmol/L"     axis_ref="deptht" />
-       <field id="FeL2"        long_name="Complexed Iron concentration with L2"    unit="nmol/L"     axis_ref="deptht" />
-       <field id="FeP"         long_name="Precipitated Iron III"                   unit="nmol/L"     axis_ref="deptht" />
-       <field id="TL1"         long_name="Total L1 concentration"                  unit="nmol/L"     axis_ref="deptht" />
-       <field id="TL2"         long_name="Total L2 concentration"                  unit="nmol/L"     axis_ref="deptht" />
+     <field_group id="diad_T" grid_ref="grid_T_2D">
+       <field id="PH"          long_name="PH"                                      unit="-"          grid_ref="grid_T_3D" />
+       <field id="CO3"         long_name="Bicarbonates"                            unit="mol/m3"     grid_ref="grid_T_3D" />
+       <field id="CO3sat"      long_name="CO3 saturation"                          unit="mol/m3"     grid_ref="grid_T_3D" />
+       <field id="PAR"         long_name="Photosynthetically Available Radiation"  unit="W/m2"       grid_ref="grid_T_3D" />
+       <field id="PPPHY"       long_name="Primary production of nanophyto"         unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="PPPHY2"      long_name="Primary production of diatoms"           unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="PPNEWN"      long_name="New Primary production of nanophyto"     unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="PPNEWD"      long_name="New Primary production of diatoms"       unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="PBSi"        long_name="Primary production of Si diatoms"        unit="molSi/m3/s" grid_ref="grid_T_3D" />
+       <field id="PFeN"        long_name="Primary production of nano iron"         unit="molFe/m3/s" grid_ref="grid_T_3D" />
+       <field id="PFeD"        long_name="Primary production of diatoms iron"      unit="molFe/m3/s" grid_ref="grid_T_3D" />
+       <field id="xfracal"     long_name="Calcifying fraction"                     unit="-"          grid_ref="grid_T_3D" />
+       <field id="PCAL"        long_name="Calcite production"                      unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="DCAL"        long_name="Calcite dissolution"                     unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="GRAZ1"       long_name="Grazing by microzooplankton"             unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="GRAZ2"       long_name="Grazing by mesozooplankton"              unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="REMIN"       long_name="Oxic remineralization of OM"             unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="DENIT"       long_name="Anoxic remineralization of OM"           unit="molC/m3/s"  grid_ref="grid_T_3D" />
+       <field id="Nfix"        long_name="Nitrogen fixation"                       unit="molN/m3/s"  grid_ref="grid_T_3D" />
+       <field id="Mumax"       long_name="Maximum growth rate"                     unit="s-1"        grid_ref="grid_T_3D" />
+       <field id="MuN"         long_name="Realized growth rate for nanophyto"      unit="s-1"        grid_ref="grid_T_3D" />
+       <field id="MuD"         long_name="Realized growth rate for diatomes"       unit="s-1"        grid_ref="grid_T_3D" />
+       <field id="LNnut"       long_name="Nutrient limitation term in Nanophyto"   unit="-"          grid_ref="grid_T_3D" />
+       <field id="LDnut"       long_name="Nutrient limitation term in Diatoms"     unit="-"          grid_ref="grid_T_3D" />
+       <field id="LNFe"        long_name="Iron limitation term in Nanophyto"       unit="-"          grid_ref="grid_T_3D" />
+       <field id="LDFe"        long_name="Iron limitation term in Diatoms"         unit="-"          grid_ref="grid_T_3D" />
+       <field id="LNlight"     long_name="Light limitation term in Nanophyto"      unit="-"          grid_ref="grid_T_3D" />
+       <field id="LDlight"     long_name="Light limitation term in Diatoms"        unit="-"          grid_ref="grid_T_3D" />
+       <field id="Fe2"         long_name="Iron II concentration"                   unit="nmol/L"     grid_ref="grid_T_3D" />
+       <field id="Fe3"         long_name="Iron III concentration"                  unit="nmol/L"     grid_ref="grid_T_3D" />
+       <field id="FeL1"        long_name="Complexed Iron concentration with L1"    unit="nmol/L"     grid_ref="grid_T_3D" />
+       <field id="FeL2"        long_name="Complexed Iron concentration with L2"    unit="nmol/L"     grid_ref="grid_T_3D" />
+       <field id="FeP"         long_name="Precipitated Iron III"                   unit="nmol/L"     grid_ref="grid_T_3D" />
+       <field id="TL1"         long_name="Total L1 concentration"                  unit="nmol/L"     grid_ref="grid_T_3D" />
+       <field id="TL2"         long_name="Total L2 concentration"                  unit="nmol/L"     grid_ref="grid_T_3D" />
        <field id="pdust"       long_name="dust concentration"                      unit="g/L"                          />
-       <field id="Totlig"      long_name="Total ligand concentation"               unit="nmol/L"     axis_ref="deptht" />
-       <field id="Biron"       long_name="Bioavailable iron"                       unit="nmol/L"     axis_ref="deptht" />
+       <field id="Totlig"      long_name="Total ligand concentation"               unit="nmol/L"     grid_ref="grid_T_3D" />
+       <field id="Biron"       long_name="Bioavailable iron"                       unit="nmol/L"     grid_ref="grid_T_3D" />
        <field id="Sdenit"      long_name="Nitrate reduction in the sediments"      unit="molN/m2/s"                    />
        <field id="Ironice"     long_name="Iron input/uptake due to sea ice"        unit="molFe/m2/s"                   />
@@ -312,9 +310,9 @@
        <field id="Heup"        long_name="Euphotic layer depth"                    unit="m"                            />
        <field id="Irondep"     long_name="Iron deposition from dust"               unit="mol/m2/s"                     />
-       <field id="Ironsed"     long_name="Iron deposition from sediment"           unit="mol/m2/s"  axis_ref="deptht"  />
-
-       <field id="FNO3PHY"  long_name="FNO3PHY"                             unit="-"  axis_ref="deptht" /> 
-       <field id="FNH4PHY"  long_name="FNH4PHY"                             unit="-"  axis_ref="deptht" /> 
-       <field id="FNH4NO3"  long_name="FNH4NO3"                             unit="-"  axis_ref="deptht" /> 
+       <field id="Ironsed"     long_name="Iron deposition from sediment"           unit="mol/m2/s"  grid_ref="grid_T_3D"  />
+
+       <field id="FNO3PHY"  long_name="FNO3PHY"                             unit="-"  grid_ref="grid_T_3D" /> 
+       <field id="FNH4PHY"  long_name="FNH4PHY"                             unit="-"  grid_ref="grid_T_3D" /> 
+       <field id="FNH4NO3"  long_name="FNH4NO3"                             unit="-"  grid_ref="grid_T_3D" /> 
        <field id="TNO3PHY"  long_name="TNO3PHY"                             unit="-"  /> 
        <field id="TNH4PHY"  long_name="TNH4PHY"                             unit="-"  /> 
@@ -340,5 +338,5 @@
        <field id="qtrC14b"      long_name="Air-sea flux of Bomb C14"                 unit="mol/m2/s"   />
        <field id="qintC14b"     long_name="Cumulative air-sea flux of Bomb C14"      unit="mol/m2"     />
-       <field id="fdecay"       long_name="Radiactive decay of Bomb C14"             unit="mol/m3"  axis_ref="deptht"  />
+       <field id="fdecay"       long_name="Radiactive decay of Bomb C14"             unit="mol/m3"  grid_ref="grid_T_3D"  />
      </field_group>
 
Index: branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
===================================================================
--- branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90	(revision 3770)
+++ branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90	(revision 3771)
@@ -52,5 +52,5 @@
    PRIVATE iom_p1d, iom_p2d, iom_p3d
 #if defined key_iomput
-   PRIVATE iom_set_domain_attr, iom_set_axis_attr, iom_set_field_attr, iom_set_file_attr
+   PRIVATE iom_set_domain_attr, iom_set_axis_attr, iom_set_field_attr, iom_set_file_attr, iom_set_grid_attr
    PRIVATE set_grid, set_scalar, set_xmlatt, set_mooring
 # endif
@@ -112,8 +112,8 @@
       ! horizontal grid definition
       CALL set_scalar
-      CALL set_grid( "grid_T", glamt, gphit ) 
-      CALL set_grid( "grid_U", glamu, gphiu )
-      CALL set_grid( "grid_V", glamv, gphiv )
-      CALL set_grid( "grid_W", glamt, gphit )
+      CALL set_grid( "T", glamt, gphit ) 
+      CALL set_grid( "U", glamu, gphiu )
+      CALL set_grid( "V", glamv, gphiv )
+      CALL set_grid( "W", glamt, gphit )
 
       ! vertical grid definition
@@ -1014,23 +1014,24 @@
 
    SUBROUTINE iom_set_domain_attr( cdname, ni_glo, nj_glo, ibegin, jbegin, ni, nj, zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj,   &
-      &                                    data_dim, data_ibegin, data_ni, data_jbegin, data_nj, lonvalue, latvalue )
-      CHARACTER(LEN=*)                , INTENT(in) ::   cdname
-      INTEGER               , OPTIONAL, INTENT(in) ::   ni_glo, nj_glo, ibegin, jbegin, ni, nj
-      INTEGER               , OPTIONAL, INTENT(in) ::   data_dim, data_ibegin, data_ni, data_jbegin, data_nj
-      INTEGER               , OPTIONAL, INTENT(in) ::   zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj
-      REAL(wp), DIMENSION(:), OPTIONAL, INTENT(in) ::   lonvalue, latvalue
-
-      IF ( xios_is_valid_domain(TRIM(cdname)) ) THEN
-         CALL xios_set_domain_attr( cdname, ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, jbegin=jbegin, ni=ni, nj=nj  ,   &
-            &    data_dim=data_dim, data_ibegin=data_ibegin, data_ni=data_ni, data_jbegin=data_jbegin, data_nj=data_nj,   &
-            &    zoom_ibegin=zoom_ibegin, zoom_jbegin=zoom_jbegin, zoom_ni=zoom_ni, zoom_nj=zoom_nj,                      &
-            &    lonvalue=lonvalue, latvalue=latvalue )
-      ENDIF
-
-      IF ( xios_is_valid_domaingroup(TRIM(cdname)) ) THEN
+      &                                    data_dim, data_ibegin, data_ni, data_jbegin, data_nj, lonvalue, latvalue, mask )
+      CHARACTER(LEN=*)                 , INTENT(in) ::   cdname
+      INTEGER                , OPTIONAL, INTENT(in) ::   ni_glo, nj_glo, ibegin, jbegin, ni, nj
+      INTEGER                , OPTIONAL, INTENT(in) ::   data_dim, data_ibegin, data_ni, data_jbegin, data_nj
+      INTEGER                , OPTIONAL, INTENT(in) ::   zoom_ibegin, zoom_jbegin, zoom_ni, zoom_nj
+      REAL(wp), DIMENSION(:) , OPTIONAL, INTENT(in) ::   lonvalue, latvalue
+      LOGICAL, DIMENSION(:,:), OPTIONAL, INTENT(in) ::   mask
+
+      IF ( xios_is_valid_domain     (cdname) ) THEN
+         CALL xios_set_domain_attr     ( cdname, ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, jbegin=jbegin, ni=ni, nj=nj,   &
+            &    data_dim=data_dim, data_ibegin=data_ibegin, data_ni=data_ni, data_jbegin=data_jbegin, data_nj=data_nj   ,   &
+            &    zoom_ibegin=zoom_ibegin, zoom_jbegin=zoom_jbegin, zoom_ni=zoom_ni, zoom_nj=zoom_nj,                         &
+            &    lonvalue=lonvalue, latvalue=latvalue,mask=mask )
+      ENDIF
+
+      IF ( xios_is_valid_domaingroup(cdname) ) THEN
          CALL xios_set_domaingroup_attr( cdname, ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, jbegin=jbegin, ni=ni, nj=nj,   &
             &    data_dim=data_dim, data_ibegin=data_ibegin, data_ni=data_ni, data_jbegin=data_jbegin, data_nj=data_nj   ,   &
             &    zoom_ibegin=zoom_ibegin, zoom_jbegin=zoom_jbegin, zoom_ni=zoom_ni, zoom_nj=zoom_nj,                         &
-            &    lonvalue=lonvalue, latvalue=latvalue )
+            &    lonvalue=lonvalue, latvalue=latvalue,mask=mask )
       ENDIF
 
@@ -1041,12 +1042,6 @@
       CHARACTER(LEN=*)      , INTENT(in) ::   cdname
       REAL(wp), DIMENSION(:), INTENT(in) ::   paxis
-
-      IF ( xios_is_valid_axis(TRIM(cdname)) ) THEN
-         CALL xios_set_axis_attr( cdname, size=size(paxis),value=paxis )
-      ENDIF
-      IF ( xios_is_valid_axisgroup(TRIM(cdname)) ) THEN
-         CALL xios_set_axisgroup_attr( cdname, size=size(paxis),value=paxis )
-      ENDIF
-
+      IF ( xios_is_valid_axis     (cdname) )   CALL xios_set_axis_attr     ( cdname, size=size(paxis),value=paxis )
+      IF ( xios_is_valid_axisgroup(cdname) )   CALL xios_set_axisgroup_attr( cdname, size=size(paxis),value=paxis )
    END SUBROUTINE iom_set_axis_attr
 
@@ -1055,12 +1050,6 @@
       CHARACTER(LEN=*)          , INTENT(in) ::   cdname
       CHARACTER(LEN=*),OPTIONAL , INTENT(in) ::   freq_op
-
-      IF ( xios_is_valid_field(TRIM(cdname)) ) THEN
-         CALL xios_set_field_attr( cdname, freq_op=freq_op )
-      ENDIF
-      IF ( xios_is_valid_fieldgroup(TRIM(cdname)) ) THEN
-         CALL xios_set_fieldgroup_attr( cdname, freq_op=freq_op )
-      ENDIF
-
+      IF ( xios_is_valid_field     (cdname) )   CALL xios_set_field_attr     ( cdname, freq_op=freq_op )
+      IF ( xios_is_valid_fieldgroup(cdname) )   CALL xios_set_fieldgroup_attr( cdname, freq_op=freq_op )
    END SUBROUTINE iom_set_field_attr
 
@@ -1069,16 +1058,18 @@
       CHARACTER(LEN=*)          , INTENT(in) ::   cdname
       CHARACTER(LEN=*),OPTIONAL , INTENT(in) ::   name, name_suffix
-
-      IF ( xios_is_valid_file(TRIM(cdname)) ) THEN
-         CALL xios_set_file_attr( cdname, name=name, name_suffix=name_suffix )
-      ENDIF
-      IF ( xios_is_valid_filegroup(TRIM(cdname)) ) THEN
-         CALL xios_set_filegroup_attr( cdname, name=name, name_suffix=name_suffix )
-      ENDIF
-
+      IF ( xios_is_valid_file     (cdname) )   CALL xios_set_file_attr     ( cdname, name=name, name_suffix=name_suffix )
+      IF ( xios_is_valid_filegroup(cdname) )   CALL xios_set_filegroup_attr( cdname, name=name, name_suffix=name_suffix )
    END SUBROUTINE iom_set_file_attr
 
 
-   SUBROUTINE set_grid( cdname, plon, plat )
+   SUBROUTINE iom_set_grid_attr( cdname, mask )
+      CHARACTER(LEN=*)                   , INTENT(in) ::   cdname
+      LOGICAL, DIMENSION(:,:,:), OPTIONAL, INTENT(in) ::   mask
+      IF ( xios_is_valid_grid     (cdname) )   CALL xios_set_grid_attr     ( cdname, mask=mask )
+      IF ( xios_is_valid_gridgroup(cdname) )   CALL xios_set_gridgroup_attr( cdname, mask=mask )
+   END SUBROUTINE iom_set_grid_attr
+
+
+   SUBROUTINE set_grid( cdgrd, plon, plat )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE   ***
@@ -1087,15 +1078,30 @@
       !!
       !!----------------------------------------------------------------------
-      CHARACTER(LEN=*)            , INTENT(in) ::   cdname
+      CHARACTER(LEN=1)            , INTENT(in) ::   cdgrd
       REAL(wp), DIMENSION(jpi,jpj), INTENT(in) ::   plon
       REAL(wp), DIMENSION(jpi,jpj), INTENT(in) ::   plat
+      !
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zmask
       INTEGER  :: ni,nj
       
       ni=nlei-nldi+1 ; nj=nlej-nldj+1
 
-      CALL iom_set_domain_attr(cdname, ni_glo=jpiglo, nj_glo=jpjglo, ibegin=nimpp+nldi-1, jbegin=njmpp+nldj-1, ni=ni, nj=nj)
-      CALL iom_set_domain_attr(cdname, data_dim=2, data_ibegin = 1-nldi, data_ni = jpi, data_jbegin = 1-nldj, data_nj = jpj)
-      CALL iom_set_domain_attr(cdname, lonvalue = RESHAPE(plon(nldi:nlei, nldj:nlej),(/ ni*nj /)),   &
-         &                             latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /)))   
+      CALL iom_set_domain_attr("grid_"//cdgrd, ni_glo=jpiglo, nj_glo=jpjglo, ibegin=nimpp+nldi-1, jbegin=njmpp+nldj-1, ni=ni, nj=nj)
+      CALL iom_set_domain_attr("grid_"//cdgrd, data_dim=2, data_ibegin = 1-nldi, data_ni = jpi, data_jbegin = 1-nldj, data_nj = jpj)
+      CALL iom_set_domain_attr("grid_"//cdgrd, lonvalue = RESHAPE(plon(nldi:nlei, nldj:nlej),(/ ni*nj /)),   &
+         &                                     latvalue = RESHAPE(plat(nldi:nlei, nldj:nlej),(/ ni*nj /)))  
+
+      IF ( ln_mskland ) THEN
+         ! mask land points, keep values on coast line -> specific mask for U, V and W points
+         SELECT CASE ( cdgrd )
+         CASE('T')   ;   zmask(:,:,:)       = tmask(:,:,:)
+         CASE('U')   ;   zmask(2:jpim1,:,:) = tmask(2:jpim1,:,:) + tmask(3:jpi,:,:)   ;   CALL lbc_lnk( zmask, 'U', 1. )
+         CASE('V')   ;   zmask(:,2:jpjm1,:) = tmask(:,2:jpjm1,:) + tmask(:,3:jpi,:)   ;   CALL lbc_lnk( zmask, 'V', 1. )
+         CASE('W')   ;   zmask(:,:,2:jpk  ) = tmask(:,:,1:jpkm1) + tmask(:,:,2:jpk)   ;   zmask(:,:,1) = tmask(:,:,1)
+         END SELECT
+         !
+         CALL iom_set_domain_attr( "grid_"//cdgrd       , mask = zmask(:,:,1) /= 0. )
+         CALL iom_set_grid_attr  ( "grid_"//cdgrd//"_3D", mask = zmask(:,:,:) /= 0. )
+      ENDIF
       
    END SUBROUTINE set_grid
@@ -1159,29 +1165,23 @@
       clsuff(:) = (/ 'grid_T', 'grid_U', 'grid_V', 'grid_W', 'icemod', 'ptrc_T', 'diad_T', 'scalar' /)      
       DO jg = 1, SIZE(clsuff)                                                                  ! grid type
-         DO jh = 1, 12                                                                         ! 1, 2, 3, 4, 6, 12 hours
-            IF( MOD(12,jh) == 0 ) THEN 
-               WRITE(cl2,'(i2)') jh 
-               CALL dia_nam( clname, jh * ihhss, clsuff(jg), ldfsec = .TRUE. )
-               CALL iom_set_file_attr(TRIM(ADJUSTL(cl2))//'h_'//clsuff(jg), name=TRIM(clname))
-            ENDIF
+         DO jh = 1, 24                                                                         ! 1-24 hours
+            WRITE(cl2,'(i2)') jh 
+            CALL dia_nam( clname, jh * ihhss, clsuff(jg), ldfsec = .TRUE. )
+            CALL iom_set_file_attr(TRIM(ADJUSTL(cl2))//'h_'//clsuff(jg), name=TRIM(clname))
          END DO
-         DO jd = 1, 5, 2                                                                       ! 1, 3, 5 days
+         DO jd = 1, 30                                                                         ! 1-30 days
             WRITE(cl1,'(i1)') jd 
             CALL dia_nam( clname, jd * iddss, clsuff(jg), ldfsec = .TRUE. )
             CALL iom_set_file_attr(cl1//'d_'//clsuff(jg), name=TRIM(clname))
          END DO
-         DO jm = 1, 6                                                                          ! 1, 2, 3, 4, 6 months
-            IF( MOD(6,jm) == 0 ) THEN 
-               WRITE(cl1,'(i1)') jm 
-               CALL dia_nam( clname, -jm, clsuff(jg) )
-               CALL iom_set_file_attr(cl1//'m_'//clsuff(jg), name=TRIM(clname))
-            ENDIF
+         DO jm = 1, 11                                                                         ! 1-11 months
+            WRITE(cl1,'(i1)') jm 
+            CALL dia_nam( clname, -jm, clsuff(jg) )
+            CALL iom_set_file_attr(cl1//'m_'//clsuff(jg), name=TRIM(clname))
          END DO
-         DO jy = 1, 10                                                                         ! 1, 2, 5, 10 years  
-            IF( MOD(10,jy) == 0 ) THEN 
-               WRITE(cl2,'(i2)') jy 
-               CALL dia_nam( clname, -jy * iyymo, clsuff(jg) )
-               CALL iom_set_file_attr(TRIM(ADJUSTL(cl2))//'y_'//clsuff(jg), name=TRIM(clname))
-            ENDIF
+         DO jy = 1, 50                                                                         ! 1-50 years  
+            WRITE(cl2,'(i2)') jy 
+            CALL dia_nam( clname, -jy * iyymo, clsuff(jg) )
+            CALL iom_set_file_attr(TRIM(ADJUSTL(cl2))//'y_'//clsuff(jg), name=TRIM(clname))
          END DO
       END DO
