update from cice main

cicecore/cicedynB/dynamics/ice_dyn_eap.F90

@@ -326,11 +326,18 @@ subroutine eap (dt)
          do j = 1, ny_block
          do i = 1, nx_block
             if (icetmask(i,j,iblk)==0) then
+               if (tmask(i,j,iblk)) then
             ! structure tensor
-               a11_1(i,j,iblk) = p5
-               a11_2(i,j,iblk) = p5
-               a11_3(i,j,iblk) = p5
-               a11_4(i,j,iblk) = p5
+                  a11_1(i,j,iblk) = p5
+                  a11_2(i,j,iblk) = p5
+                  a11_3(i,j,iblk) = p5
+                  a11_4(i,j,iblk) = p5
+                else
+                  a11_1(i,j,iblk) = c0
+                  a11_2(i,j,iblk) = c0
+                  a11_3(i,j,iblk) = c0
+                  a11_4(i,j,iblk) = c0
+               endif
                a12_1(i,j,iblk) = c0
                a12_2(i,j,iblk) = c0
                a12_3(i,j,iblk) = c0

cicecore/cicedynB/general/ice_init.F90

@@ -448,7 +448,7 @@ subroutine input_data
       albsnowv  = 0.98_dbl_kind   ! cold snow albedo, visible
       albsnowi  = 0.70_dbl_kind   ! cold snow albedo, near IR
       ahmax     = 0.3_dbl_kind    ! thickness above which ice albedo is constant (m)
-      atmbndy   = 'default'       ! or 'constant'
+      atmbndy   = 'similarity'    ! Atm boundary layer: 'similarity', 'constant' or 'mixed'
       default_season  = 'winter'  ! default forcing data, if data is not read in
       fyear_init = 1900           ! first year of forcing cycle
       ycycle = 1                  ! number of years in forcing cycle
@@ -1214,6 +1214,14 @@ subroutine input_data
          endif
       endif
 
+      if (trim(atmbndy) == 'default') then
+         if (my_task == master_task) then
+            write(nu_diag,*) subname//' WARNING: atmbndy = default is deprecated'
+            write(nu_diag,*) subname//' WARNING:   setting atmbndy = similarity'
+         endif
+         atmbndy = 'similarity'
+      endif
+
       if (formdrag) then
          if (trim(atmbndy) == 'constant') then
             if (my_task == master_task) write(nu_diag,*) subname//' ERROR: formdrag=T and atmbndy=constant'
@@ -1641,13 +1649,18 @@ subroutine input_data
          write(nu_diag,1010) ' rotate_wind      = ', rotate_wind,' : rotate wind/stress to computational grid'
          write(nu_diag,1010) ' formdrag         = ', formdrag,' : use form drag parameterization'
          write(nu_diag,1000) ' iceruf           = ', iceruf, ' : ice surface roughness at atmosphere interface (m)'
-         if (trim(atmbndy) == 'default') then
-            tmpstr2 = ' : stability-based boundary layer'
+         if (trim(atmbndy) == 'constant') then
+            tmpstr2 = ' : constant-based boundary layer'
+         elseif (trim(atmbndy) == 'similarity' .or. &
+                 trim(atmbndy) == 'mixed') then
             write(nu_diag,1010) ' highfreq         = ', highfreq,' : high-frequency atmospheric coupling'
             write(nu_diag,1020) ' natmiter         = ', natmiter,' : number of atmo boundary layer iterations'
             write(nu_diag,1002) ' atmiter_conv     = ', atmiter_conv,' : convergence criterion for ustar'
-         elseif (trim(atmbndy) == 'constant') then
-            tmpstr2 = ' : boundary layer uses bulk transfer coefficients'
+            if (trim(atmbndy) == 'similarity') then
+               tmpstr2 = ' : stability-based boundary layer'
+            else
+               tmpstr2 = ' : stability-based boundary layer for wind stress, constant-based for sensible+latent heat fluxes'
+            endif
          else
             tmpstr2 = ' : unknown value'
          endif

configuration/scripts/ice_in

@@ -223,7 +223,7 @@
 
 &forcing_nml
     formdrag        = .false.
-    atmbndy         = 'default'
+    atmbndy         = 'similarity'
     rotate_wind     = .true.
     calc_strair     = .true.
     calc_Tsfc       = .true.

configuration/scripts/options/set_nml.atmbndyconstant

@@ -0,0 +1 @@
+atmbndy = 'constant'

configuration/scripts/options/set_nml.atmbndymixed

@@ -0,0 +1 @@
+atmbndy = 'mixed'

configuration/scripts/tests/base_suite.ts

@@ -72,3 +72,5 @@ restart        gx3     8x2        gx3ncarbulk,debug
 restart        gx3     4x4        gx3ncarbulk,diag1
 restart        gx1    24x1        gx1coreii,short
 smoke          gx3     4x1        calcdragio
+restart        gx3     4x2        atmbndyconstant
+restart        gx3     4x2        atmbndymixed

doc/source/cice_index.rst

@@ -65,7 +65,7 @@ either Celsius or Kelvin units).
    "atm_data_dir", "directory for atmospheric forcing data", ""
    "atm_data_format", "format of atmospheric forcing files", ""
    "atm_data_type", "type of atmospheric forcing", ""
-   "atmbndy", "atmo boundary layer parameterization (‘default’ or ‘constant’)", ""
+   "atmbndy", "atmo boundary layer parameterization ('similarity', ‘constant’, or 'mixed')", ""
    "avail_hist_fields", "type for history field data", ""
    "awtidf", "weighting factor for near-ir, diffuse albedo", "0.36218"
    "awtidr", "weighting factor for near-ir, direct albedo", "0.00182"

doc/source/user_guide/ug_case_settings.rst

@@ -528,8 +528,10 @@ forcing_nml
    :widths: 15, 15, 30, 15 
 
    "", "", "", ""
-   "``atmbndy``", "``constant``", "bulk transfer coefficients", "``default``"
-   "", "``default``", "stability-based boundary layer", ""
+   "``atmbndy``", "string", "bulk transfer coefficients", "``similarity``"
+   "", "``similarity``", "stability-based boundary layer", ""
+   "", "``constant``", "constant-based boundary layer", ""
+   "", "``mixed``", "stability-based boundary layer for wind stress, constant-based for sensible+latent heat fluxes", ""
    "``atmiter_conv``", "real", "convergence criteria for ustar", "0.0"
    "``atm_data_dir``", "string", "path to atmospheric forcing data directory", ""
    "``atm_data_format``", "``bin``", "read direct access binary atmo forcing file format", "``bin``"