Merge branch 'concepts/atmo-bdy-layer-diags-fix' into 'concepts/main'…

… (!9)

icepack_atmo: correctly compute Tref, Qref at zlvs

columnphysics/icepack_atmo.F90

@@ -116,7 +116,7 @@ subroutine atmo_boundary_layer (sfctype,            &
          Uref         ! reference height wind speed (m/s)
 
       real (kind=dbl_kind), intent(in), optional :: &
-         zlvs        ! atm level height (scalar quantities) (m)
+         zlvs         ! atm level height (scalar quantities) (m)
 
       ! local variables
 
@@ -358,7 +358,11 @@ subroutine atmo_boundary_layer (sfctype,            &
       ! Compute diagnostics: T, Q (at zTrf), U (at zref)
       !------------------------------------------------------------
 
-      hols  = hols*zTrf/zlvl
+      if (present(zlvs)) then
+         hols  = hols*zTrf/zlvs
+      else
+         hols  = hols*zTrf/zlvl
+      endif
       psix2 = -c5*hols*stable + (c1-stable)*psi_scalar_unstable(hols)
       fac   = (rh/vonkar) &
             * (alzs + al2 - psixh + psix2)