Skip to content

Add Noah-MP output variable QRAINXY #1405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davegill merged 4 commits into from
Feb 23, 2021
Merged

Add Noah-MP output variable QRAINXY #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45d1380
Merge pull request #1 from wrf-model/develop
cenlinhe Dec 17, 2020
fc4fea0
Add additional QRAINXY (rainfall on the ground after canopy intercept…
cenlinhe Feb 15, 2021
fcad757
NoahMP QRAIN semi line up 9:55 AM
davegill Feb 17, 2021
b4d4806
srf -> surface test 13th 11:02 AM
davegill Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2907,7 +2907,7 @@ package nolsmscheme sf_surface_physics==0 - -
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 noahmpscheme sf_surface_physics==4 - state:isnowxy,tvxy,tgxy,canliqxy,canicexy,eahxy,tahxy,cmxy,chxy,fwetxy,sneqvoxy,alboldxy,qsnowxy,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
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
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,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
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
Expand Down
3 changes: 2 additions & 1 deletion Registry/Registry.NMM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,7 @@ state real fwetxy ij - 1 - i02rhd=(interp_mask_land
state real sneqvoxy ij - 1 - i02rhd=(interp_mask_land_field:lu_index)u=(UpNear) "sneqvo" "snow mass at last time step" "mm"
state real alboldxy ij - 1 - i02rhd=(interp_mask_land_field:lu_index)u=(UpNear) "albold" "snow albedo at last timestep" "-"
state real qsnowxy ij - 1 - i02rhd=(interp_mask_land_field:lu_index)u=(UpNear) "qsnowxy" "snowfall on the ground" "mm/s"
state real qrainxy ij - 1 - i02rhd=(interp_mask_land_field:lu_index)u=(UpNear) "qrainxy" "rainfall on the ground" "mm/s"
state real wslakexy ij - 1 - i02rhd=(interp_mask_land_field:lu_index)u=(UpNear) "wslake" "lake water storage" "mm"
state real zwtxy ij - 1 - i02rhd=(interp_mask_land_field:lu_index)u=(UpNear) "zwt" "water table depth" "m"
state real waxy ij - 1 - i02rhd=(interp_mask_land_field:lu_index)u=(UpNear) "wa" "water in the acquifer" "mm"
Expand Down Expand Up @@ -1846,7 +1847,7 @@ package slabscheme sf_surface_physics==1 - -
package lsmscheme sf_surface_physics==2 - state:flx4,fvb,fbur,fgsn
package ruclsmscheme sf_surface_physics==3 - state:ACRUNOFF

package noahmpscheme sf_surface_physics==4 - state:isnowxy,tvxy,tgxy,canliqxy,canicexy,eahxy,tahxy,cmxy,chxy,fwetxy,sneqvoxy,alboldxy,qsnowxy,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,gddxy,grainxy,croptype,planting,harvest,season_gdd,cropcat,pgsxy,soilcomp,soilcl1,soilcl2,soilcl3,soilcl4,gecros_state
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,gddxy,grainxy,croptype,planting,harvest,season_gdd,cropcat,pgsxy,soilcomp,soilcl1,soilcl2,soilcl3,soilcl4,gecros_state

package clmscheme sf_surface_physics==5 - -
package gfdlslab sf_surface_physics==88 - -
Expand Down
1 change: 1 addition & 0 deletions Registry/registry.noahmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ state real fwetxy ij - 1 - i02rhd=(interp_mask_fiel
state real sneqvoxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "sneqvo" "snow mass at last time step" "mm"
state real alboldxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "albold" "snow albedo at last timestep" "-"
state real qsnowxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "qsnowxy" "snowfall on the ground" "mm/s"
state real qrainxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "qrainxy" "rainfall on the ground" "mm/s"
state real wslakexy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "wslake" "lake water storage" "mm"
state real zwtxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "zwt" "water table depth" "m"
state real waxy ij - 1 - i02rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "wa" "water in the acquifer" "mm"
Expand Down
3 changes: 2 additions & 1 deletion dyn_em/module_first_rk_step_part1.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,8 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,canicexy=grid%canicexy ,canliqxy=grid%canliqxy, eahxy=grid%eahxy &
& , tahxy=grid%tahxy , cmxy=grid%cmxy , chxy=grid%chxy &
& , fwetxy=grid%fwetxy ,sneqvoxy=grid%sneqvoxy,alboldxy=grid%alboldxy &
& , qsnowxy=grid%qsnowxy ,wslakexy=grid%wslakexy, zwtxy=grid%zwtxy &
& , qsnowxy=grid%qsnowxy ,qrainxy=grid%qrainxy ,wslakexy=grid%wslakexy &
& , zwtxy=grid%zwtxy &
& , waxy=grid%waxy , wtxy=grid%wtxy , tsnoxy=grid%tsnoxy &
& , zsnsoxy=grid%zsnsoxy , snicexy=grid%snicexy , snliqxy=grid%snliqxy &
& ,lfmassxy=grid%lfmassxy ,rtmassxy=grid%rtmassxy,stmassxy=grid%stmassxy &
Expand Down
6 changes: 4 additions & 2 deletions dyn_em/start_em.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,10 +1102,12 @@ SUBROUTINE start_domain_em ( grid, allowed_to_read &
grid%SNICEXY, grid%SNLIQXY, grid%TVXY, grid%TGXY, grid%CANICEXY, & ! Optional Noah-MP
grid%CANLIQXY, grid%EAHXY, grid%TAHXY, grid%CMXY, & ! Optional Noah-MP
grid%CHXY, grid%FWETXY, grid%SNEQVOXY, grid%ALBOLDXY, grid%QSNOWXY, & ! Optional Noah-MP
grid%WSLAKEXY, grid%ZWTXY, grid%WAXY, grid%WTXY, grid%LFMASSXY, grid%RTMASSXY, & ! Optional Noah-MP
grid%QRAINXY, & ! Optional Noah-MP
grid%WSLAKEXY, grid%ZWTXY, grid%WAXY, grid%WTXY, grid%LFMASSXY, & ! Optional Noah-MP
grid%RTMASSXY, & ! Optional Noah-MP
grid%STMASSXY, grid%WOODXY, grid%STBLCPXY, grid%FASTCPXY, & ! Optional Noah-MP
grid%GRAINXY, grid%GDDXY, & ! Optional Noah-MP
grid%CROPTYPE, grid%CROPCAT, & ! Optional Noah-MP
grid%CROPTYPE, grid%CROPCAT, & ! Optional Noah-MP
config_flags%opt_crop, &
grid%gecros_state, & ! Optional gecros crop
grid%XSAIXY,grid%LAI, & ! Optional Noah-MP
Expand Down
3 changes: 2 additions & 1 deletion dyn_nmm/module_PHYSICS_CALLS.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,8 @@ SUBROUTINE TURBL(NTSD,DT,NPHS,RESTRT &
& ,canicexy=grid%canicexy ,canliqxy=grid%canliqxy, eahxy=grid%eahxy &
& , tahxy=grid%tahxy , cmxy=grid%cmxy , chxy=grid%chxy &
& , fwetxy=grid%fwetxy ,sneqvoxy=grid%sneqvoxy,alboldxy=grid%alboldxy &
& , qsnowxy=grid%qsnowxy ,wslakexy=grid%wslakexy, zwtxy=grid%zwtxy &
& , qsnowxy=grid%qsnowxy ,qrainxy=grid%qrainxy ,wslakexy=grid%wslakexy &
& , zwtxy=grid%zwtxy &
& , waxy=grid%waxy , wtxy=grid%wtxy , tsnoxy=grid%tsnoxy &
& , zsnsoxy=grid%zsnsoxy , snicexy=grid%snicexy , snliqxy=grid%snliqxy &
& ,lfmassxy=grid%lfmassxy ,rtmassxy=grid%rtmassxy,stmassxy=grid%stmassxy &
Expand Down
2 changes: 1 addition & 1 deletion dyn_nmm/start_domain_nmm.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,7 +2187,7 @@ END SUBROUTINE med_set_egrid_locs
& CANLIQXY=grid%CANLIQXY, EAHXY=grid%EAHXY, & ! Optional Noah-MP
& TAHXY=grid%TAHXY, CMXY=grid%CMXY, & ! Optional Noah-MP
& CHXY=grid%CHXY, FWETXY=grid%FWETXY, SNEQVOXY=grid%SNEQVOXY, & ! Optional Noah-MP
& ALBOLDXY=grid%ALBOLDXY, QSNOWXY=grid%QSNOWXY, & ! Optional Noah-MP
& ALBOLDXY=grid%ALBOLDXY, QSNOWXY=grid%QSNOWXY, QRAINXY=grid%QRAINXY,& ! Optional Noah-MP
& WSLAKEXY=grid%WSLAKEXY, ZWTXY=grid%ZWTXY, WAXY=grid%WAXY, & ! Optional Noah-MP
& WTXY=grid%WTXY, LFMASSXY=grid%LFMASSXY, RTMASSXY=grid%RTMASSXY, & ! Optional Noah-MP
& STMASSXY=grid%STMASSXY, WOODXY=grid%WOODXY, & ! Optional Noah-MP
Expand Down
10 changes: 6 additions & 4 deletions phys/module_physics_init.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ SUBROUTINE phy_init ( id, config_flags, DT, restart, zfull, zhalf, &
ISNOWXY, ZSNSOXY, TSNOXY, & ! Optional Noah-MP
SNICEXY, SNLIQXY, TVXY, TGXY, CANICEXY, & ! Optional Noah-MP
CANLIQXY, EAHXY, TAHXY, CMXY, & ! Optional Noah-MP
CHXY, FWETXY, SNEQVOXY, ALBOLDXY, QSNOWXY, & ! Optional Noah-MP
CHXY, FWETXY, SNEQVOXY, ALBOLDXY,QSNOWXY,QRAINXY,& ! Optional Noah-MP
WSLAKEXY, ZWTXY, WAXY, WTXY, LFMASSXY, RTMASSXY, & ! Optional Noah-MP
STMASSXY, WOODXY, STBLCPXY, FASTCPXY, & ! Optional Noah-MP
GRAINXY, GDDXY, & ! Optional Noah-MP
Expand Down Expand Up @@ -506,6 +506,7 @@ SUBROUTINE phy_init ( id, config_flags, DT, restart, zfull, zhalf, &
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: SNEQVOXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: ALBOLDXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: QSNOWXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: QRAINXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: WSLAKEXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: ZWTXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: WAXY
Expand Down Expand Up @@ -1344,7 +1345,7 @@ SUBROUTINE phy_init ( id, config_flags, DT, restart, zfull, zhalf, &
ISNOWXY, ZSNSOXY, TSNOXY, &
SNICEXY, SNLIQXY, TVXY, TGXY, CANICEXY, &
CANLIQXY, EAHXY, TAHXY, CMXY, &
CHXY, FWETXY, SNEQVOXY, ALBOLDXY, QSNOWXY, &
CHXY, FWETXY, SNEQVOXY,ALBOLDXY,QSNOWXY,QRAINXY,&
WSLAKEXY, ZWTXY, WAXY, WTXY, LFMASSXY, RTMASSXY,&
STMASSXY, WOODXY, STBLCPXY, FASTCPXY, &
GRAINXY, GDDXY, & ! Noah-MP Crop model
Expand Down Expand Up @@ -2351,7 +2352,7 @@ SUBROUTINE bl_init(STEPBL,BLDT,DT,RUBLTEN,RVBLTEN,RTHBLTEN, &
ISNOWXY, ZSNSOXY, TSNOXY, &
SNICEXY, SNLIQXY, TVXY, TGXY, CANICEXY, &
CANLIQXY, EAHXY, TAHXY, CMXY, &
CHXY, FWETXY, SNEQVOXY, ALBOLDXY, QSNOWXY, &
CHXY, FWETXY, SNEQVOXY,ALBOLDXY,QSNOWXY,QRAINXY,&
WSLAKEXY, ZWTXY, WAXY, WTXY, LFMASSXY, RTMASSXY,&
STMASSXY, WOODXY, STBLCPXY, FASTCPXY, &
GRAINXY, GDDXY, & ! Noah-MP Crop model
Expand Down Expand Up @@ -2646,6 +2647,7 @@ SUBROUTINE bl_init(STEPBL,BLDT,DT,RUBLTEN,RVBLTEN,RTHBLTEN, &
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: SNEQVOXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: ALBOLDXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: QSNOWXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: QRAINXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: WSLAKEXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: ZWTXY
REAL, OPTIONAL, DIMENSION(ims:ime,jms:jme) :: WAXY
Expand Down Expand Up @@ -3181,7 +3183,7 @@ SUBROUTINE bl_init(STEPBL,BLDT,DT,RUBLTEN,RVBLTEN,RTHBLTEN, &
TSLB,SMOIS,SH2O,DZS, FNDSOILW, FNDSNOWH, &
TSK,isnowxy ,tvxy ,tgxy ,canicexy ,TMN,XICE, &
canliqxy ,eahxy ,tahxy ,cmxy ,chxy , &
fwetxy ,sneqvoxy ,alboldxy ,qsnowxy ,wslakexy ,zwtxy ,waxy , &
fwetxy ,sneqvoxy ,alboldxy ,qsnowxy ,qrainxy, wslakexy, zwtxy, waxy,&
wtxy ,tsnoxy ,zsnsoxy ,snicexy ,snliqxy ,lfmassxy ,rtmassxy , &
stmassxy ,woodxy ,stblcpxy ,fastcpxy ,xsaixy ,lai , &
grainxy ,gddxy , &
Expand Down
Loading