cfgs/AGRIF_DEMO/EXPREF/file_def_nemo-oce.xml

@@ -34,6 +34,8 @@
 	  <field field_ref="qt_oce"       name="qt_oce"   />
 	  <field field_ref="saltflx"      name="sfx"      />
 	  <field field_ref="taum"         name="taum"     />
+	  <field field_ref="utau"         name="tauuo"    />
+	  <field field_ref="vtau"         name="tauvo"    />
 	  <field field_ref="wspd"         name="windsp"   />
 	  <field field_ref="precip"       name="precip"   />
 	  <!-- ice and snow -->
@@ -44,7 +46,6 @@
 	  <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" />
@@ -56,7 +57,6 @@
 	  <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" />

cfgs/AMM12/EXPREF/file_def_nemo-oce.xml

@@ -100,6 +100,8 @@
 	  <field field_ref="qsr"          name="rsntds" />
 	  <field field_ref="qt"           name="tohfls" />
 	  <field field_ref="taum"     />
+	  <field field_ref="utau"         name="tauuo" />
+	  <field field_ref="vtau"         name="tauvo" />
 	  <field field_ref="mldkz5"   />
 	  <field field_ref="mldr10_1" />
 	</file>
@@ -107,13 +109,11 @@
 	<file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="uoce"         name="uo"    />
 	  <field field_ref="ssu"          name="uos"   />
-	  <field field_ref="utau"         name="tauuo" />
 	</file>
 	
 	<file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="voce"         name="vo"    />
 	  <field field_ref="ssv"          name="vos"   />
-	  <field field_ref="vtau"         name="tauvo" />
 	</file>
 	
 	<file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >

cfgs/GYRE_PISCES/EXPREF/file_def_nemo.xml

@@ -32,16 +32,16 @@
 	  <field field_ref="qt"           name="sohefldo"  />
 	  <field field_ref="mldr10_1"     name="somxl010"  />
 	  <field field_ref="mldkz5"       name="somixhgt"  />
+          <field field_ref="utau"         name="sozotaux"  />
+          <field field_ref="vtau"         name="sometauy"  /> 
         </file>
 	
         <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
           <field field_ref="uoce"         name="vozocrtx"  />
-          <field field_ref="utau"         name="sozotaux"  />
         </file>
 	
         <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
           <field field_ref="voce"         name="vomecrty"  /> 
-          <field field_ref="vtau"         name="sometauy"  /> 
         </file>
 	
         <file id="file4" name_suffix="_grid_W" description="ocean W grid variables" >

cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml

@@ -30,6 +30,8 @@
 	  <field field_ref="qt_oce"       name="qt_oce"   />
 	  <field field_ref="saltflx"      name="sfx"      />
 	  <field field_ref="taum"         name="taum"     />
+	  <field field_ref="utau"         name="tauuo"    />
+	  <field field_ref="vtau"         name="tauvo"    />
 	  <field field_ref="wspd"         name="windsp"   />
 	  <field field_ref="precip"       name="precip"   />
 	  <!-- ice and snow -->
@@ -40,14 +42,12 @@
 	  <field field_ref="e3u" />
 	  <field field_ref="ssu"          name="uos"      />
 	  <field field_ref="uoce"         name="uo"       />
-	  <field field_ref="utau"         name="tauuo"    />
 	</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"       />
-	  <field field_ref="vtau"         name="tauvo"    />
 	</file>
 	
 	<file id="file14" name_suffix="_grid_ABL" description="ABL grid variables" >

cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml

@@ -34,6 +34,8 @@
 	  <field field_ref="qt_oce"       name="qt_oce"   />
 	  <field field_ref="saltflx"      name="sfx"      />
 	  <field field_ref="taum"         name="taum"     />
+	  <field field_ref="utau"         name="tauuo"    />
+	  <field field_ref="vtau"         name="tauvo"    />
 	  <field field_ref="wspd"         name="windsp"   />
 	  <field field_ref="precip"       name="precip"   />
 	  <!-- ice and snow -->
@@ -44,7 +46,6 @@
 	  <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" />
@@ -56,7 +57,6 @@
 	  <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" />

cfgs/ORCA2_SAS_ICE/EXPREF/file_def_nemo-oce.xml

@@ -34,6 +34,8 @@
 	  <field field_ref="qt_oce"       name="qt_oce"   />
 	  <field field_ref="saltflx"      name="sfx"      />
 	  <field field_ref="taum"         name="taum"     />
+	  <field field_ref="utau"         name="tauuo"    />
+	  <field field_ref="vtau"         name="tauvo"    />
 	  <field field_ref="wspd"         name="windsp"   />
 	  <field field_ref="precip"       name="precip"   />
 	  <!-- ice and snow -->
@@ -44,7 +46,6 @@
 	  <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" />
@@ -56,7 +57,6 @@
 	  <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" />

cfgs/SHARED/field_def_nemo-oce.xml

@@ -432,6 +432,8 @@ that are available in the tidal-forcing implementation (see
       <field id="erp"          long_name="Surface Water Flux: Damping"           standard_name="water_flux_out_of_sea_water_due_to_newtonian_relaxation"              unit="kg/m2/s"                        />
       <field id="taum"         long_name="wind stress module"                    standard_name="magnitude_of_surface_downward_stress"                                 unit="N/m2"                           />
       <field id="wspd"         long_name="wind speed module"                     standard_name="wind_speed"                                                           unit="m/s"                            />
+      <field id="utau"         long_name="Wind Stress along i-axis"              standard_name="surface_downward_x_stress"                                            unit="N/m2"                           />
+      <field id="vtau"         long_name="Wind Stress along j-axis"              standard_name="surface_downward_y_stress"                                            unit="N/m2"                           />
 
       <!-- * variable relative to atmospheric pressure forcing : available with ln_apr_dyn -->
       <field id="ssh_ib"       long_name="Inverse barometer sea surface height"  standard_name="sea_surface_height_correction_due_to_air_pressure_at_low_frequency"   unit="m"        />
@@ -583,7 +585,6 @@ that are available in the tidal-forcing implementation (see
     <field id="e2u"           long_name="U-cell width in meridional direction"                   standard_name="cell_width"                  unit="m"                               />
     <field id="e3u"           long_name="U-cell thickness"                                       standard_name="cell_thickness"              unit="m"          grid_ref="grid_U_3D" />
     <field id="e3u_0"         long_name="Initial U-cell thickness"                               standard_name="ref_cell_thickness"          unit="m"          grid_ref="grid_U_3D"/>
-    <field id="utau"          long_name="Wind Stress along i-axis"                               standard_name="surface_downward_x_stress"   unit="N/m2"                            />
     <field id="uoce"          long_name="ocean current along i-axis"                             standard_name="sea_water_x_velocity"        unit="m/s"        grid_ref="grid_U_3D" />
     <field id="uoce_e3u"      long_name="ocean current along i-axis  (thickness weighted)"                                                   unit="m/s"        grid_ref="grid_U_3D"  > uoce * e3u </field>
     <field id="uoce_e3u_vsum" long_name="ocean current along i-axis * e3u summed on the vertical"  field_ref="uoce_e3u"    unit="m3/s"       grid_ref="grid_U_vsum"/>
@@ -651,7 +652,6 @@ that are available in the tidal-forcing implementation (see
     <field id="e3v"          long_name="V-cell thickness"                                       standard_name="cell_thickness"              unit="m"          grid_ref="grid_V_3D" />
     <field id="e3v_0"        long_name="Initial V-cell thickness"                               standard_name="ref_cell_thickness"          unit="m"          grid_ref="grid_V_3D" />
     <field id="hv"            long_name="water column height at V point"                        standard_name="water_column_height_V"       unit="m" />
-    <field id="vtau"         long_name="Wind Stress along j-axis"                               standard_name="surface_downward_y_stress"   unit="N/m2"                            />
     <field id="voce"         long_name="ocean current along j-axis"                             standard_name="sea_water_y_velocity"        unit="m/s"        grid_ref="grid_V_3D" />
     <field id="voce_e3v"     long_name="ocean current along j-axis  (thickness weighted)"                                                   unit="m/s"        grid_ref="grid_V_3D"  > voce * e3v </field>
     <field id="ssv"          long_name="ocean surface current along j-axis"                                                                 unit="m/s"                             />
@@ -1189,6 +1189,8 @@ that are available in the tidal-forcing implementation (see
     <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="utau"         name="tauuo"    long_name="surface_downward_x_stress"                     />
+    <field field_ref="vtau"         name="tauvo"    long_name="surface_downward_y_stress"                     />
     <field field_ref="20d"                                                                                    />
     <field field_ref="mldkz5"                                                                                 />
     <field field_ref="mldr10_1"                                                                               />
@@ -1203,12 +1205,10 @@ that are available in the tidal-forcing implementation (see
 
   <field_group id="groupU" >
     <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      />
-    <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
   </field_group>
 
   <field_group id="groupV" >
     <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"      />
-    <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
   </field_group>
 
   <field_group id="groupW" >

cfgs/SHARED/namelist_ref

@@ -369,7 +369,7 @@
 !***  receive  ***
    sn_rcv_w10m   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_taumod =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
-   sn_rcv_tau    =   'oce only'             ,    'no'    , 'cartesian' , 'eastward-northward' ,  'U,V'
+   sn_rcv_tau    =   'oce only'             ,    'no'    , 'cartesian' , 'eastward-northward' ,   ''
    sn_rcv_dqnsdt =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_qsr    =   'oce and ice'          ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_qns    =   'oce and ice'          ,    'no'    ,     ''      ,         ''           ,   ''
@@ -380,21 +380,22 @@
    sn_rcv_iceflx =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_mslp   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_ts_ice =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_qtrice =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_isf    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_icb    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
-   sn_rcv_hsig   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_phioc  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_sdrfx  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_sdrfy  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_wper   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_wnum   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_wstrf  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_wdrag  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_charn  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_taw    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'U,V'
-   sn_rcv_bhd    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_tusd   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
-   sn_rcv_tvsd   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   'T'
+   sn_rcv_hsig   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_phioc  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_sdrfx  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_sdrfy  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_wper   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_wnum   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_wstrf  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_wdrag  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_charn  =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_taw    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_bhd    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_tusd   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_tvsd   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
 /
 !-----------------------------------------------------------------------
 &namsbc_sas    !   Stand-Alone Surface module: ocean data               (SAS_SRC  only)

cfgs/SPITZ12/EXPREF/file_def_nemo-oce.xml

@@ -34,6 +34,8 @@
 	  <field field_ref="qt_oce"       name="qt_oce"   />
 	  <field field_ref="saltflx"      name="sfx"      />
 	  <field field_ref="taum"         name="taum"     />
+	  <field field_ref="utau"         name="tauuo"    />
+	  <field field_ref="vtau"         name="tauvo"    />
 	  <field field_ref="wspd"         name="windsp"   />
 	  <field field_ref="precip"       name="precip"   />
 	  <!-- ice and snow -->
@@ -44,7 +46,6 @@
 	  <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" />
@@ -56,7 +57,6 @@
 	  <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" />

cfgs/WED025/EXPREF/file_def_nemo-oce.xml

@@ -31,6 +31,8 @@
 	  <field field_ref="qt_oce"       name="qt_oce"   />
 	  <field field_ref="saltflx"      name="sfx"      />
 	  <field field_ref="taum"         name="taum"     />
+	  <field field_ref="utau"         name="tauuo"    />
+	  <field field_ref="vtau"         name="tauvo"    />
 	  <field field_ref="wspd"         name="windsp"   />
 	  <field field_ref="precip"       name="precip"   />
 	  <field field_ref="snowpre"                      />
@@ -67,14 +69,12 @@
 	  <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"    />
 	</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"    />
 	</file>
 	
 	<file id="file14" name_suffix="_grid_W" description="ocean W grid variables" >

sette/BATCH_TEMPLATE/batch-X64_JEANZAY

@@ -2,6 +2,7 @@
 #SBATCH -A GROUP_IDRIS@cpu
 #SBATCH --job-name=SETTE_JOB      # nom du job
 #SBATCH --partition=cpu_p1        # Nom de la partition d'exécution
+#SBATCH --qos=qos_cpu-dev           # quality of service
 #SBATCH --ntasks=NPROCS                # Nombre total de processus MPI
 #SBATCH --ntasks-per-node=40       # Nombre de processus MPI par noeud
 # /!\ Attention, la ligne suivante est trompeuse mais dans le vocabulaire

src/ABL/ablmod.F90

@@ -98,8 +98,8 @@ CONTAINS
       REAL(wp) , INTENT(in   ), DIMENSION(:,:  ) ::   pevp_ice     ! Ce x Du over ice (T-point)
       REAL(wp) , INTENT(in   ), DIMENSION(:,:  ) ::   pwndm_ice    ! ||uwnd - uice||
       REAL(wp) , INTENT(in   ), DIMENSION(:,:  ) ::   pfrac_oce    ! ocean fraction
-      REAL(wp) , INTENT(  out), DIMENSION(:,:  ) ::   ptaui_ice    ! ice-surface taux stress (U-point)
-      REAL(wp) , INTENT(  out), DIMENSION(:,:  ) ::   ptauj_ice    ! ice-surface tauy stress (V-point)
+      REAL(wp) , INTENT(  out), DIMENSION(:,:  ) ::   ptaui_ice    ! ice-surface taux stress (T-point)
+      REAL(wp) , INTENT(  out), DIMENSION(:,:  ) ::   ptauj_ice    ! ice-surface tauy stress (T-point)
 #endif
       !
       REAL(wp), DIMENSION(1:jpi,1:jpj       )    ::   zwnd_i, zwnd_j
@@ -617,25 +617,17 @@ CONTAINS
          zwnd_i(ji,jj) = zztmp * zwnd_i(ji,jj)
          zwnd_j(ji,jj) = zztmp * zwnd_j(ji,jj)
       END_2D
-      ! ... utau, vtau at U- and V_points, resp.
-      !     Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines
-      !     Note the use of MAX(tmask(i,j),tmask(i+1,j) is to mask tau over ice shelves
-      DO_2D( 0, 0, 0, 0 )
-         zcff  = 0.5_wp * ( 2._wp - msk_abl(ji,jj)*msk_abl(ji+1,jj) )
-         zztmp = MAX(msk_abl(ji,jj),msk_abl(ji+1,jj))
-         ptaui(ji,jj) = zcff * zztmp * ( zwnd_i(ji,jj) + zwnd_i(ji+1,jj  ) )
-         zcff  = 0.5_wp * ( 2._wp - msk_abl(ji,jj)*msk_abl(ji,jj+1) )
-         zztmp = MAX(msk_abl(ji,jj),msk_abl(ji,jj+1))
-         ptauj(ji,jj) = zcff * zztmp * ( zwnd_j(ji,jj) + zwnd_j(ji  ,jj+1) )
+      ! ... utau, vtau at T-points
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+         ptaui(ji,jj) = zwnd_i(ji,jj) * msk_abl(ji,jj) !!clem tau: check
+         ptauj(ji,jj) = zwnd_j(ji,jj) * msk_abl(ji,jj) !!clem tau: check
       END_2D
-      !
-      CALL lbc_lnk( 'ablmod', ptaui(:,:), 'U', -1.0_wp, ptauj(:,:), 'V', -1.0_wp )
 
       CALL iom_put( "taum_oce", ptaum )
 
       IF(sn_cfctl%l_prtctl) THEN
-         CALL prt_ctl( tab2d_1=ptaui , clinfo1=' abl_stp: utau   : ', mask1=umask,   &
-            &          tab2d_2=ptauj , clinfo2='          vtau   : ', mask2=vmask )
+         CALL prt_ctl( tab2d_1=ptaui , clinfo1=' abl_stp: utau   : ', mask1=tmask,   &
+            &          tab2d_2=ptauj , clinfo2='          vtau   : ', mask2=tmask )
          CALL prt_ctl( tab2d_1=pwndm , clinfo1=' abl_stp: wndm   : ' )
       ENDIF
 
@@ -657,23 +649,14 @@ CONTAINS
       ! ------------------------------------------------------------ !
       !    Wind stress relative to the moving ice ( U10m - U_ice )   !
       ! ------------------------------------------------------------ !
-      DO_2D( 0, 0, 0, 0 )
-
-         zztmp1 = 0.5_wp * ( u_abl(ji+1,jj  ,2,nt_a) + u_abl(ji,jj,2,nt_a) )
-         zztmp2 = 0.5_wp * ( v_abl(ji  ,jj+1,2,nt_a) + v_abl(ji,jj,2,nt_a) )
-
-         ptaui_ice(ji,jj) = 0.5_wp * (  rhoa(ji+1,jj) * pCd_du_ice(ji+1,jj)             &
-            &                      +    rhoa(ji  ,jj) * pCd_du_ice(ji  ,jj)  )          &
-            &         * ( zztmp1 - pssu_ice(ji,jj) * rn_vfac )
-         ptauj_ice(ji,jj) = 0.5_wp * (  rhoa(ji,jj+1) * pCd_du_ice(ji,jj+1)             &
-            &                      +    rhoa(ji,jj  ) * pCd_du_ice(ji,jj  )  )          &
-            &         * ( zztmp2 - pssv_ice(ji,jj) * rn_vfac )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+         ptaui_ice(ji,jj) = rhoa(ji,jj) * pCd_du_ice(ji,jj) * ( u_abl(ji,jj,2,nt_a) - pssu_ice(ji,jj) * rn_vfac )
+         ptauj_ice(ji,jj) = rhoa(ji,jj) * pCd_du_ice(ji,jj) * ( v_abl(ji,jj,2,nt_a) - pssv_ice(ji,jj) * rn_vfac )
       END_2D
-      CALL lbc_lnk( 'ablmod', ptaui_ice, 'U', -1.0_wp, ptauj_ice,'V', -1.0_wp )
       !
       IF(sn_cfctl%l_prtctl) THEN
-         CALL prt_ctl( tab2d_1=ptaui_ice , clinfo1=' abl_stp: utau_ice : ', mask1=umask,   &
-            &          tab2d_2=ptauj_ice , clinfo2='          vtau_ice : ', mask2=vmask )
+         CALL prt_ctl( tab2d_1=ptaui_ice , clinfo1=' abl_stp: utau_ice : ', mask1=tmask,   &
+            &          tab2d_2=ptauj_ice , clinfo2='          vtau_ice : ', mask2=tmask )
       END IF
 #endif
       !                            !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

src/ABL/sbcabl.F90

@@ -308,8 +308,8 @@ CONTAINS
       !!              - Perform 1 time-step of the ABL model
       !!              - Finalize flux computation in blk_oce_2
       !!
-      !! ** Outputs : - utau    : i-component of the stress at U-point  (N/m2)
-      !!              - vtau    : j-component of the stress at V-point  (N/m2)
+      !! ** Outputs : - utau    : i-component of the stress at T-point  (N/m2)
+      !!              - vtau    : j-component of the stress at T-point  (N/m2)
       !!              - taum    : Wind stress module at T-point         (N/m2)
       !!              - wndm    : Wind speed module at T-point          (m/s)
       !!              - qsr     : Solar heat flux over the ocean        (W/m2)

src/ICE/icectl.F90

@@ -733,10 +733,10 @@ CONTAINS
       CALL prt_ctl_info(' ')
       CALL prt_ctl_info(' - Stresses : ')
       CALL prt_ctl_info('   ~~~~~~~~~~ ')
-      CALL prt_ctl(tab2d_1=utau       , clinfo1= ' utau      : ', mask1 = umask,  &
-         &         tab2d_2=vtau       , clinfo2= ' vtau      : ', mask2 = vmask)
-      CALL prt_ctl(tab2d_1=utau_ice   , clinfo1= ' utau_ice  : ', mask1 = umask,  &
-         &         tab2d_2=vtau_ice   , clinfo2= ' vtau_ice  : ', mask2 = vmask)
+      CALL prt_ctl(tab2d_1=utau       , clinfo1= ' utau      : ', mask1 = tmask,  &
+         &         tab2d_2=vtau       , clinfo2= ' vtau      : ', mask2 = tmask)
+      CALL prt_ctl(tab2d_1=utau_ice   , clinfo1= ' utau_ice  : ', mask1 = tmask,  &
+         &         tab2d_2=vtau_ice   , clinfo2= ' vtau_ice  : ', mask2 = tmask)
 
    END SUBROUTINE ice_prt3D
 

src/ICE/icedyn_rhg_eap.F90

@@ -311,8 +311,12 @@ CONTAINS
          zmV_t(ji,jj)    = zmassV * z1_dtevp
 
          ! Drag ice-atm.
-         ztaux_ai(ji,jj) = zaU(ji,jj) * utau_ice(ji,jj)
-         ztauy_ai(ji,jj) = zaV(ji,jj) * vtau_ice(ji,jj)
+         !     Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines
+         !      and the use of MAX(tmask(i,j),tmask(i+1,j) is to mask tau over ice shelves
+         ztaux_ai(ji,jj) = zaU(ji,jj) * 0.5_wp * ( utau_ice(ji,jj) + utau_ice(ji+1,jj) ) * &
+            &                                    ( 2. - umask(ji,jj,1) ) * MAX( tmask(ji,jj,1), tmask(ji+1,jj,1) )
+         ztauy_ai(ji,jj) = zaV(ji,jj) * 0.5_wp * ( vtau_ice(ji,jj) + vtau_ice(ji,jj+1) ) * &
+            &                                    ( 2. - vmask(ji,jj,1) ) * MAX( tmask(ji,jj,1), tmask(ji,jj+1,1) )
 
          ! Surface pressure gradient (- m*g*GRAD(ssh)) at U-V points
          zspgU(ji,jj)    = - zmassU * grav * ( zsshdyn(ji+1,jj) - zsshdyn(ji,jj) ) * r1_e1u(ji,jj)

src/ICE/icedyn_rhg_evp.F90

@@ -292,8 +292,12 @@ CONTAINS
          zmV_t(ji,jj)    = zmassV * z1_dtevp
 
          ! Drag ice-atm.
-         ztaux_ai(ji,jj) = zaU(ji,jj) * utau_ice(ji,jj)
-         ztauy_ai(ji,jj) = zaV(ji,jj) * vtau_ice(ji,jj)
+         !     Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines
+         !      and the use of MAX(tmask(i,j),tmask(i+1,j) is to mask tau over ice shelves
+         ztaux_ai(ji,jj) = zaU(ji,jj) * 0.5_wp * ( utau_ice(ji,jj) + utau_ice(ji+1,jj) ) * &
+            &                                    ( 2. - umask(ji,jj,1) ) * MAX( tmask(ji,jj,1), tmask(ji+1,jj,1) )
+         ztauy_ai(ji,jj) = zaV(ji,jj) * 0.5_wp * ( vtau_ice(ji,jj) + vtau_ice(ji,jj+1) ) * &
+            &                                    ( 2. - vmask(ji,jj,1) ) * MAX( tmask(ji,jj,1), tmask(ji,jj+1,1) )
 
          ! Surface pressure gradient (- m*g*GRAD(ssh)) at U-V points
          zspgU(ji,jj)    = - zmassU * grav * ( zsshdyn(ji+1,jj) - zsshdyn(ji,jj) ) * r1_e1u(ji,jj)

src/ICE/icedyn_rhg_vp.F90

@@ -332,7 +332,10 @@ CONTAINS
          v_oceU(ji,jj)   = 0.25_wp * ( (v_oce(ji,jj) + v_oce(ji,jj-1)) + (v_oce(ji+1,jj) + v_oce(ji+1,jj-1)) ) * umask(ji,jj,1)
          
          ! Wind stress
-         ztaux_ai(ji,jj) = za_iU(ji,jj) * utau_ice(ji,jj)
+         !     Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines
+         !      and the use of MAX(tmask(i,j),tmask(i+1,j) is to mask tau over ice shelves
+         ztaux_ai(ji,jj) = za_iU(ji,jj) * 0.5_wp * ( utau_ice(ji,jj) + utau_ice(ji+1,jj) ) * &
+            &                                      ( 2. - umask(ji,jj,1) ) * MAX( tmask(ji,jj,1), tmask(ji+1,jj,1) )
          
          ! Force due to sea surface tilt(- m*g*GRAD(ssh))
          zspgU(ji,jj)    = - zmassU * grav * ( zsshdyn(ji+1,jj) - zsshdyn(ji,jj) ) * r1_e1u(ji,jj)
@@ -369,7 +372,10 @@ CONTAINS
          u_oceV(ji,jj)   = 0.25_wp * ( (u_oce(ji,jj) + u_oce(ji-1,jj)) + (u_oce(ji,jj+1) + u_oce(ji-1,jj+1)) ) * vmask(ji,jj,1)
          
          ! Wind stress
-         ztauy_ai(ji,jj) = za_iV(ji,jj) * vtau_ice(ji,jj)
+         !     Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines
+         !      and the use of MAX(tmask(i,j),tmask(i+1,j) is to mask tau over ice shelves
+         ztauy_ai(ji,jj) = za_iV(ji,jj) * 0.5_wp * ( vtau_ice(ji,jj) + vtau_ice(ji,jj+1) ) * &
+            &                                      ( 2. - vmask(ji,jj,1) ) * MAX( tmask(ji,jj,1), tmask(ji,jj+1,1) )
          
          ! Force due to sea surface tilt(- m*g*GRAD(ssh))
          zspgV(ji,jj)    = - zmassV * grav * ( zsshdyn(ji,jj+1) - zsshdyn(ji,jj) ) * r1_e2v(ji,jj)

src/ICE/icesbc.F90

@@ -272,15 +272,13 @@ CONTAINS
             zvel (ji,jj) = 0.5_wp * SQRT( ( u_ice(ji-1,jj  ) + u_ice(ji,jj) ) * ( u_ice(ji-1,jj  ) + u_ice(ji,jj) ) + &
                &                          ( v_ice(ji  ,jj-1) + v_ice(ji,jj) ) * ( v_ice(ji  ,jj-1) + v_ice(ji,jj) ) )
          END_2D
+         CALL lbc_lnk( 'icesbc', zfric, 'T',  1.0_wp, zvel, 'T', 1.0_wp )
       ELSE      !  if no ice dynamics => transfer directly the atmospheric stress to the ocean
-         DO_2D( 0, 0, 0, 0 )
-            zfric(ji,jj) = r1_rho0 * SQRT( 0.5_wp *  &
-               &                         (  utau(ji,jj) * utau(ji,jj) + utau(ji-1,jj) * utau(ji-1,jj)   &
-               &                          + vtau(ji,jj) * vtau(ji,jj) + vtau(ji,jj-1) * vtau(ji,jj-1) ) ) * tmask(ji,jj,1)
-            zvel(ji,jj) = 0._wp
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+            zfric(ji,jj) = r1_rho0 * SQRT( utau(ji,jj)*utau(ji,jj) + vtau(ji,jj)*vtau(ji,jj) ) * tmask(ji,jj,1)
+            zvel (ji,jj) = 0._wp
          END_2D
       ENDIF
-      CALL lbc_lnk( 'icesbc', zfric, 'T',  1.0_wp, zvel, 'T', 1.0_wp )
       !
       !--------------------------------------------------------------------!
       ! Partial computation of forcing for the thermodynamic sea ice model

src/ICE/icethd_do.F90

@@ -372,8 +372,8 @@ CONTAINS
          DO_2D( 0, 0, 0, 0 )
             IF ( qlead(ji,jj) < 0._wp ) THEN ! cooling
                ! -- Wind stress -- !
-               ztaux = ( utau_ice(ji-1,jj  ) * umask(ji-1,jj  ,1) + utau_ice(ji,jj) * umask(ji,jj,1) ) * 0.5_wp
-               ztauy = ( vtau_ice(ji  ,jj-1) * vmask(ji  ,jj-1,1) + vtau_ice(ji,jj) * vmask(ji,jj,1) ) * 0.5_wp
+               ztaux = utau_ice(ji,jj) * tmask(ji,jj,1)
+               ztauy = vtau_ice(ji,jj) * tmask(ji,jj,1)
                ! Square root of wind stress
                ztenagm = SQRT( SQRT( ztaux * ztaux + ztauy * ztauy ) )
 

src/ICE/iceupdate.F90

@@ -314,7 +314,7 @@ CONTAINS
       !!
       !! ** Action  : * at each ice time step (every nn_fsbc time step):
       !!                - compute the modulus of ice-ocean relative velocity
-      !!                  (*rho*Cd) at T-point (C-grid) or I-point (B-grid)
+      !!                  (*rho*Cd) at T-point (C-grid)
       !!                      tmod_io = rhoco * | U_ice-U_oce |
       !!                - update the modulus of stress at ocean surface
       !!                      taum = (1-a) * taum + a * tmod_io * | U_ice-U_oce |
@@ -325,19 +325,19 @@ CONTAINS
       !!
       !!    NB: - ice-ocean rotation angle no more allowed
       !!        - here we make an approximation: taum is only computed every ice time step
-      !!          This avoids mutiple average to pass from T -> U,V grids and next from U,V grids
-      !!          to T grid. taum is used in TKE and GLS, which should not be too sensitive to this approximaton...
+      !!          This avoids mutiple average to pass from U,V grids to T grids
+      !!          taum is used in TKE and GLS, which should not be too sensitive to this approximaton...
       !!
-      !! ** Outputs : - utau, vtau   : surface ocean i- and j-stress (u- & v-pts) updated with ice-ocean fluxes
+      !! ** Outputs : - utau, vtau   : surface ocean i- and j-stress (T-pts) updated with ice-ocean fluxes
       !!              - taum         : modulus of the surface ocean stress (T-point) updated with ice-ocean fluxes
       !!---------------------------------------------------------------------
       INTEGER ,                     INTENT(in) ::   kt               ! ocean time-step index
       REAL(wp), DIMENSION(jpi,jpj), INTENT(in) ::   pu_oce, pv_oce   ! surface ocean currents
       !
       INTEGER  ::   ji, jj   ! dummy loop indices
-      REAL(wp) ::   zat_u, zutau_ice, zu_t, zmodt   ! local scalar
-      REAL(wp) ::   zat_v, zvtau_ice, zv_t, zrhoco  !   -      -
-      REAL(wp) ::   zflagi                          !   -      -
+      REAL(wp) ::   zutau_ice, zu_t, zmodt   ! local scalar
+      REAL(wp) ::   zvtau_ice, zv_t, zrhoco  !   -      -
+      REAL(wp) ::   zflagi                   !   -      -
       !!---------------------------------------------------------------------
       IF( ln_timing )   CALL timing_start('iceupdate')
 
@@ -352,8 +352,8 @@ CONTAINS
       IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN     !==  Ice time-step only  ==!   (i.e. surface module time-step)
          DO_2D( 0, 0, 0, 0 )                          !* update the modulus of stress at ocean surface (T-point)
             !                                               ! 2*(U_ice-U_oce) at T-point
-            zu_t = u_ice(ji,jj) + u_ice(ji-1,jj) - u_oce(ji,jj) - u_oce(ji-1,jj)
-            zv_t = v_ice(ji,jj) + v_ice(ji,jj-1) - v_oce(ji,jj) - v_oce(ji,jj-1)
+            zu_t = u_ice(ji,jj) + u_ice(ji-1,jj) - u_oce(ji,jj) - u_oce(ji-1,jj) ! u_oce = ssu_m
+            zv_t = v_ice(ji,jj) + v_ice(ji,jj-1) - v_oce(ji,jj) - v_oce(ji,jj-1) ! v_oce = ssv_m
             !                                              ! |U_ice-U_oce|^2
             zmodt =  0.25_wp * (  zu_t * zu_t + zv_t * zv_t  )
             !                                               ! update the ocean stress modulus
@@ -377,19 +377,14 @@ CONTAINS
       ENDIF
       !
       DO_2D( 0, 0, 0, 0 )                             !* update the stress WITHOUT an ice-ocean rotation angle
-         ! ice area at u and v-points
-         zat_u  = ( at_i(ji,jj) * tmask(ji,jj,1) + at_i (ji+1,jj    ) * tmask(ji+1,jj  ,1) )  &
-            &     / MAX( 1.0_wp , tmask(ji,jj,1) + tmask(ji+1,jj  ,1) )
-         zat_v  = ( at_i(ji,jj) * tmask(ji,jj,1) + at_i (ji  ,jj+1  ) * tmask(ji  ,jj+1,1) )  &
-            &     / MAX( 1.0_wp , tmask(ji,jj,1) + tmask(ji  ,jj+1,1) )
          !                                                   ! linearized quadratic drag formulation
-         zutau_ice   = 0.5_wp * ( tmod_io(ji,jj) + tmod_io(ji+1,jj) ) * ( u_ice(ji,jj) - pu_oce(ji,jj) )
-         zvtau_ice   = 0.5_wp * ( tmod_io(ji,jj) + tmod_io(ji,jj+1) ) * ( v_ice(ji,jj) - pv_oce(ji,jj) )
+         zutau_ice   = 0.5_wp * tmod_io(ji,jj) * ( u_ice(ji,jj) + u_ice(ji-1,jj) - pu_oce(ji,jj) - pu_oce(ji-1,jj) )
+         zvtau_ice   = 0.5_wp * tmod_io(ji,jj) * ( v_ice(ji,jj) + v_ice(ji,jj-1) - pv_oce(ji,jj) - pv_oce(ji,jj-1) )
          !                                                   ! stresses at the ocean surface
-         utau(ji,jj) = ( 1._wp - zat_u ) * utau_oce(ji,jj) + zat_u * zutau_ice
-         vtau(ji,jj) = ( 1._wp - zat_v ) * vtau_oce(ji,jj) + zat_v * zvtau_ice
+         utau(ji,jj) = ( 1._wp - at_i(ji,jj) ) * utau_oce(ji,jj) + at_i(ji,jj) * zutau_ice
+         vtau(ji,jj) = ( 1._wp - at_i(ji,jj) ) * vtau_oce(ji,jj) + at_i(ji,jj) * zvtau_ice
       END_2D
-      CALL lbc_lnk( 'iceupdate', utau, 'U', -1.0_wp, vtau, 'V', -1.0_wp )   ! lateral boundary condition
+      CALL lbc_lnk( 'iceupdate', utau, 'T', -1.0_wp, vtau, 'T', -1.0_wp )   ! lateral boundary condition
       !
       IF( ln_timing )   CALL timing_stop('iceupdate')
       !