Merge branch 'emc/develop' into feature/updcice

cicecore/cicedynB/general/ice_flux.F90

@@ -121,7 +121,8 @@ module ice_flux
        ! in from atmosphere (if calc_Tsfc)
 
       real (kind=dbl_kind), dimension (:,:,:), allocatable, public :: &
-         zlvl    , & ! atm level height (m)
+         zlvl    , & ! atm level height (momentum) (m)
+         zlvs    , & ! atm level height (scalar quantities) (m)
          uatm    , & ! wind velocity components (m/s)
          vatm    , &
          wind    , & ! wind speed (m/s)
@@ -391,7 +392,8 @@ subroutine alloc_flux
          iceumask   (nx_block,ny_block,max_blocks), & ! ice extent mask (U-cell)
          fm         (nx_block,ny_block,max_blocks), & ! Coriolis param. * mass in U-cell (kg/s)
          Tbu        (nx_block,ny_block,max_blocks), & ! factor for seabed stress (landfast ice)
-         zlvl       (nx_block,ny_block,max_blocks), & ! atm level height (m)
+         zlvl       (nx_block,ny_block,max_blocks), & ! atm level height (momentum) (m)
+         zlvs       (nx_block,ny_block,max_blocks), & ! atm level height (scalar quantities) (m)
          uatm       (nx_block,ny_block,max_blocks), & ! wind velocity components (m/s)
          vatm       (nx_block,ny_block,max_blocks), &
          wind       (nx_block,ny_block,max_blocks), & ! wind speed (m/s)
@@ -570,7 +572,8 @@ subroutine init_coupler_flux
       !-----------------------------------------------------------------
       ! fluxes received from atmosphere
       !-----------------------------------------------------------------
-      zlvl  (:,:,:) = c10             ! atm level height (m)
+      zlvl  (:,:,:) = c10             ! atm level height (momentum) (m)
+      zlvs  (:,:,:) = c10             ! atm level height (scalar quantities) (m)
       rhoa  (:,:,:) = 1.3_dbl_kind    ! air density (kg/m^3)
       uatm  (:,:,:) = c5              ! wind velocity    (m/s)
       vatm  (:,:,:) = c5

cicecore/cicedynB/general/ice_step_mod.F90

@@ -171,7 +171,7 @@ subroutine step_therm1 (dt, iblk)
       use ice_domain_size, only: ncat, nilyr, nslyr, n_iso, n_aero
       use ice_flux, only: frzmlt, sst, Tf, strocnxT, strocnyT, rside, fbot, Tbot, Tsnice, &
           meltsn, melttn, meltbn, congeln, snoicen, uatm, vatm, fside, &
-          wind, rhoa, potT, Qa, zlvl, strax, stray, flatn, fsensn, fsurfn, fcondtopn, &
+          wind, rhoa, potT, Qa, zlvl, zlvs, strax, stray, flatn, fsensn, fsurfn, fcondtopn, &
           flw, fsnow, fpond, sss, mlt_onset, frz_onset, fcondbotn, fcondbot, &
           frain, Tair, strairxT, strairyT, fsurf, fcondtop, fsens, &
           flat, fswabs, flwout, evap, evaps, evapi, Tref, Qref, Uref, fresh, fsalt, fhocn, &
@@ -358,6 +358,7 @@ subroutine step_therm1 (dt, iblk)
                       vatm         = vatm        (i,j,  iblk), &
                       wind         = wind        (i,j,  iblk), &
                       zlvl         = zlvl        (i,j,  iblk), &
+                      zlvs         = zlvs        (i,j,  iblk), &
                       Qa           = Qa          (i,j,  iblk), &
                       Qa_iso       = Qa_iso      (i,j,:,iblk), &
                       rhoa         = rhoa        (i,j,  iblk), &

doc/source/cice_index.rst

@@ -691,7 +691,8 @@ either Celsius or Kelvin units).
    "yieldstress11(12, 22)", "yield stress tensor components", ""
    "year_init", ":math:`\bullet` the initial year", ""
    "**Z**", "", ""
-   "zlvl", "atmospheric level height", "m"
+   "zlvl", "atmospheric level height (momentum)", "m"
+   "zlvs", "atmospheric level height (scalars)", "m"
    "zref", "reference height for stability", "10. m"
    "zTrf", "reference height for :math:`T_{ref}`, :math:`Q_{ref}`, :math:`U_{ref}`", "2. m"
    "zvir", "gas constant (water vapor)/gas constant (air) - 1", "0.606"