Index: branches/2015/dev_r6946_Offline_vvl/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml
===================================================================
--- branches/2015/dev_r6946_Offline_vvl/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml	(revision 6949)
+++ branches/2015/dev_r6946_Offline_vvl/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml	(revision 7067)
@@ -88,5 +88,5 @@
 	  <field field_ref="u_masstr"     name="vozomatr" />
 	  <field field_ref="u_heattr"     name="sozohetr" />
-      <field field_ref="u_salttr"     name="sozosatr" />
+	  <field field_ref="u_salttr"     name="sozosatr" />
 	</file>
 	
@@ -99,5 +99,5 @@
 	  <field field_ref="v_masstr"     name="vomematr" />
 	  <field field_ref="v_heattr"     name="somehetr" />
-      <field field_ref="v_salttr"     name="somesatr" />
+	  <field field_ref="v_salttr"     name="somesatr" />
 	</file>
 	
@@ -116,14 +116,8 @@
           <field field_ref="iceconc"         name="siconc" />
 
-          <field field_ref="vfxbog"          name="vfxbog" />
-          <field field_ref="vfxdyn"          name="vfxdyn" />
-          <field field_ref="vfxopw"          name="vfxopw" />
-          <field field_ref="vfxsni"          name="vfxsni" />
-          <field field_ref="vfxsum"          name="vfxsum" />
-          <field field_ref="vfxbom"          name="vfxbom" />
-          <field field_ref="vfxres"          name="vfxres" />
           <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" />
 
@@ -134,37 +128,11 @@
           <field field_ref="destrp"          name="destrp" />
 
-          <field field_ref="sfxbri"          name="sfxbri" />
-          <field field_ref="sfxdyn"          name="sfxdyn" />
-          <field field_ref="sfxres"          name="sfxres" />
-          <field field_ref="sfxbog"          name="sfxbog" />
-          <field field_ref="sfxbom"          name="sfxbom" />
-          <field field_ref="sfxsum"          name="sfxsum" />
-          <field field_ref="sfxsni"          name="sfxsni" />
-          <field field_ref="sfxopw"          name="sfxopw" />
           <field field_ref="sfx"             name="sfx"    />
 
-          <field field_ref="hfxsum"          name="hfxsum"     />
-          <field field_ref="hfxbom"          name="hfxbom"     />
-          <field field_ref="hfxbog"          name="hfxbog"     />
-          <field field_ref="hfxdif"          name="hfxdif"     />
-          <field field_ref="hfxopw"          name="hfxopw"     />
           <field field_ref="hfxout"          name="hfxout"     />
           <field field_ref="hfxin"           name="hfxin"      />
-          <field field_ref="hfxsnw"          name="hfxsnw"     />
-          <field field_ref="hfxerr"          name="hfxerr"     />
-          <field field_ref="hfxerr_rem"      name="hfxerr_rem" />
-
-	  <!-- ice-ocean heat flux from mass exchange -->
-          <field field_ref="hfxdyn"          name="hfxdyn" />
-          <field field_ref="hfxres"          name="hfxres" />
-          <field field_ref="hfxthd"          name="hfxthd" />
-	  <!-- ice-atm. heat flux from mass exchange -->
-          <field field_ref="hfxsub"          name="hfxsub" />
-          <field field_ref="hfxspr"          name="hfxspr" />
+
 
 	  <!-- diags -->
-          <field field_ref="hfxdhc"          name="hfxdhc" />
-          <field field_ref="hfxtur"          name="hfxtur" />
-
           <field field_ref="isst"            name="sst"    />
           <field field_ref="isss"            name="sss"    />
@@ -209,4 +177,5 @@
           <field field_ref="bgsaline"     name="bgsaline"   />
           <field field_ref="bgheatco"     name="bgheatco"   />
+          <field field_ref="bgheatfx"     name="bgheatfx"   />
           <field field_ref="bgsaltco"     name="bgsaltco"   />
           <field field_ref="bgvolssh"     name="bgvolssh"   /> 
@@ -214,56 +183,26 @@
           <field field_ref="bgfrcvol"     name="bgfrcvol"   />
           <field field_ref="bgfrctem"     name="bgfrctem"   />
+          <field field_ref="bgfrchfx"     name="bgfrchfx"   />
           <field field_ref="bgfrcsal"     name="bgfrcsal"   />
 
-          <field field_ref="ibgvoltot"    name="ibgvoltot"  />
-          <field field_ref="sbgvoltot"    name="sbgvoltot"  />
-          <field field_ref="ibgarea"      name="ibgarea"    />
-          <field field_ref="ibgsaline"    name="ibgsaline"  />
-          <field field_ref="ibgtemper"    name="ibgtemper"  />
-          <field field_ref="ibgheatco"    name="ibgheatco"  />
-          <field field_ref="sbgheatco"    name="sbgheatco"  />
-          <field field_ref="ibgsaltco"    name="ibgsaltco"  />
-
-          <field field_ref="ibgvfx"       name="ibgvfx"     />
-          <field field_ref="ibgvfxbog"    name="ibgvfxbog"  />
-          <field field_ref="ibgvfxopw"    name="ibgvfxopw"  />
-          <field field_ref="ibgvfxsni"    name="ibgvfxsni"  />
-          <field field_ref="ibgvfxdyn"    name="ibgvfxdyn"  />
-          <field field_ref="ibgvfxbom"    name="ibgvfxbom"  />
-          <field field_ref="ibgvfxsum"    name="ibgvfxsum"  />
-          <field field_ref="ibgvfxres"    name="ibgvfxres"  />
-          <field field_ref="ibgvfxspr"    name="ibgvfxspr"  />
-          <field field_ref="ibgvfxsnw"    name="ibgvfxsnw"  />
-          <field field_ref="ibgvfxsub"    name="ibgvfxsub"  />
-
-          <field field_ref="ibgsfx"       name="ibgsfx"     />
-          <field field_ref="ibgsfxbri"    name="ibgsfxbri"  />
-          <field field_ref="ibgsfxdyn"    name="ibgsfxdyn"  />
-          <field field_ref="ibgsfxres"    name="ibgsfxres"  />
-          <field field_ref="ibgsfxbog"    name="ibgsfxbog"  />
-          <field field_ref="ibgsfxopw"    name="ibgsfxopw"  />
-          <field field_ref="ibgsfxsni"    name="ibgsfxsni"  />
-          <field field_ref="ibgsfxbom"    name="ibgsfxbom"  />
-          <field field_ref="ibgsfxsum"    name="ibgsfxsum"  />
-
-          <field field_ref="ibghfxdhc"    name="ibghfxdhc"  />
-          <field field_ref="ibghfxspr"    name="ibghfxspr"  />
-
-          <field field_ref="ibghfxres"    name="ibghfxres"  />
-          <field field_ref="ibghfxsub"    name="ibghfxsub"  />
-          <field field_ref="ibghfxdyn"    name="ibghfxdyn"  />
-          <field field_ref="ibghfxthd"    name="ibghfxthd"  />
-          <field field_ref="ibghfxsum"    name="ibghfxsum"  />
-          <field field_ref="ibghfxbom"    name="ibghfxbom"  />
-          <field field_ref="ibghfxbog"    name="ibghfxbog"  />
-          <field field_ref="ibghfxdif"    name="ibghfxdif"  />
-          <field field_ref="ibghfxopw"    name="ibghfxopw"  />
-          <field field_ref="ibghfxout"    name="ibghfxout"  />
-          <field field_ref="ibghfxin"     name="ibghfxin"   />
-          <field field_ref="ibghfxsnw"    name="ibghfxsnw"  />
-
-          <field field_ref="ibgfrcvol"    name="ibgfrcvol"  />
-          <field field_ref="ibgfrcsfx"    name="ibgfrcsfx"  />
-          <field field_ref="ibgvolgrm"    name="ibgvolgrm"  />
+	  <field field_ref="ibgvol_tot"   name="ibgvol_tot"  />
+	  <field field_ref="sbgvol_tot"   name="sbgvol_tot"  />
+	  <field field_ref="ibgarea_tot"  name="ibgarea_tot" />
+	  <field field_ref="ibgsalt_tot"  name="ibgsalt_tot" />
+	  <field field_ref="ibgheat_tot"  name="ibgheat_tot" />
+	  <field field_ref="sbgheat_tot"  name="sbgheat_tot" />
+	  
+	  <field field_ref="ibgvolume"    name="ibgvolume"   />
+	  <field field_ref="ibgsaltco"    name="ibgsaltco"   />
+	  <field field_ref="ibgheatco"    name="ibgheatco"   />
+          <field field_ref="ibgheatfx"    name="ibgheatfx"   />
+	  
+	  <field field_ref="ibgfrcvoltop" name="ibgfrcvoltop" />
+	  <field field_ref="ibgfrcvolbot" name="ibgfrcvolbot" />
+	  <field field_ref="ibgfrctemtop" name="ibgfrctemtop" />
+	  <field field_ref="ibgfrctembot" name="ibgfrctembot" />
+	  <field field_ref="ibgfrcsal"    name="ibgfrcsal"    />
+          <field field_ref="ibgfrchfxtop" name="ibgfrchfxtop" />
+          <field field_ref="ibgfrchfxbot" name="ibgfrchfxbot" />
 
         </file>
