فهرست منبع

Specify new outclass for runs with Leandro

Francois Massonnet 7 سال پیش
والد
کامیت
c150d17bb3
2فایلهای تغییر یافته به همراه399 افزوده شده و 219 حذف شده
  1. 67 71
      3.3.0/runtime/classic/ctrl/file_def_nemo-lim3.xml
  2. 332 148
      3.3.0/runtime/classic/ctrl/file_def_nemo-opa.xml

+ 67 - 71
3.3.0/runtime/classic/ctrl/file_def_nemo-lim3.xml

@@ -17,19 +17,11 @@
       <file_group id="3h_lim" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
       <file_group id="4h_lim" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
       <file_group id="6h_lim" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
-
-      <file_group id="1d_lim" output_freq="1d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   	
-        <file id="file40" name_suffix="_icemod" description="ice icemod variables">
-          <field field_ref="uice_ipa"     name="siu"       long_name="sea_ice_x_velocity"/>
-          <field field_ref="vice_ipa"     name="siv"       long_name="sea_ice_y_velocity"/>
-          <field field_ref="iceconc"      name="siconc"    long_name="sea_ice_area_fraction"/>
-          <field field_ref="icethic"      name="sithick"   long_name="sea_ice_thickness"/>
-          <field field_ref="snothic"      name="sisnthick" long_name="surface_snow_thickness"/>
-          <field field_ref="icest"        name="sitemptop" long_name="sea_ice_surface_temperature"/>
-          <field field_ref="icevel"       name="sispeed"   long_name="sea_ice_speed"/>
-          <field field_ref="utau_ice"     name="sistrxdtop"     long_name="surface_downward_x_stress"/>
-          <field field_ref="vtau_ice"     name="sistrydtop"     long_name="surface_downward_y_stress"/>
-          <field field_ref="idive"        name="sidivvel"       long_name="divergence_of_sea_ice_velocity"/>
+      <file_group id="1d_lim" output_freq="1d"  output_level="10" enabled=".TRUE.">  <!-- 1d files -->   	
+        <file id="file41" name_suffix="_icemod" description="ice variables" >
+          <field field_ref="iceconc"          name="siconc"  />
+          <field field_ref="icevolu"          name="sivolu"  />
+          <field field_ref="icevel_mv"        name="sivelo"  />
         </file>
       </file_group>
 
@@ -37,65 +29,69 @@
 
       <file_group id="1m_lim" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
 
-       <file id="file41" name_suffix="_icemod" description="ice variables" >
+       <file id="file40" name_suffix="_icemod" description="ice variables" >
     
-          <field field_ref="uice_ipa"     name="siu"            long_name="sea_ice_x_velocity"/>
-          <field field_ref="vice_ipa"     name="siv"            long_name="sea_ice_y_velocity"/>
-          <field field_ref="iceconc"      name="siconc"         long_name="sea_ice_area_fraction"/>
-          <field field_ref="icethic"      name="sithick"        long_name="sea_ice_thickness"/>
-          <field field_ref="icevolu"      name="sivol"          long_name="sea_ice_volume"/>
-          <field field_ref="snothic"      name="sisnthick"      long_name="surface_snow_thickness"/>
-          <field field_ref="icest"        name="sitemptop"      long_name="sea_ice_surface_temperature"/>
-          <field field_ref="icevel"       name="sispeed"        long_name="sea_ice_speed"/>
-          <field field_ref="icealb"       name="alb_ice"        long_name="sea_ice_albedo"/>
-          <field field_ref="icestr"       name="sicompstren"    long_name="compressive_strength_of_sea_ice"/>
-          <field field_ref="miceage"      name="siage"          long_name="age_of_sea_ice"/>
-          <field field_ref="qsr_ice"      name="siflswdtop"     long_name="surface_downwelling_shortwave_flux_in_air"/>
-          <field field_ref="utau_ice"     name="sistrxdtop"     long_name="surface_downward_x_stress"/>
-          <field field_ref="vtau_ice"     name="sistrydtop"     long_name="surface_downward_y_stress"/>
-          <field field_ref="dmsspr"       name="prsn"           long_name="snowfall_flux"/>
-          <field field_ref="dmssub"       name="sidmassevapsubl" long_name="water_evaporation_flux"/>
-          <field field_ref="idive"        name="sidivvel"       long_name="divergence_of_sea_ice_velocity"/>
-          <field field_ref="iceconc_cat"  name="siitdconc"      long_name="sea_ice_area_fraction_over_categories"/>
-          <field field_ref="icethic_cat"  name="siitdthick"     long_name="sea_ice_thickness_over_categories"/>
-          <field field_ref="snowthic_cat" name="siitdsnthick"   long_name="snow_thickness_over_categories"/>
-          <field field_ref="micesalt"     name="sisali"         long_name="sea_ice_salinity"/>
-
-          <field field_ref="snowvol"      name="snvolu" />
-          <field field_ref="vfxice"       name="vfxice" />
-          <field field_ref="vfxsnw"       name="vfxsnw" />
-          <field field_ref="vfxsub"       name="vfxsub" />
-          <field field_ref="vfxsub_err"   name="vfxsub_err" />
-          <field field_ref="vfxspr"       name="vfxspr" />
-
-          <field field_ref="icetrp"       name="sivtrp" />
-          <field field_ref="snwtrp"       name="snvtrp" />
-          <field field_ref="saltrp"       name="saltrp" />
-          <field field_ref="deitrp"       name="deitrp" />
-          <field field_ref="destrp"       name="destrp" />
-
-          <field field_ref="sfx"          name="sfx" />
-
-          <field field_ref="hfxout"       name="hfxout"    />
-          <field field_ref="hfxin"        name="hfxin"    />
-
-          <!-- diags -->
-          <field field_ref="isst"         name="sst" />
-          <field field_ref="isss"         name="sss" />
-          <field field_ref="micet"        name="sitemp" />
-          <field field_ref="icehc"        name="siheco" />
-          <field field_ref="isnowhc"      name="snheco" />
-
-          <field field_ref="ishear"       name="sishea" />
-
-          <field field_ref="ibrinv"       name="sibrin" />
-          <field field_ref="icecolf"      name="sicolf" />
-
-          <field field_ref="iceage_cat"   name="siagecat" />
-          <field field_ref="salinity_cat" name="salincat" />
-          <field field_ref="brinevol_cat" name="sibricat" />
-          <field field_ref="icetemp_cat"  name="sitemcat" />
-          <field field_ref="snwtemp_cat"  name="sntemcat" />
+         <field field_ref="snothic"          name="snthic"     long_name="surface_snow_thickness"   />
+         <field field_ref="icethic"          name="sithic"     long_name="sea_ice_thickness"        />
+         <field field_ref="icevolu"          name="sivolu"  />
+         <field field_ref="snowvol"          name="snvolu"  />
+         <field field_ref="iceconc"         name="siconc"  />
+
+     <!-- thermo -->
+         <field field_ref="micesalt"         name="sisali" />
+         <field field_ref="micet"            name="sitemp" />
+         <field field_ref="icest"            name="sistem" />
+         <field field_ref="icehc"            name="siheco" />
+         <field field_ref="isnowhc"          name="snheco" />
+         <field field_ref="miceage"          name="siages" />
+
+     <!-- dyn -->
+         <field field_ref="uice_mv"          name="sivelu" />
+         <field field_ref="vice_mv"          name="sivelv" />
+         <field field_ref="icevel_mv"        name="sivelo" />
+         <field field_ref="idive"            name="sidive" />
+         <field field_ref="ishear"           name="sishea" />
+         <field field_ref="icestr"           name="sistre" />
+
+     <!-- transports -->
+         <field field_ref="icetrp"           name="sivtrp" />
+         <field field_ref="snwtrp"           name="snvtrp" />
+         <field field_ref="saltrp"           name="saltrp" />
+         <field field_ref="deitrp"           name="deitrp" />
+         <field field_ref="destrp"           name="destrp" />
+
+     <!-- volume flux -->
+         <field field_ref="vfxice"           name="vfxice" />
+         <field field_ref="vfxsnw"           name="vfxsnw" />
+         <field field_ref="vfxsub"           name="vfxsub" />
+         <field field_ref="vfxsub_err"       name="vfxsub_err" />
+         <field field_ref="vfxspr"           name="vfxspr" />
+
+     <!-- ice-ocean salt flux -->
+         <field field_ref="sfx_mv"           name="sfx" />
+
+     <!-- heat fluxes -->
+         <field field_ref="hfxout"           name="hfxout"   />
+         <field field_ref="hfxin"            name="hfxin"    />
+         <field field_ref="hfxsenso"         name="hfxsenso" />
+         <field field_ref="hfxconsu"         name="hfxconsu" />
+         <field field_ref="hfxconbo"         name="hfxconbo" />
+
+     <!-- ice-atm heat flux from mass exchange -->
+         <field field_ref="hfxsub"           name="hfxsub"   />
+         <field field_ref="hfxspr"           name="hfxspr"   />
+
+     <!-- outputs by category -->
+         <!-- field field_ref="iceage_cat"       name="siagecat"-->
+         <field field_ref="iceconc_cat"      name="siconcat"/>
+         <field field_ref="icethic_cat"      name="sithicat"/>
+         <field field_ref="snowthic_cat"     name="snthicat"/>
+         <field field_ref="salinity_cat"     name="salincat"/>
+         <field field_ref="brinevol_cat"     name="sibricat"/>
+
+     <!-- ocean outputs -->
+         <!--field field_ref="isst"             name="sst"    -->
+         <!--field field_ref="isss"             name="sss"    -->
 
         </file>
 

+ 332 - 148
3.3.0/runtime/classic/ctrl/file_def_nemo-opa.xml

@@ -16,42 +16,35 @@
 
       <file_group id="2h_opa" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
 
-      <file_group id="3h_opa" output_freq="3h"  output_level="10" enabled=".TRUE."> <!-- 3h files -->    
-        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables">
-          <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
-        </file>
-      </file_group> 
+      <file_group id="3h_opa" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
 
       <file_group id="4h_opa" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
 
       <file_group id="6h_opa" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
 
       
-      <file_group id="1d_opa" output_freq="1d"  output_level="10" enabled=".TRUE.">  <!-- 1d files -->   
+      <file_group id="1d_opa" output_freq="1d"  output_level="10" enabled=".FALSE.">  <!-- 1d files -->   
 	
-        <file id="file2" name_suffix="_grid_T" description="ocean T grid variables" >
+        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
-          <field field_ref="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="mldr10_1"     name="mlotst"   long_name="ocean_mixed_layer_thickness_defined_by_sigma_t" />
+	  <field field_ref="sst"          name="tosstd"   long_name="sea_surface_temperature_standard_deviation"         operation="average" freq_op="1d" > sqrt( @sst2 - @sst * @sst ) </field>
+	  <field field_ref="ssh"          name="zosstd"   long_name="sea_surface_height_above_geoid_standard_deviation"  operation="average" freq_op="1d" > sqrt( @ssh2 - @ssh * @ssh ) </field>
+	  <field field_ref="sst"          name="sstdcy"   long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" > @sstmax - @sstmin </field>
+	  <field field_ref="mldr10_1"     />
+	  <field field_ref="mldr10_1"     name="mldr10_1dcy"  long_name="amplitude of mldr10_1 diurnal cycle" operation="average" freq_op="1d" > @mldr10_1max - @mldr10_1min </field>
 	</file>
-
-        <file id="file3" name_suffix="_grid_U" description="ocean U grid variables">
-          <field field_ref="utau"        name="tauuo"      long_name="surface_downward_x_stress"/> <!-- available with key_diaar5 -->
-         </file>
-
-        <file id="file4" name_suffix="_grid_V" description="ocean V grid variables">
-          <field field_ref="vtau"        name="tauvo"      long_name="surface_downward_y_stress"/> <!-- available with key_diaar5 -->
-        </file>       
        
-        <file id="file5" name_suffix="_scalar" description="scalar variables" >
+       
+        <file id="file2" name_suffix="_scalar" description="scalar variables" >
+
 	  <!-- Volume -->
           <!-- global contents -->
 	  <field field_ref="voltot"       grid_ref="grid_1point"   name="scvoltot"  />
 	  <field field_ref="sshtot"       grid_ref="grid_1point"   name="scsshtot"  />
 	  <field field_ref="sshsteric"    grid_ref="grid_1point"   name="scsshste"  />
-          <!--field field_ref="sshthster"    grid_ref="grid_1point"   name="scsshtst"  /-->
+<!--  <field field_ref="sshthster"    grid_ref="grid_1point"   name="scsshtst"  /> -->
 	  <field field_ref="masstot"      grid_ref="grid_1point"   name="scmastot"  />
 	  <field field_ref="temptot"      grid_ref="grid_1point"   name="sctemtot"  />
 	  <field field_ref="saltot"       grid_ref="grid_1point"   name="scsaltot"  />
@@ -71,9 +64,6 @@
 	  <field field_ref="bgfrchfx"     grid_ref="grid_1point"   name="bgfrchfx"    />
 	  <field field_ref="bgfrcsal"     grid_ref="grid_1point"   name="bgfrcsal"    />
 
-        </file>
-
-        <file id="file6" name_suffix="_SBC_scalar" description="scalar variables">
 	  <!-- Surface -->
 	  <!-- global contents -->
           <field field_ref="ibgvol_tot"     grid_ref="grid_1point"  name="ibgvol_tot"   />
@@ -100,15 +90,64 @@
 	  
         </file>
 	
+	<file id="file3" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
+	  <field field_ref="qsr_oce"       name="qsr_oce"  long_name="downward shortwave flux at ocean surface"           />
+	  <field field_ref="qns_oce"       name="qns_oce"  long_name="downward non solar flux at ocean surface"           />
+	  <field field_ref="qsr_ice"       name="qsr_ice"  long_name="downward shortwave flux at ice surface"           />
+	  <field field_ref="qns_ice"       name="qns_ice"  long_name="downward non solar flux at ice surface"           />
+	  <field field_ref="qtr_ice"       name="qtr_ice"  long_name="shortwave flux transmitted thru the ice"           />
+	  <field field_ref="taum"          name="taum" />
+	  <field field_ref="wspd"          name="windsp"  />
+	  <field field_ref="precip"        name="precip" />
+	  <!-- For heat conservation checking -->
+	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"           />
+	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"           />
+	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"           />
+	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"           />
+	  <field field_ref="hflx_rain_cea" name="hflx_rain_cea"      />
+	  <field field_ref="hflx_evap_cea" name="hflx_evap_cea"      />
+	  <field field_ref="hflx_snow_cea" name="hflx_snow_cea"      />
+	  <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"      />
+	  <!-- For freshwater conservation checking -->
+	  <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"                     />
+	  <field field_ref="emp_oce"       name="emp_oce"                      />
+	  <field field_ref="emp_ice"       name="emp_ice"                      />
+          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+	  <field field_ref="calving_cea"   name="calving" />
+      <field field_ref="iceberg_cea"   name="iceberg" />
+      <field field_ref="iceshelf_cea"  name="iceshelf" />
+	  <field field_ref="vfxice"        name="vfxice" />
+	  <field field_ref="vfxsnw"        name="vfxsnw" />
+	  <field field_ref="vfxsub"        name="vfxsub" />
+	  <field field_ref="vfxspr"        name="vfxspr" />
+	  <field field_ref="rain"          name="rain"      />
+	  <field field_ref="snow_ao_cea"   name="snow_ao_cea"      />
+	  <field field_ref="snow_ai_cea"   name="snow_ai_cea"      />
+	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"      />
+	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"      />
+	  <field field_ref="fmmflx"        name="fmmflx"  />
+          <field field_ref="fwfisf"        name="fwfisf"  />
+          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai"  />
+          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao"  />
+          <field field_ref="hflx_ice_cea"     name="hflx_ice"      />
+          <field field_ref="hflx_rnf_cea"     name="hflx_rnf"      />
+	  <!-- For salt conservation checking -->
+          <field field_ref="saltflx"      name="sosflxdo"  />
+	  <!-- ice and snow -->
+	  <field field_ref="snowpre"      />
+	  <field field_ref="utau_ice"         name="utau_ice" />
+	  <field field_ref="vtau_ice"         name="vtau_ice" />
+	</file>
+
       </file_group> 
 
       <file_group id="5d_opa" output_freq="5d"  output_level="10" enabled=".FALSE.">  <!-- 5d files -->   
 	
-	<file id="file7" name_suffix="_grid_T" description="ocean T grid variables" >
+	<file id="file4" name_suffix="_grid_T" description="ocean T grid variables" >
           <field field_ref="e3t"  />
           <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="5d" > @toce_e3t / @e3t </field>
           <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="5d" > @soce_e3t / @e3t </field>
-          <field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"      operation="average" freq_op="5d" > @hdiv * @e3t </field>
+          <field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"      operation="average" freq_op="5d" > @hdiv * @e3t </field> 
           <field field_ref="mldr10_1"     name="mldr10_1"/>
           <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                />
           <field field_ref="qsr"          name="rsntds"      long_name="surface_net_downward_shortwave_flux" />
@@ -120,68 +159,19 @@
           <field field_ref="iceconc"      name="siconc"  />
 	</file>
 
-        <file id="file8" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
-          <field field_ref="qsr_oce"       name="qsr_oce"  long_name="downward shortwave flux at ocean surface"           />
-          <field field_ref="qns_oce"       name="qns_oce"  long_name="downward non solar flux at ocean surface"           />
-          <field field_ref="qsr_ice"       name="qsr_ice"  long_name="downward shortwave flux at ice surface"           />
-          <field field_ref="qns_ice"       name="qns_ice"  long_name="downward non solar flux at ice surface"           />
-          <field field_ref="qtr_ice"       name="qtr_ice"  long_name="shortwave flux transmitted thru the ice"           />
-          <field field_ref="taum"          name="taum" />
-          <field field_ref="wspd"          name="windsp"  />
-          <field field_ref="precip"        name="precip" />
-          <!-- For heat conservation checking -->
-          <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"           />
-          <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"           />
-          <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"           />
-          <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"           />
-          <field field_ref="hflx_rain_cea" name="hflx_rain_cea"      />
-          <field field_ref="hflx_evap_cea" name="hflx_evap_cea"      />
-          <field field_ref="hflx_snow_cea" name="hflx_snow_cea"      />
-          <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"      />
-          <!-- For freshwater conservation checking -->
-          <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"                     />
-          <field field_ref="emp_oce"       name="emp_oce"                      />
-          <field field_ref="emp_ice"       name="emp_ice"                      />
-          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
-          <field field_ref="calving_cea"   name="calving" />
-      <field field_ref="iceberg_cea"   name="iceberg" />
-      <field field_ref="iceshelf_cea"  name="iceshelf" />
-          <field field_ref="vfxice"        name="vfxice" />
-          <field field_ref="vfxsnw"        name="vfxsnw" />
-          <field field_ref="vfxsub"        name="vfxsub" />
-          <field field_ref="vfxspr"        name="vfxspr" />
-          <field field_ref="rain"          name="rain"      />
-          <field field_ref="snow_ao_cea"   name="snow_ao_cea"      />
-          <field field_ref="snow_ai_cea"   name="snow_ai_cea"      />
-          <field field_ref="evap_ao_cea"   name="evap_ao_cea"      />
-          <field field_ref="subl_ai_cea"   name="subl_ai_cea"      />
-          <field field_ref="fmmflx"        name="fmmflx"  />
-          <field field_ref="fwfisf"        name="fwfisf"  />
-          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai"  />
-          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao"  />
-          <field field_ref="hflx_ice_cea"     name="hflx_ice"      />
-          <field field_ref="hflx_rnf_cea"     name="hflx_rnf"      />
-          <!-- For salt conservation checking -->
-          <field field_ref="saltflx"      name="sosflxdo"  />
-          <!-- ice and snow -->
-          <field field_ref="snowpre"      />
-          <field field_ref="utau_ice"         name="utau_ice" />
-          <field field_ref="vtau_ice"         name="vtau_ice" />
-        </file>
-
-	<file id="file9" name_suffix="_grid_U" description="ocean U grid variables" >
+	<file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="e3u"  />
           <field field_ref="uocetr_eff"   name="uocetr_eff"  />
 	  <field field_ref="ahu_bbl"       />
 	</file>
 	
-	<file id="file10" name_suffix="_grid_V" description="ocean V grid variables" >
+	<file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="e3v"  />
           <field field_ref="vocetr_eff"   name="vocetr_eff"  />
 	  <field field_ref="ahv_bbl"       />
 	</file>
 	
-	<file id="file11" name_suffix="_grid_W" description="ocean W grid variables" >
+	<file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >
           <field field_ref="e3w"  />
           <field field_ref="woce"         name="wo"     />
           <field field_ref="wocetr_eff"   name="wocetr_eff"  />
@@ -192,7 +182,7 @@
 	</file>
 
 
-        <file id="file12" name_suffix="_trdtra" description="ocean trends variables" >
+        <file id="file30" name_suffix="_trdtra" description="ocean trends variables" >
           <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"      > this * $cpocean * $rau0  </field>
           <field field_ref="ttrd_eivad_e3t"  name="ttrdtr_eivad" long_name="Tendency_of_heat_content_from_parameterized_eddy_advection"     unit="W m-2"      > this * $cpocean * $rau0  </field>
           <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"      > this * $cpocean * $rau0  </field>
@@ -206,109 +196,303 @@
         </file>
 
 
-      </file_group> 
+  </file_group> 
 
 
       <file_group id="1m_opa" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
 
-        <file id="file13" name_suffix="_grid_T" >
+        <file id="file8" name_suffix="_grid_T" >
 	  <field field_ref="e3t" long_name="T-cell thickness" />
-          <field field_ref="botpres"      name="pbo"      long_name="Pressure_at_sea_floor"                                          />
+          <!-- field field_ref="botpres"      name="pbo"      long_name="Pressure_at_sea_floor"                                          -->
           <!-- pso : sea_water_pressure_at_sea_water_surface = 0 -->
           <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                                 />
-          <field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"             level="2" />
+          <!-- field field_ref="ssh2"         name="zossq"    long_name="square_of_sea_surface_height_above_geoid"             level="2" -->
 
           <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"   operation="average" freq_op="1mo" > @toce_e3t / @e3t </field>      
-          <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="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"                operation="average" freq_op="1mo" > @soce_e3t / @e3t </field>       
-          <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                                 level="1" />
-          
+          <!--field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                                 level="1" -->
+	  <!-- diurnal cycle -->
+	  <!-- sst -->
+	  <!--field field_ref="sst"          name="sstdcymax"   long_name="max of sst diurnal cycle" operation="average" freq_op="1d" > @sstmax  </field>
+          <field field_ref="sst"          name="sstdcymin"   long_name="min of sst diurnal cycle" operation="average" freq_op="1d" > @sstmin </field>
+          <field field_ref="sst"          name="sstdcy"      long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" > @sstmax - @sstmin </field> -->
+	  <!-- sss -->
+	  <!--field field_ref="sss"          name="sssdcymax"   long_name="max of sss diurnal cycle" operation="average" freq_op="1d" > @sssmax  </field>
+          <field field_ref="sss"          name="sssdcymin"   long_name="min of sss diurnal cycle" operation="average" freq_op="1d" > @sssmin </field>
+          <field field_ref="sss"          name="sssdcy"      long_name="amplitude of sss diurnal cycle" operation="average" freq_op="1d" > @sssmax - @sssmin </field> -->
+	  <!-- mld -->
+	  <!-- <field field_ref="mldr10_1"     name="mld10_1dcymax"   long_name="max of mld diurnal cycle" operation="average" freq_op="1d" > @mldr10_1max  </field>
+	  <field field_ref="mldr10_1"     name="mld10_1dcymin"   long_name="min of mld diurnal cycle" operation="average" freq_op="1d" > @mldr10_1min  </field>
+	  <field field_ref="mldr10_1"     name="mld10_1dcy"      long_name="amplitude of mld diurnal cycle" operation="average" freq_op="1d" > @mldr10_1max - @mldr10_1min  </field> -->
+	  <!--  -->
           <field field_ref="rhop"         name="rhopoto"  long_name="sea_water_potential_density"                          level="2" />
           <!-- no agessc : sea_water_age_since_surface_contact -->
           <!-- no cfc11  : moles_per_unit_mass_of_cfc11_in_sea_water -->
           <!-- msftbarot : ocean_barotropic_mass_streamfunction : offline -->
           <!-- mlotst    :           ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
           <!-- mlotstsq  : square_of_ocean_mixed_layer_thickness_defined_by_sigma_t : must be done offline -->
-          <field field_ref="mldr10_1"     name="mlotst"   long_name="ocean_mixed_layer_thickness_defined_by_sigma_t" operation="average" freq_op="1mo" > @mldr10_1 </field>
+          <!--field field_ref="mldkz5"       name="omlmax"   long_name="ocean_mixed_layer_thickness_defined_by_mixing_scheme" level="2" operation="maximum" -->
+          <!--field field_ref="mldkz5"       name="mldkz5"   level="2"  -->
+          <field field_ref="mldr10_1"     name="mldr10_1" level="2" />
+          <!--field field_ref="mldr10_1max"  name="mldr10_1max"  long_name="max of Mixed Layer Depth 0.01 ref.10m"              operation="maximum" -->
+          <!-- wfonocorr : water_flux_into_sea_water_without_flux_correction : emp - erp -->
+          <!--field field_ref="erp"          name="wfcorr"   long_name="water_flux_correction"                                   level="1" --> <!-- usually = 0 -->
+          <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" -->
+      <!-- next variables available with key_diahth -->
+      <field field_ref="mlddzt"        level="1" />
+      <field field_ref="mldr10_3"      level="1" />
+      <field field_ref="mldr0_1"       level="1" />
+      <field field_ref="mldr0_3"       level="1" />
+      <field field_ref="mld_dt02"      level="1" />
+      <field field_ref="topthdep"      level="1" />
+      <field field_ref="pycndep"       level="1" />
+      <field field_ref="BLT"           level="1" />
+      <field field_ref="tinv"          level="1" />
+      <field field_ref="depti"         level="1" />
+      <!-- <field field_ref="20d"           level="1" /> -->
+      <!-- <field field_ref="28d"           level="1" /> -->
+      <field field_ref="hc300"          level="1" />
+      <field field_ref="hc700"          level="1" />
+      <field field_ref="hc2000"         level="1" />
+      <!-- next variables are additional for PISCES offline-->
+          <!--field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"      operation="average" freq_op="1mo" > @hdiv * @e3t </field> -->
+          <field field_ref="wspd"         name="windsp"  />
+          <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"    />
+          <field field_ref="fmmflx"       name="fmmflx"  />
+          <!-- field field_ref="iceconc"      name="siconc"  -->
+	  <!-- For heat conservation checking -->
+	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"           />
+	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"           />
+	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"           />
+	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"           />
+	  <field field_ref="hflx_rain_cea" name="hflx_rain_cea"      />
+	  <field field_ref="hflx_evap_cea" name="hflx_evap_cea"      />
+	  <field field_ref="hflx_snow_cea" name="hflx_snow_cea"      />
+	  <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"      />
+	  <!-- For freshwater conservation checking -->
+	  <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"                     />
+	  <field field_ref="emp_oce"       name="emp_oce"                      />
+	  <field field_ref="emp_ice"       name="emp_ice"                      />
+          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+	  <field field_ref="calving_cea"   name="calving" />
+      <field field_ref="iceberg_cea"   name="iceberg" />
+      <field field_ref="iceshelf_cea"  name="iceshelf" />
+	  <!--field field_ref="vfxice"        name="vfxice" -->
+	  <!--field field_ref="vfxsnw"        name="vfxsnw" -->
+	  <field field_ref="vfxsub"        name="vfxsub" />
+	  <!--field field_ref="vfxspr"        name="vfxspr" -->
+	  <field field_ref="rain"          name="rain"      />
+	  <field field_ref="snow_ao_cea"   name="snow_ao_cea"      />
+	  <field field_ref="snow_ai_cea"   name="snow_ai_cea"      />
+	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"      />
+	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"      />
+	  <!-- For salt conservation checking -->
+          <field field_ref="saltflx"      name="sosflxdo"  />
 
         </file>
 
-	<file id="file14" name_suffix="_grid_U" description="ocean U grid variables" >
+	<file id="file9" name_suffix="_grid_U" description="ocean U grid variables" >
+	  <field field_ref="e3u"  />
+	  <!--field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"   -->
 	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity" operation="average" freq_op="1mo" > @uoce_e3u / @e3u </field>
-          <field field_ref="uoce2"        name="u2o"     long_name="square_of_sea_water_x_velocity"/>
-          <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
-          <field field_ref="u_masstr"     name="umo"     long_name="ocean_mass_x_transport"/>
+	  <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
+          <field field_ref="uocetr_eff"   name="uocetr_eff"  />
+          <field field_ref="ahu_bbl"       />
+      <!-- available with key_diaar5 -->
+      <field field_ref="u_masstr"     name="vozomatr"  />
+      <field field_ref="u_heattr"     name="sozohetr"  />
+      <field field_ref="u_salttr"     name="sozosatr"  />
 	</file>
 	
-	<file id="file15" name_suffix="_grid_V" description="ocean V grid variables" >
-          <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="1mo" > @voce_e3v / @e3v </field>
-          <field field_ref="voce2"        name="v2o"     long_name="square_of_sea_water_y_velocity"/>
-          <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
-          <field field_ref="v_masstr"     name="vmo" long_name="ocean_mass_y_transport"/>
+	<file id="file10" name_suffix="_grid_V" description="ocean V grid variables" >
+	  <field field_ref="e3v"  />
+	  <!--field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    -->
+	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity" operation="average" freq_op="1mo" > @voce_e3v / @e3v </field>
+	  <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
+          <field field_ref="vocetr_eff"   name="vocetr_eff"  />
+          <field field_ref="ahv_bbl"       />
+      <!-- available with key_diaar5 -->
+      <field field_ref="v_masstr"     name="vomematr"  />
+      <field field_ref="v_heattr"     name="somehetr"  />
+      <field field_ref="v_salttr"     name="somesatr"  />
 	</file>
 	
-	<file id="file16" name_suffix="_grid_W" description="ocean W grid variables" >
-          <field field_ref="woce"         name="wo"     />
-          <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
-          <field field_ref="w_masstr"     name="wmo"     long_name="vertical mass transport"/>
+	<file id="file11" name_suffix="_grid_W" description="ocean W grid variables" >
+	  <field field_ref="e3w"  />
+	  <field field_ref="woce"         name="wo"     />
+	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
+	  <!-- avs: available with key_zdfddm -->
+	  <field field_ref="avs"          name="avs"         /> 
+	  <field field_ref="avm"              name="avm"        />
+	  <!-- avt_evd: available with ln_zdfevd -->
+	  <field field_ref="avt_evd"        name="avt_evd"  /> 
+	  <field field_ref="av_wave"      name="av_wave" /> 
+	  <field field_ref="bn2"             name="bn2"           /> 
+	  <field field_ref="wocetr_eff"   name="wocetr_eff" /> 
+	  <!--field field_ref="bflx_tmx"     name="bflx_tmx"   --> 
+	  <!--field field_ref="pcmap_tmx"    name="pcmap_tmx"  --> 
+	  <!-- field field_ref="emix_tmx"     name="emix_tmx"  --> 	  
+	  <field field_ref="w_masstr"     name="vovematr"  />
+          <field field_ref="logavs"       name="difvsolog"  long_name="ocean_vertical_salt_diffusivity" operation="average" freq_op="1mo" > exp( @logavs ) </field>
+          <field field_ref="aht2d"        name="ahtt"   />
+          <field field_ref="aht2d_eiv"    name="aeiv"   />
 	</file>
 	
-	<file id="file17" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
-          <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     />
-          <!-- TODO check which variable to use for rsntds, qsr or qsr_oce? -->
-          <field field_ref="qsr"          name="qsr"      long_name="surface_net_downward_shortwave_flux"                                         level="1" />
-          <field field_ref="qsr_oce"      name="qsr_oce"  long_name="downward shortwave flux at ocean surface"           />
-<!--      <field field_ref="qsr_oce"      name="rsntds"   long_name="net_downward_shortwave_flux_at_sea_water_surface"/> -->
-          <field field_ref="qsr3d"        name="qsr3d"    long_name="downwelling_shortwave_flux_in_sea_water"                                     level="1" />
-<!--      <field field_ref="qsr3d"        name="rsdo"     long_name="downwelling_shortwave_flux_in_sea_water"                                     level="1" /> -->
-          <field field_ref="qns_oce"      name="qns_oce"  long_name="downward non solar flux at ocean surface"           />
-          <field field_ref="qt_oce"       name="qt_oce"   long_name="downward total flux at ocean surface"           />
-<!--      <field field_ref="qt_oce"       name="hfds"     long_name="surface_downward_heat_flux_in_sea_water"/> -->
-          <field field_ref="qsr_ice"      name="qsr_ice"  long_name="downward shortwave flux at ice surface"           />
-          <field field_ref="qns_ice"      name="qns_ice"  long_name="downward non solar flux at ice surface"           />
-          <field field_ref="qtr_ice"      name="qtr_ice"  long_name="shortwave flux transmitted thru the ice"           />
-          <field field_ref="qt_ice"       name="qt_ice"   long_name="downward total flux at ice surface"           />
-          <field field_ref="qemp_ice"       name="qemp_ice"   long_name="Downward Heat Flux from E-P over ice"           />
-          <field field_ref="qemp_oce"       name="qemp_oce"   long_name="Downward Heat Flux from E-P over open ocean"     />
-          <field field_ref="hflx_rnf_cea"       name="hflx_rnf_cea"   long_name="heat flux due to runoff"     />
-          <field field_ref="hflx_rain_cea"       name="hflx_rain_cea"   long_name="heat flux due to rainfall"     />
-          <field field_ref="hflx_snow_cea"       name="hflx_snow_cea"   long_name="heat flux due to snow falling"     />
-          <field field_ref="hflx_cal_cea"       name="hflx_cal_cea"   long_name="heat flux due to calving"     />
-          <field field_ref="saltflx"      name="sfx"  />
-          <field field_ref="fmmflx"       name="fmmflx"  />
-          <field field_ref="taum"         name="taum" />
-          <field field_ref="wspd"         name="windsp"  />
-          <field field_ref="precip"       name="precip" />
-          <field field_ref="rain"         name="rain" />
-          <!-- TODO check if sipr should use NEMO var rain or precip, they are not identical -->
-<!--      <field field_ref="rain"         name="sipr"    long_name="rainfall_flux"/> -->
-          <field field_ref="runoffs"      name="runoffs" />
-<!--      <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" /> -->
-          <field field_ref="calving_cea"  name="calving" />
-<!--      <field field_ref="calving_cea"  name="ficeberg2d" long_name="water_flux_into_sea_water_from_icebergs"               level="1" /> -->
-          <field field_ref="evap_ao_cea"  name="evap_ao_cea" />
-          <field field_ref="subl_ai_cea"  name="subl_ai_cea" />
-          <field field_ref="snowpre"      />
+	<file id="file33" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc -->
+	  <field field_ref="qsr_oce"       name="qsr_oce"  long_name="downward shortwave flux at ocean surface"           />
+	  <field field_ref="qns_oce"       name="qns_oce"  long_name="downward non solar flux at ocean surface"           />
+	  <field field_ref="qsr_ice"       name="qsr_ice"  long_name="downward shortwave flux at ice surface"           />
+	  <field field_ref="qns_ice"       name="qns_ice"  long_name="downward non solar flux at ice surface"           />
+	  <field field_ref="qtr_ice"       name="qtr_ice"  long_name="shortwave flux transmitted thru the ice"           />
+	  <field field_ref="taum"          name="taum" />
+	  <field field_ref="wspd"          name="windsp"  />
+	  <field field_ref="precip"        name="precip" />
+	  <!-- For heat conservation checking -->
+	  <field field_ref="qt_oce"        name="qt_oce"   long_name="downward total flux at ocean surface"           />
+	  <field field_ref="qemp_oce"      name="qemp_oce" long_name="Downward Heat Flux from E-P over open ocean"           />
+	  <field field_ref="qt_ice"        name="qt_ice"   long_name="downward total flux at ice surface"           />
+	  <field field_ref="qemp_ice"      name="qemp_ice" long_name="Downward Heat Flux from E-P over ice"           />
+	  <field field_ref="hflx_rain_cea" name="hflx_rain_cea"      />
+	  <field field_ref="hflx_evap_cea" name="hflx_evap_cea"      />
+	  <field field_ref="hflx_snow_cea" name="hflx_snow_cea"      />
+	  <field field_ref="hflx_cal_cea"  name="hflx_cal_cea"      />
+	  <!-- For freshwater conservation checking -->
+	  <field field_ref="empmr"         name="wfo"      long_name="water_flux_into_sea_water"                     />
+	  <field field_ref="emp_oce"       name="emp_oce"                      />
+	  <field field_ref="emp_ice"       name="emp_ice"                      />
+          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+	  <field field_ref="calving_cea"   name="calving" />
+      <field field_ref="iceberg_cea"   name="iceberg" />
+      <field field_ref="iceshelf_cea"  name="iceshelf" />
+	  <field field_ref="vfxice"        name="vfxice" />
+	  <field field_ref="vfxsnw"        name="vfxsnw" />
+	  <field field_ref="vfxsub"        name="vfxsub" />
+	  <field field_ref="vfxspr"        name="vfxspr" />
+	  <field field_ref="rain"          name="rain"      />
+	  <field field_ref="snow_ao_cea"   name="snow_ao_cea"      />
+	  <field field_ref="snow_ai_cea"   name="snow_ai_cea"      />
+	  <field field_ref="evap_ao_cea"   name="evap_ao_cea"      />
+	  <field field_ref="subl_ai_cea"   name="subl_ai_cea"      />
+	  <field field_ref="fmmflx"        name="fmmflx"  />
+          <field field_ref="fwfisf"        name="fwfisf"  />
+          <field field_ref="hflx_snow_ai_cea" name="hflx_snow_ai"  />
+          <field field_ref="hflx_snow_ao_cea" name="hflx_snow_ao"  />
+          <field field_ref="hflx_ice_cea"     name="hflx_ice"      />
+          <field field_ref="hflx_rnf_cea"     name="hflx_rnf"      />
+	  <!-- For salt conservation checking -->
+          <field field_ref="saltflx"      name="sosflxdo"  />
+	  <!-- ice and snow -->
+	  <field field_ref="snowpre"      />
+	  <field field_ref="utau_ice"         name="utau_ice" />
+	  <field field_ref="vtau_ice"         name="vtau_ice" />
+            <!-- sea surface restoring -->
+          <field field_ref="erp"          name="wfcorr"     long_name="surface_water_flux_correction"                      level="1" /> <!-- usually = 0 -->
+          <field field_ref="qrp"          name="hfcorr"     long_name="surface_heat_flux_correction"                       level="1" /> <!-- usually = 0 -->
 	</file>
 
-	<file id="file18" name_suffix="_scalar" description="scalar variables"  >
-          <field field_ref="masstot"    name="masso"     long_name="sea_water_mass"/>
-          <field field_ref="temptot"    name="thetaoga"  long_name="sea_water_potential_temperature"/>
-          <field field_ref="saltot"     name="soga"      long_name="sea_water_salinity"/>
-          <field field_ref="voltot"     name="volo"      long_name="sea_water_volume"/>
+	<file id="file12" name_suffix="_scalar" description="scalar variables"  >
+
+	  <!-- Volume -->
+          <!-- global contents -->
+	  <field field_ref="voltot"       grid_ref="grid_1point"   name="scvoltot"  />
+	  <field field_ref="sshtot"       grid_ref="grid_1point"   name="scsshtot"  />
+	  <field field_ref="sshsteric"    grid_ref="grid_1point"   name="scsshste"  />
+<!--  <field field_ref="sshthster"    grid_ref="grid_1point"   name="scsshtst"  /> -->
+	  <field field_ref="masstot"      grid_ref="grid_1point"   name="scmastot"  />
+	  <field field_ref="temptot"      grid_ref="grid_1point"   name="sctemtot"  />
+	  <field field_ref="saltot"       grid_ref="grid_1point"   name="scsaltot"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+	  <field field_ref="bgtemper"     grid_ref="grid_1point"   name="bgtemper"    />
+	  <field field_ref="bgsaline"     grid_ref="grid_1point"   name="bgsaline"    />
+	  <field field_ref="bgheatco"     grid_ref="grid_1point"   name="bgheatco"    />
+	  <field field_ref="bgheatfx"     grid_ref="grid_1point"   name="bgheatfx"    />
+	  <field field_ref="bgsaltco"     grid_ref="grid_1point"   name="bgsaltco"    />
+	  <field field_ref="bgvolssh"     grid_ref="grid_1point"   name="bgvolssh"    />
+	  <field field_ref="bgvole3t"     grid_ref="grid_1point"   name="bgvole3t"    />
+
+	  <!-- global surface forcings  -->
+	  <field field_ref="bgfrcvol"     grid_ref="grid_1point"   name="bgfrcvol"    />
+	  <field field_ref="bgfrctem"     grid_ref="grid_1point"   name="bgfrctem"    />
+	  <field field_ref="bgfrchfx"     grid_ref="grid_1point"   name="bgfrchfx"    />
+	  <field field_ref="bgfrcsal"     grid_ref="grid_1point"   name="bgfrcsal"    />
+
+	  <!-- Surface -->
+	  <!-- global contents -->
+          <field field_ref="ibgvol_tot"     grid_ref="grid_1point"  name="ibgvol_tot"   />
+          <field field_ref="sbgvol_tot"     grid_ref="grid_1point"  name="sbgvol_tot"   />
+          <field field_ref="ibgarea_tot"    grid_ref="grid_1point"  name="ibgarea_tot"  />
+          <field field_ref="ibgsalt_tot"    grid_ref="grid_1point"  name="ibgsalt_tot"  />
+          <field field_ref="ibgheat_tot"    grid_ref="grid_1point"  name="ibgheat_tot"  />
+          <field field_ref="sbgheat_tot"    grid_ref="grid_1point"  name="sbgheat_tot"  />
+	  
+	  <!-- global drifts (conservation checks) -->
+          <field field_ref="ibgvolume"      grid_ref="grid_1point"  name="ibgvolume"    />
+          <field field_ref="ibgsaltco"      grid_ref="grid_1point"  name="ibgsaltco"    />
+          <field field_ref="ibgheatco"      grid_ref="grid_1point"  name="ibgheatco"    />
+          <field field_ref="ibgheatfx"      grid_ref="grid_1point"  name="ibgheatfx"    />
+	  
+	  <!-- global forcings  -->
+          <field field_ref="ibgfrcvoltop"   grid_ref="grid_1point"  name="ibgfrcvoltop" />
+          <field field_ref="ibgfrcvolbot"   grid_ref="grid_1point"  name="ibgfrcvolbot" />
+          <field field_ref="ibgfrctemtop"   grid_ref="grid_1point"  name="ibgfrctemtop" />
+          <field field_ref="ibgfrctembot"   grid_ref="grid_1point"  name="ibgfrctembot" />
+          <field field_ref="ibgfrcsal"      grid_ref="grid_1point"  name="ibgfrcsal"    />
+          <field field_ref="ibgfrchfxtop"   grid_ref="grid_1point"  name="ibgfrchfxtop" />
+          <field field_ref="ibgfrchfxbot"   grid_ref="grid_1point"  name="ibgfrchfxbot" />
+	  
         </file>
 
-	<file id="file19" name_suffix="_diaptr" description="diaptr variables" >
-          <field field_ref="zomsfglo"          name="zomsfglo"  grid_ref="grid_ptr_W_3D" />
+	<file id="file13" name_suffix="_diaptr" description="diaptr variables" >
+	  <field field_ref="zomsfglo"          name="zomsfglo"  grid_ref="grid_ptr_W_3D" />
           <field field_ref="zomsfatl"          name="zomsfatl"  grid_ref="grid_ptr_W_3D" />
           <field field_ref="zomsfpac"          name="zomsfpac"  grid_ref="grid_ptr_W_3D" />
           <field field_ref="zomsfind"          name="zomsfind"  grid_ref="grid_ptr_W_3D" />
           <field field_ref="zomsfipc"          name="zomsfipc"  grid_ref="grid_ptr_W_3D" />
+          <field field_ref="zotemglo"          name="zotemglo"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zotematl"          name="zotematl"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zotempac"          name="zotempac"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zotemind"          name="zotemind"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zotemipc"          name="zotemipc"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosalglo"          name="zosalglo"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosalatl"          name="zosalatl"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosalpac"          name="zosalpac"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosalind"          name="zosalind"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosalipc"          name="zosalipc"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosrfglo"          name="zosrfglo"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosrfatl"          name="zosrfatl"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosrfpac"          name="zosrfpac"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosrfind"          name="zosrfind"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="zosrfipc"          name="zosrfipc"  grid_ref="grid_ptr_T_3D" />
+          <field field_ref="sophtadv"          name="sophtadv"  grid_ref="grid_ptr_T_2D" />
+          <field field_ref="sophtldf"          name="sophtldf"  grid_ref="grid_ptr_T_2D" />
+          <field field_ref="sopstadv"          name="sopstadv"  grid_ref="grid_ptr_T_2D" />
+          <field field_ref="sopstldf"          name="sopstldf"  grid_ref="grid_ptr_T_2D" />
+        </file>
+
+
+        <file id="file31" name_suffix="_trdtra" description="ocean trends variables" >
+          <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"      > this * $cpocean * $rau0  </field>
+          <field field_ref="ttrd_eivad_e3t"  name="ttrdtr_eivad" long_name="Tendency_of_heat_content_from_parameterized_eddy_advection"     unit="W m-2"      > this * $cpocean * $rau0  </field>
+          <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"      > this * $cpocean * $rau0  </field>
+          <field field_ref="ttrd_totad_e3t"  name="ttrdtr_totad" long_name="Tendency_of_heat_content_from_residual_mean_advection"          unit="W m-2"      > this * $cpocean * $rau0  </field>
+          <field field_ref="ttrd_tot_e3t"    name="ttrdtr_tot"   long_name="Tendency_of_heat_content_from_all_processes"                    unit="W m-2"      > this * $cpocean * $rau0  </field>
+          <field field_ref="strd_zdfp_e3t"   name="strdtr_zdfp"  long_name="Tendency_of_salt_content_from_parameterized_dianeutral_mixing"  unit="kg m-2 s-1" > this * $rau0 </field>
+          <field field_ref="strd_eivad_e3t"  name="strdtr_eivad" long_name="Tendency_of_salt_content_from_parameterized_eddy_advection"     unit="kg m-2 s-1" > this * $rau0 </field>
+          <field field_ref="strd_iso_e3t"    name="strdtr_iso"   long_name="Tendency_of_salt_content_from_parameterized_eddy_diffusion"     unit="kg m-2 s-1" > this * $rau0 </field>
+          <field field_ref="strd_totad_e3t"  name="strdtr_totad" long_name="Tendency_of_salt_content_from_residual_mean_advection"          unit="kg m-2 s-1" > this * $rau0  </field>
+          <field field_ref="strd_tot_e3t"    name="strdtr_tot"   long_name="Tendency_of_salt_content_from_all_processes"                    unit="kg m-2 s-1" > this * $rau0  </field>
         </file>
 
       </file_group>
 
+
+
       <file_group id="2m_opa" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
       <file_group id="3m_opa" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
       <file_group id="4m_opa" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
@@ -318,7 +502,7 @@
       <file_group id="1y_opa"  output_freq="1y" output_level="10" enabled=".FALSE."> <!-- real yearly files -->
 
 
-	<file id="file20" name_suffix="_grid_T" description="ocean T grid variables" >
+	<file id="file14" name_suffix="_grid_T" description="ocean T grid variables" >
 	  <field field_ref="e3t"  />
 	  <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       />
 	  <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          />
@@ -378,7 +562,7 @@
          <field field_ref="dispkevfo"  name="dispkevfo" />
 	</file>
 	
-	<file id="file21" name_suffix="_grid_U" description="ocean U grid variables" >
+	<file id="file15" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="e3u"  />
 	  <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    />
 	  <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      operation="average" freq_op="1y" > @uoce_e3u / @e3u </field> 
@@ -389,7 +573,7 @@
       <field field_ref="uadv_heattr"   name="hfx" > this + udiff_heattr </field>
 	</file>
 	
-	<file id="file22" name_suffix="_grid_V" description="ocean V grid variables" >
+	<file id="file16" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="e3v"  />
 	  <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    />
 	  <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"     operation="average" freq_op="1y" > @voce_e3v / @e3v </field>
@@ -400,7 +584,7 @@
       <field field_ref="vadv_heattr"   name="hfy" > this + vdiff_heattr </field>
 	</file>
 	
-	<file id="file23" name_suffix="_grid_W" description="ocean W grid variables" >
+	<file id="file17" name_suffix="_grid_W" description="ocean W grid variables" >
 	  <field field_ref="e3w"  />
 	  <field field_ref="woce"         name="wo"      long_name="ocean vertical velocity"         />
 	  <field field_ref="avt"          name="difvho"  long_name="ocean_vertical_heat_diffusivity" />
@@ -414,7 +598,7 @@
 	  <field field_ref="av_ratio"     name="av_ratio"   />
 	</file>
 	
-	<file id="file24" name_suffix="_diaptr" description="diaptr variables" >
+	<file id="file18" name_suffix="_diaptr" description="diaptr variables" >
       <field field_ref="zomsf_3bsn"     name="msftyyz" > this * 1e6 * $rau0   </field>
       <field field_ref="sophtove_3bsn"  name="htovgyre" > sopht_vt_3bsn * 1e15 - this * 1e15  </field>
       <field field_ref="sophtove_3bsn"  name="htovovrt" > this * 1e15  </field>
@@ -423,7 +607,7 @@
 	</file>   
 
 
-        <file id="file25" name_suffix="_trdtra" description="ocean trends variables" >
+        <file id="file32" name_suffix="_trdtra" description="ocean trends variables" >
           <field field_ref="ttrd_zdfp_e3t"   name="ttrdtr_zdfp"  long_name="Tendency_of_heat_content_from_parameterized_dianeutral_mixing"  unit="W m-2"      > this * $cpocean * $rau0  </field>
           <field field_ref="ttrd_eivad_e3t"  name="ttrdtr_eivad" long_name="Tendency_of_heat_content_from_parameterized_eddy_advection"     unit="W m-2"      > this * $cpocean * $rau0  </field>
           <field field_ref="ttrd_iso_e3t"    name="ttrdtr_iso"   long_name="Tendency_of_heat_content_from_parameterized_eddy_diffusion"     unit="W m-2"      > this * $cpocean * $rau0  </field>