Are sublimation and phase-change heat flux from snowmelt included in latent heat flux?

[dmocko]

I am trying to determine if the energy of sublimation and energy of the phase-change heat flux from snowmelt are included in the latent heat flux in Noah-MP.

Here is the Noah-MP-5.0 energy balance calculation:
https://github.com/NCAR/noahmp/blob/master/src/BalanceErrorCheckMod.F90#L231-L233

Sublimation (in water terms) is calculated by:

The energy of the phase-change heat flux from snowmelt is calculated by:

Are the energy from these two terms included in the "HeatLatentGrd" term? Or maybe also in "HeatLatentCanopy", if there is snowpack on the canopy?

One minor point, looking through the documentation I noticed that the "H_L,grd" term is repeated twice in the equation at the bottom of Page 240 in the v5 Technical documentation. I believe that one of these terms should be "H_S,grd".