Bring local Noah-MP snowmelt to output & add accumulated snowmelt output

Registry/Registry.EM_COMMON

@@ -3087,7 +3087,7 @@ package   slabscheme     sf_surface_physics==1       -             -
 package   lsmscheme      sf_surface_physics==2       -             state:flx4,fvb,fbur,fgsn,smcrel,xlaidyn
 package   ruclsmscheme   sf_surface_physics==3       -             state:smfr3d,keepfr3dflag,soilt1,rhosnf,snowfallac,precipfr,acrunoff
 package   clmscheme      sf_surface_physics==5       -             state:numc,nump,sabv,sabg,lwup,lhsoi,lhveg,lhtran,snl,snowdp,wtc,wtp,h2osno,t_grnd,t_veg,h2ocan,h2ocan_col,t2m_max,t2m_min,t2clm,t_ref2m,q_ref2m,h2osoi_liq_s1,h2osoi_liq_s2,h2osoi_liq_s3,h2osoi_liq_s4,h2osoi_liq_s5,h2osoi_liq1,h2osoi_liq2,h2osoi_liq3,h2osoi_liq4,h2osoi_liq5,h2osoi_liq6,h2osoi_liq7,h2osoi_liq8,h2osoi_liq9,h2osoi_liq10,h2osoi_ice_s1,h2osoi_ice_s2,h2osoi_ice_s3,h2osoi_ice_s4,h2osoi_ice_s5,h2osoi_ice1,h2osoi_ice2,h2osoi_ice3,h2osoi_ice4,h2osoi_ice5,h2osoi_ice6,h2osoi_ice7,h2osoi_ice8,h2osoi_ice9,h2osoi_ice10,t_soisno_s1,t_soisno_s2,t_soisno_s3,t_soisno_s4,t_soisno_s5,t_soisno1,t_soisno2,t_soisno3,t_soisno4,t_soisno5,t_soisno6,t_soisno7,t_soisno8,t_soisno9,t_soisno10,dzsnow1,dzsnow2,dzsnow3,dzsnow4,dzsnow5,snowrds1,snowrds2,snowrds3,snowrds4,snowrds5,t_lake1,t_lake2,t_lake3,t_lake4,t_lake5,t_lake6,t_lake7,t_lake8,t_lake9,t_lake10,h2osoi_vol1,h2osoi_vol2,h2osoi_vol3,h2osoi_vol4,h2osoi_vol5,h2osoi_vol6,h2osoi_vol7,h2osoi_vol8,h2osoi_vol9,h2osoi_vol10,albedosubgrid,lhsubgrid,hfxsubgrid,lwupsubgrid,q2subgrid,sabvsubgrid,sabgsubgrid,nrasubgrid,swupsubgrid,t_veg24,t_veg240,fsun,fsun24,fsun240,fsd24,fsd240,fsi24,fsi240,laip,pct_pft_input
-package   noahmpscheme   sf_surface_physics==4       -             state:isnowxy,tvxy,tgxy,canliqxy,canicexy,eahxy,tahxy,cmxy,chxy,fwetxy,sneqvoxy,alboldxy,qsnowxy,qrainxy,wslakexy,zwtxy,waxy,wtxy,tsnoxy,zsnsoxy,snicexy,snliqxy,lfmassxy,rtmassxy,stmassxy,woodxy,stblcpxy,fastcpxy,xsaixy,taussxy,t2mvxy,t2mbxy,q2mvxy,q2mbxy,tradxy,neexy,gppxy,nppxy,fvegxy,qinxy,runsfxy,runsbxy,ecanxy,edirxy,etranxy,fsaxy,firaxy,aparxy,psnxy,savxy,sagxy,rssunxy,rsshaxy,bgapxy,wgapxy,tgvxy,tgbxy,chvxy,chbxy,shgxy,shcxy,shbxy,evgxy,evbxy,ghvxy,ghbxy,irgxy,ircxy,irbxy,trxy,evcxy,chleafxy,chucxy,chv2xy,chb2xy,chstarxy,smoiseq,smcwtdxy,rechxy,deeprechxy,fdepthxy,areaxy,rivercondxy,riverbedxy,eqzwt,pexpxy,qrfxy,qrfsxy,qspringxy,qspringsxy,qslatxy,stepwtd,rechclim,gddxy,grainxy,croptype,planting,harvest,season_gdd,cropcat,pgsxy,soilcomp,soilcl1,soilcl2,soilcl3,soilcl4,irfract,sifract,mifract,fifract,irnumsi,irnummi,irnumfi,irwatsi,irwatmi,irwatfi,irsivol,irmivol,irfivol,ireloss,irrsplh,td_fraction,qtdrain,acrech,acqspring,qlatxy,qintsxy,qintrxy,qdripsxy,qdriprxy,qthrosxy,qthrorxy,qsnsubxy,qsnfroxy,qsubcxy,qfrocxy,qevacxy,qdewcxy,qfrzcxy,qmeltcxy,qsnbotxy,pondingxy,pahxy,pahgxy,pahvxy,pahbxy,fpicexy,rainlsm,snowlsm,acints,acintr,acdripr,acthror,acevac,acdewc,forctlsm,forcqlsm,forcplsm,forczlsm,forcwlsm,acrainlsm,acrunsb,acrunsf,acecan,acetran,acedir,acqlat,acqrf,acetlsm,acsnowlsm,acsubc,acfroc,acfrzc,acmeltc,acsnbot,acponding,acsnsub,acsnfro,acrainsnow,acdrips,acthros,acsagb,acirb,acshb,acevb,acghb,acpahb,acsagv,acirg,acshg,acevg,acghv,acpahg,acsav,acirc,acshc,acevc,actr,acpahv,acswdnlsm,acswuplsm,aclwdnlsm,aclwuplsm,acshflsm,aclhflsm,acghflsm,acpahlsm,accanhs,canhsxy,soilenergy,snowenergy,acc_ssoil,acc_qinsur,acc_qseva,acc_etrani,aceflxb,eflxbxy,acc_dwaterxy,acc_prcpxy,acc_ecanxy,acc_etranxy,acc_edirxy
+package   noahmpscheme   sf_surface_physics==4       -             state:isnowxy,tvxy,tgxy,canliqxy,canicexy,eahxy,tahxy,cmxy,chxy,fwetxy,sneqvoxy,alboldxy,qsnowxy,qrainxy,wslakexy,zwtxy,waxy,wtxy,tsnoxy,zsnsoxy,snicexy,snliqxy,lfmassxy,rtmassxy,stmassxy,woodxy,stblcpxy,fastcpxy,xsaixy,taussxy,t2mvxy,t2mbxy,q2mvxy,q2mbxy,tradxy,neexy,gppxy,nppxy,fvegxy,qinxy,runsfxy,runsbxy,ecanxy,edirxy,etranxy,fsaxy,firaxy,aparxy,psnxy,savxy,sagxy,rssunxy,rsshaxy,bgapxy,wgapxy,tgvxy,tgbxy,chvxy,chbxy,shgxy,shcxy,shbxy,evgxy,evbxy,ghvxy,ghbxy,irgxy,ircxy,irbxy,trxy,evcxy,chleafxy,chucxy,chv2xy,chb2xy,chstarxy,smoiseq,smcwtdxy,rechxy,deeprechxy,fdepthxy,areaxy,rivercondxy,riverbedxy,eqzwt,pexpxy,qrfxy,qrfsxy,qspringxy,qspringsxy,qslatxy,stepwtd,rechclim,gddxy,grainxy,croptype,planting,harvest,season_gdd,cropcat,pgsxy,soilcomp,soilcl1,soilcl2,soilcl3,soilcl4,irfract,sifract,mifract,fifract,irnumsi,irnummi,irnumfi,irwatsi,irwatmi,irwatfi,irsivol,irmivol,irfivol,ireloss,irrsplh,td_fraction,qtdrain,acrech,acqspring,qlatxy,qintsxy,qintrxy,qdripsxy,qdriprxy,qthrosxy,qthrorxy,qsnsubxy,qsnfroxy,qsubcxy,qfrocxy,qevacxy,qdewcxy,qfrzcxy,qmeltcxy,qsnbotxy,pondingxy,pahxy,pahgxy,pahvxy,pahbxy,fpicexy,rainlsm,snowlsm,acints,acintr,acdripr,acthror,acevac,acdewc,forctlsm,forcqlsm,forcplsm,forczlsm,forcwlsm,acrainlsm,acrunsb,acrunsf,acecan,acetran,acedir,acqlat,acqrf,acetlsm,acsnowlsm,acsubc,acfroc,acfrzc,acmeltc,acsnbot,acponding,acsnsub,acsnfro,acrainsnow,acdrips,acthros,acsagb,acirb,acshb,acevb,acghb,acpahb,acsagv,acirg,acshg,acevg,acghv,acpahg,acsav,acirc,acshc,acevc,actr,acpahv,acswdnlsm,acswuplsm,aclwdnlsm,aclwuplsm,acshflsm,aclhflsm,acghflsm,acpahlsm,accanhs,canhsxy,soilenergy,snowenergy,acc_ssoil,acc_qinsur,acc_qseva,acc_etrani,aceflxb,eflxbxy,acc_dwaterxy,acc_prcpxy,acc_ecanxy,acc_etranxy,acc_edirxy,qmeltxy,acsnmelt
 package   ctsmscheme     sf_surface_physics==6       -             - 
 package   pxlsmscheme    sf_surface_physics==7       -             state:t2_ndg_new,q2_ndg_new,t2_ndg_old,q2_ndg_old,t2obs,q2obs,vegf_px,imperv,canfra,lai_px,wwlt_px,wfc_px,wsat_px,clay_px,csand_px,fmsand_px
 package   ssibscheme     sf_surface_physics==8       -             state:ssib_fm,ssib_fh,ssib_cm,ssibxdd,ssib_br,ssib_lhf,ssib_shf,ssib_ghf,ssib_egs,ssib_eci,ssib_ect,ssib_egi,ssib_egt,ssib_sdn,ssib_sup,ssib_ldn,ssib_lup,ssib_wat,ssib_shc,ssib_shg,ssib_lai,ssib_vcf,ssib_z00,ssib_veg,isnow,swe,snowden,snowdepth,tkair,dzo1,wo1,tssn1,tssno1,bwo1,bto1,cto1,fio1,flo1,bio1,blo1,ho1,dzo2,wo2,tssn2,tssno2,bwo2,bto2,cto2,fio2,flo2,bio2,blo2,ho2,dzo3,wo3,tssn3,tssno3,bwo3,bto3,cto3,fio3,flo3,bio3,blo3,ho3,dzo4,wo4,tssn4,tssno4,bwo4,bto4,cto4,fio4,flo4,bio4,blo4,ho4

Registry/registry.noahmp

@@ -109,7 +109,8 @@ state    real   qevacxy    ij      -       1      -     i02d=(interp_mask_land_f
 state    real   qdewcxy    ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "qdewc"      "canopy dew rate"                       "mm/s"
 state    real   qfrzcxy    ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "qfrzc"      "canopy liquid freeze rate"             "mm/s"
 state    real   qmeltcxy   ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "qmeltc"     "canopy snow melt rate"                 "mm/s"
-state    real   qsnbotxy   ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "qsnbot"     "snow melt out of pack bottom"          "mm/s"
+state    real   qsnbotxy   ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "qsnbot"     "total liquid water (melt + rain through pack) out of snowpack bottom"   "mm/s"
+state    real   qmeltxy    ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "qmelt"      "snow melt rate due to phase change"    "mm/s"
 state    real   pondingxy  ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "ponding"    "surface ponding from complete pack melt"  "mm"
 state    real   pahxy      ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "pah"        "precipitation advected energy"         "W/m2"
 state    real   pahgxy     ij      -       1      -     i02d=(interp_mask_land_field:lu_index)u=(copy_fcnm)     "pahg"       "precipitation advected energy - to below canopy" "W/m2"
@@ -159,7 +160,8 @@ state    real   acfrzc     ij      -       1      -     rhd=(interp_mask_land_fi
 state    real   acmeltc    ij      -       1      -     rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm)       "acmeltc"    "Accumulated canopy snow melt"           "mm"
 
 # Needed for snowpack water budget
-state    real   acsnbot    ij      -       1      -     rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm)       "acsnbot"    "Accumulated snow melt out of pack bottom"           "mm"
+state    real   acsnbot    ij      -       1      -     rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm)       "acsnbot"    "Accumulated total liquid water (melt + rain through pack) out of snowpack bottom"  "mm"
+state    real   acsnmelt   ij      -       1      -     rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm)       "acsnmelt"   "Accumulated snowmelt due to phase change"     "mm"
 state    real   acponding  ij      -       1      -     rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm)       "acponding"  "Accumulated surface ponding from complete pack melt"          "mm"
 state    real   acsnsub    ij      -       1      -     rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm)       "acsnsub"    "Accumulated snow pack sublimation"           "mm"
 state    real   acsnfro    ij      -       1      -     rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm)       "acsnfro"    "Accumulated snow pack frost"           "mm"

dyn_em/module_first_rk_step_part1.F

@@ -966,7 +966,7 @@ SUBROUTINE first_rk_step_part1 (   grid , config_flags              &
      &        ,    qfrocxy=grid%qfrocxy    ,   qfrzcxy=grid%qfrzcxy   ,   qmeltcxy=grid%qmeltcxy   &
      &        ,   qsnbotxy=grid%qsnbotxy   , pondingxy=grid%pondingxy ,      PAHXY=grid%PAHXY      &
      &        ,     PAHGXY=grid%PAHGXY     ,    PAHVXY=grid%PAHVXY    ,     PAHBXY=grid%PAHBXY     &
-     &        ,    FPICEXY=grid%FPICEXY    ,   qevacxy=grid%qevacxy                                &
+     &        ,    qmeltxy=grid%qmeltxy    ,   FPICEXY=grid%FPICEXY   ,   qevacxy=grid%qevacxy     &
      &        ,    qdewcxy=grid%qdewcxy    ,   RAINLSM=grid%RAINLSM   ,    SNOWLSM=grid%SNOWLSM    &
      &        ,   forctlsm=grid%forctlsm   ,  forcqlsm=grid%forcqlsm  ,   forcplsm=grid%forcplsm   &
      &        ,   forczlsm=grid%forczlsm   ,  forcwlsm=grid%forcwlsm                               &

phys/module_diag_misc.F

@@ -645,7 +645,7 @@ subroutine noahmp_output_calc(  ims,ime, jms,jme
       acshb    ,acevb    ,acghb    ,acpahb   ,acsav     ,acirc   ,acshc    ,acevc    ,&
       actr     ,acpahv   ,acswdnlsm,acswuplsm,                                        &
       aclwdnlsm,aclwuplsm,acshflsm ,aclhflsm ,acghflsm  ,acpahlsm,acints   ,acintr   ,&
-      acdrips  ,acdripr  ,acthros  ,acthror  ,acetlsm   ,&
+      acdrips  ,acdripr  ,acthros  ,acthror  ,acetlsm   ,acsnmelt,                    &
       acsnsub  ,acsnfro  ,acsubc   ,acfroc   ,acevac    ,acdewc  ,acfrzc   ,acmeltc  ,&
       acsnbot  ,acponding,acrainlsm,acsnowlsm,acrainsnow,acrunsb ,acrunsf  ,isnow    ,&
       acqlat   ,acqrf  ,acrech ,acqspring ,acecan ,acetran ,acedir ,aceflxb ,accanhs ,&
@@ -655,7 +655,8 @@ subroutine noahmp_output_calc(  ims,ime, jms,jme
       glw      ,trad     ,qints    ,qintr    ,qdrips    ,qdripr  ,qthros   ,qthror   ,&
       qsnsub   ,qsnfro   ,qsubc    ,qfroc    ,qevac     ,qdewc   ,qfrzc    ,qmeltc   ,&
       qsnbot   ,ponding  ,rainlsm  ,snowlsm  ,runsb     ,runsf   ,fpice    ,fveg     ,&
-      qlat     ,qrf      ,deeprech ,qspring  ,ecan      ,etran   ,edir  ,eflxb,  canhs )
+      qlat     ,qrf      ,deeprech ,qspring  ,ecan      ,etran   ,edir     ,eflxb    ,&
+      canhs    ,qmelt    )
 
 !----------------------------------------------------------------------
 
@@ -676,7 +677,7 @@ subroutine noahmp_output_calc(  ims,ime, jms,jme
       acshb    ,acevb    ,acghb    ,acpahb   ,acsav     ,acirc   ,acshc    ,acevc    ,&
       actr     ,acpahv   ,acswdnlsm,acswuplsm,                                        &
       aclwdnlsm,aclwuplsm,acshflsm ,aclhflsm ,acghflsm  ,acpahlsm,acints   ,acintr   ,&
-      acdrips   ,acdripr ,acthros  ,acthror  ,acetlsm   ,&
+      acdrips   ,acdripr ,acthros  ,acthror  ,acetlsm   ,acsnmelt,                    &
       acsnsub  ,acsnfro  ,acsubc   ,acfroc   ,acevac    ,acdewc  ,acfrzc   ,acmeltc  ,&
       acsnbot  ,acponding,acrainlsm,acsnowlsm,acrainsnow,acrunsb ,acrunsf  ,          &
       acqlat   ,acqrf    ,acrech   ,acqspring,acecan    ,acetran ,acedir   ,aceflxb  ,&
@@ -690,7 +691,7 @@ subroutine noahmp_output_calc(  ims,ime, jms,jme
       qsnsub   ,qsnfro   ,qsubc    ,qfroc    ,qevac     ,qdewc   ,qfrzc    ,qmeltc   ,&
       qsnbot   ,ponding  ,rainlsm  ,snowlsm  ,runsb     ,runsf   ,fpice    ,fveg     ,&
       qlat     ,qrf      ,deeprech ,qspring  ,ecan      ,etran   ,edir     ,eflxb    ,&
-      canhs
+      canhs    ,qmelt
 
    integer, dimension( ims:ime, jms:jme ), optional, intent(in) ::   isnow
 
@@ -751,6 +752,7 @@ subroutine noahmp_output_calc(  ims,ime, jms,jme
             acfrzc(i,j)     = 0.
             acmeltc(i,j)    = 0.
             acsnbot(i,j)    = 0.
+            acsnmelt(i,j)   = 0.
             acrunsf(i,j)    = 0.
             acrunsb(i,j)    = 0.
             acecan(i,j)     = 0.
@@ -812,6 +814,7 @@ subroutine noahmp_output_calc(  ims,ime, jms,jme
          acfrzc(i,j)     = acfrzc(i,j)     +  dt *   qfrzc(i,j)
          acmeltc(i,j)    = acmeltc(i,j)    +  dt *  qmeltc(i,j)
          acsnbot(i,j)    = acsnbot(i,j)    +  dt *  qsnbot(i,j)
+         acsnmelt(i,j)   = acsnmelt(i,j)   +  dt *   qmelt(i,j)
          acrunsf(i,j)    = acrunsf(i,j)    +  runsf(i,j)  ! multiplied by dt_soil in WATER
          acrunsb(i,j)    = acrunsb(i,j)    +  runsb(i,j)  ! multiplied by dt_soil in WATER
          acecan(i,j)     = acecan(i,j)     +  dt *    ecan(i,j)

phys/module_diagnostics_driver.F

@@ -1149,6 +1149,7 @@ SUBROUTINE diagnostics_driver ( grid, config_flags,                  &
            acfrzc=grid%acfrzc    ,   qfrzc=grid%qfrzcxy                   ,&
           acmeltc=grid%acmeltc   ,  qmeltc=grid%qmeltcxy                  ,&
           acsnbot=grid%acsnbot   ,  qsnbot=grid%qsnbotxy                  ,&
+         acsnmelt=grid%acsnmelt  ,   qmelt=grid%qmeltxy                   ,&
         acponding=grid%acponding , ponding=grid%pondingxy                 ,&
         acrainlsm=grid%acrainlsm , rainlsm=grid%rainlsm                   ,&
         acsnowlsm=grid%acsnowlsm , snowlsm=grid%snowlsm                   ,&

phys/module_surface_driver.F

@@ -67,7 +67,7 @@ SUBROUTINE surface_driver(                                         &
      &          ,qintsxy   ,qintrxy   ,qdripsxy ,qdriprxy  ,qthrosxy  ,qthrorxy     &
      &          ,qsnsubxy  ,qsnfroxy  ,qsubcxy  ,qfrocxy   ,qevacxy   ,qdewcxy      &
      &          ,qfrzcxy   ,qmeltcxy  ,qsnbotxy ,pondingxy ,PAHXY     ,PAHGXY       &
-     &          ,PAHVXY    ,PAHBXY                                                  &
+     &          ,PAHVXY    ,PAHBXY    ,qmeltxy                                      &
      &          ,fpicexy   ,RAINLSM   ,SNOWLSM  ,forctlsm  ,forcqlsm  ,forcplsm     &
      &          ,forczlsm  ,forcwlsm  ,acc_ssoil,acc_qinsur,acc_qseva ,acc_etrani   &
      &          ,eflxbxy   ,soilenergy,snowenergy, canhsxy                          &
@@ -904,7 +904,7 @@ SUBROUTINE surface_driver(                                         &
                qdriprxy  ,qthrosxy  ,qthrorxy   ,&
                qsnsubxy  ,qsnfroxy  ,qsubcxy    ,&
                qfrocxy   ,qevacxy   ,qdewcxy,qfrzcxy   ,qmeltcxy   ,&
-               qsnbotxy  ,pondingxy, PAHXY      ,PAHGXY, PAHVXY, PAHBXY,&
+               qsnbotxy  ,qmeltxy   ,pondingxy, PAHXY      ,PAHGXY, PAHVXY, PAHBXY,&
                fpicexy,RAINLSM,SNOWLSM,forctlsm,forcqlsm,forcplsm,forczlsm,forcwlsm,canhsxy
    INTEGER,    OPTIONAL, DIMENSION(ims:ime , jms:jme), INTENT(IN) :: CROPCAT
    REAL,    OPTIONAL, DIMENSION(ims:ime , jms:jme), INTENT(IN) :: PLANTING
@@ -3154,7 +3154,7 @@ SUBROUTINE surface_driver(                                         &
                qdriprxy  ,qthrosxy  ,qthrorxy   ,&
                qsnsubxy  ,qsnfroxy  ,qsubcxy    ,&
                qfrocxy   ,qevacxy   ,qdewcxy    ,qfrzcxy   ,qmeltcxy   ,&
-               qsnbotxy  ,pondingxy ,PAHXY      ,PAHGXY, PAHVXY, PAHBXY,&
+               qsnbotxy  ,qmeltxy   ,pondingxy ,PAHXY      ,PAHGXY, PAHVXY, PAHBXY,&
                fpicexy,RAINLSM,SNOWLSM,forctlsm,forcqlsm,forcplsm,forczlsm,forcwlsm,&
                acc_ssoil, acc_qinsur, acc_qseva, acc_etrani, eflxbxy, soilenergy, snowenergy, canhsxy,&
                ACC_DWATERXY, ACC_PRCPXY, ACC_ECANXY, ACC_ETRANXY, ACC_EDIRXY, &