Index: NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml
===================================================================
--- NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml	(revision 11831)
+++ NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml	(revision 11957)
@@ -7,119 +7,121 @@
 =                                         put the variables you want...                                    =
 ============================================================================================================
-    -->
-   
-    <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1mo" min_digits="4">
-    
-      <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
-        <file id="file11" name_suffix="_grid_T" description="ocean T grid variables" >
-          <field field_ref="e3t"      />
-          <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field>
-          <field field_ref="soce"         name="so"                                                                          operation="instant" freq_op="5d" > @soce_e3t / @e3t </field>
-          <field field_ref="sst"          name="tos"   />
-          <field field_ref="sss"          name="sos"   />
-          <field field_ref="ssh"          name="zos"   />
-          <field field_ref="sst"          name="tosstd"       long_name="sea surface temperature standard deviation"         operation="instant" freq_op="5d" > sqrt( @sst2 - @sst * @sst ) </field>
-          <field field_ref="ssh"          name="zosstd"       long_name="sea surface height above geoid standard deviation"  operation="instant" freq_op="5d" > 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="mldkz5"   />
-          <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>
-          <field field_ref="sbt"      />
-          <field field_ref="heatc"        name="heatc" />
-          <field field_ref="saltc"        name="saltc" />
+-->
 
-	  <field field_ref="empmr"        name="wfo"      />
-	  <field field_ref="qsr_oce"      name="qsr_oce"  />
-	  <field field_ref="qns_oce"      name="qns_oce"  />
-	  <field field_ref="qt_oce"       name="qt_oce"   />
-	  <field field_ref="saltflx"      name="sfx"      />
-	  <field field_ref="taum"         name="taum"     />
-	  <field field_ref="wspd"         name="windsp"   />
-	  <field field_ref="precip"       name="precip"   />
-	  <!-- ice and snow -->
-	  <field field_ref="snowpre" />
-	</file>
+<file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1mo" min_digits="4">
 
-	<file id="file12" name_suffix="_grid_U" description="ocean U grid variables" >
-	  <field field_ref="e3u" />
-	  <field field_ref="ssu"          name="uos"      />
-	  <field field_ref="uoce"         name="uo"       operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
-	  <field field_ref="utau"         name="tauuo"    />
-          <field field_ref="uocetr_eff"   name="uocetr_eff"  />
-          <!-- available with 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="file13" name_suffix="_grid_V" description="ocean V grid variables" >
-	  <field field_ref="e3v" />
-	  <field field_ref="ssv"          name="vos"      />
-	  <field field_ref="voce"         name="vo"       operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
-	  <field field_ref="vtau"         name="tauvo"    />
-          <field field_ref="vocetr_eff"   name="vocetr_eff"  />
-          <!-- available with 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="file14" 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"   />
-	  <field field_ref="w_masstr"     name="vovematr" />
-         <!-- variables available with ln_zdfiwm =T -->
-          <field field_ref="av_wave"      name="av_wave"    />
-          <field field_ref="bn2"          name="bn2"        />
-          <field field_ref="bflx_iwm"     name="bflx_iwm"   />
-          <field field_ref="pcmap_iwm"    name="pcmap_iwm"  />
-          <field field_ref="emix_iwm"     name="emix_iwm"   />
-          <field field_ref="av_ratio"     name="av_ratio"   />
-	</file>
+  <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->
+    <file id="file11" name_suffix="_grid_T" description="ocean T grid variables" >
+      <field field_ref="e3t"      />
+      <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field>
+      <field field_ref="soce"         name="so"                                                                          operation="instant" freq_op="5d" > @soce_e3t / @e3t </field>
+      <field field_ref="sst"          name="tos"   />
+      <field field_ref="sss"          name="sos"   />
+      <field field_ref="ssh"          name="zos"   />
+      <field field_ref="sst"          name="tosstd"       long_name="sea surface temperature standard deviation"         operation="instant" freq_op="5d" > sqrt( @sst2 - @sst * @sst ) </field>
+      <field field_ref="ssh"          name="zosstd"       long_name="sea surface height above geoid standard deviation"  operation="instant" freq_op="5d" > 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="mldkz5"   />
+      <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>
+      <field field_ref="sbt"      />
+      <field field_ref="heatc"        name="heatc" />
+      <field field_ref="saltc"        name="saltc" />
+      
+      <!-- Addition for branch "dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk"   -->
+      <field field_ref="t_skin"       name="t_skin" />
+      <field field_ref="rho_air"      name="rho_air"  />
+      <field field_ref="dt_skin"      name="dt_skin"  />
+      <!--    -->
+      
+      <field field_ref="empmr"        name="wfo"      />
+      <field field_ref="qsr_oce"      name="qsr_oce"  />
+      <field field_ref="qns_oce"      name="qns_oce"  />
+      <field field_ref="qt_oce"       name="qt_oce"   />
+      <field field_ref="saltflx"      name="sfx"      />
+      <field field_ref="taum"         name="taum"     />
+      <field field_ref="wspd"         name="windsp"   />
+      <field field_ref="precip"       name="precip"   />
+      <!-- ice and snow -->
+      <field field_ref="snowpre" />
+    </file>
 
-        <file id="file15" name_suffix="_scalar" description="scalar variables" >
-          <!-- global drifts (conservation checks) -->
-          <field field_ref="bgtemper"     name="bgtemper"    />
-          <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"    />
-          <field field_ref="bgvole3t"     name="bgvole3t"    />
+    <file id="file12" name_suffix="_grid_U" description="ocean U grid variables" >
+      <field field_ref="e3u" />
+      <field field_ref="ssu"          name="uos"      />
+      <field field_ref="uoce"         name="uo"       operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
+      <field field_ref="utau"         name="tauuo"    />
+      <field field_ref="uocetr_eff"   name="uocetr_eff"  />
+      <!-- available with diaar5 -->
+      <field field_ref="u_masstr"     name="vozomatr" />
+      <field field_ref="u_heattr"     name="sozohetr" />
+      <field field_ref="u_salttr"     name="sozosatr" />
+    </file>
 
-          <!-- global surface forcings  -->
-          <field field_ref="bgfrcvol"     name="bgfrcvol"    />
-          <field field_ref="bgfrctem"     name="bgfrctem"    />
-          <field field_ref="bgfrchfx"     name="bgfrchfx"    />
-          <field field_ref="bgfrcsal"     name="bgfrcsal"    />
-        </file>
+    <file id="file13" name_suffix="_grid_V" description="ocean V grid variables" >
+      <field field_ref="e3v" />
+      <field field_ref="ssv"          name="vos"      />
+      <field field_ref="voce"         name="vo"       operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
+      <field field_ref="vtau"         name="tauvo"    />
+      <field field_ref="vocetr_eff"   name="vocetr_eff"  />
+      <!-- available with diaar5 -->
+      <field field_ref="v_masstr"     name="vomematr" />
+      <field field_ref="v_heattr"     name="somehetr" />
+      <field field_ref="v_salttr"     name="somesatr" />
+    </file>
 
-      </file_group> 
+    <file id="file14" 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"   />
+      <field field_ref="w_masstr"     name="vovematr" />
+      <!-- variables available with ln_zdfiwm =T -->
+      <field field_ref="av_wave"      name="av_wave"    />
+      <field field_ref="bn2"          name="bn2"        />
+      <field field_ref="bflx_iwm"     name="bflx_iwm"   />
+      <field field_ref="pcmap_iwm"    name="pcmap_iwm"  />
+      <field field_ref="emix_iwm"     name="emix_iwm"   />
+      <field field_ref="av_ratio"     name="av_ratio"   />
+    </file>
+
+    <file id="file15" name_suffix="_scalar" description="scalar variables" >
+      <!-- global drifts (conservation checks) -->
+      <field field_ref="bgtemper"     name="bgtemper"    />
+      <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"    />
+      <field field_ref="bgvole3t"     name="bgvole3t"    />
+
+      <!-- global surface forcings  -->
+      <field field_ref="bgfrcvol"     name="bgfrcvol"    />
+      <field field_ref="bgfrctem"     name="bgfrctem"    />
+      <field field_ref="bgfrchfx"     name="bgfrchfx"    />
+      <field field_ref="bgfrcsal"     name="bgfrcsal"    />
+    </file>
+
+  </file_group>
 
 
-      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
-      </file_group>
+  <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
+  </file_group>
 
-      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
-      </file_group>
-	
-      
-      <file_group id="1ts" output_freq="1ts" output_level="10" enabled=".TRUE."/> <!-- 1 time step 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="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="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>
-    
+  <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
+  </file_group>
 
 
+  <file_group id="1ts" output_freq="1ts" output_level="10" enabled=".TRUE."/> <!-- 1 time step 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="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="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>
Index: NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/cfgs/SHARED/field_def_nemo-oce.xml
===================================================================
--- NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/cfgs/SHARED/field_def_nemo-oce.xml	(revision 11831)
+++ NEMO/branches/2019/dev_r11085_ASINTER-05_Brodeau_Advanced_Bulk/cfgs/SHARED/field_def_nemo-oce.xml	(revision 11957)
@@ -337,8 +337,8 @@
 
       <!-- sbcssm variables -->
-      <field id="sst_m" long_name="Bulk sea surface temperature"  standard_name="bulk_sea_surface_temperature" unit="degC" />
-      <field id="sss_m" long_name="sea surface salinity"          standard_name="sea_surface_salinity"         unit="psu"  />
-      <field id="ssu_m" long_name="ocean surface current along i-axis"                                         unit="m/s"  />
-      <field id="ssv_m" long_name="ocean surface current along j-axis"                                         unit="m/s"  />
+      <field id="sst_m"    unit="degC" />
+      <field id="sss_m"    unit="psu"  />
+      <field id="ssu_m"    unit="m/s"  />
+      <field id="ssv_m"    unit="m/s"  />
       <field id="ssh_m"    unit="m"    />
       <field id="e3t_m"    unit="m"    />
@@ -347,7 +347,4 @@
     </field_group>
 
-    <!-- scalar variables -->
-    <field_group id="SBC_0D"  grid_ref="grid_1point" >
-    </field_group>
 
   </field_group> <!-- SBC -->
