Skip to content

Remove Gecros crop option in Noah-MP #1346

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

Closed
cenlinhe wants to merge 3 commits into from
Closed

Remove Gecros crop option in Noah-MP #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45d1380
Merge pull request #1 from wrf-model/develop
cenlinhe Dec 17, 2020
e1dba18
Remove gecros crop option from Noah-MP; No longer support this crop o…
cenlinhe Dec 23, 2020
d664a7f
Look for checkmark
davegill Dec 27, 2020
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: 0 additions & 2 deletions Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2913,8 +2913,6 @@ 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

package noahmpoptcrop2 opt_crop==2 - state:gecros_state

package noahmosaicscheme sf_surface_mosaic==1 - state:TSK_mosaic,QSFC_mosaic,TSLB_mosaic,SMOIS_mosaic,SH2O_mosaic,CANWAT_mosaic,SNOW_mosaic,SNOWH_mosaic,SNOWC_mosaic,ALBEDO_mosaic,ALBBCK_mosaic,EMISS_mosaic,EMBCK_mosaic,ZNT_mosaic,Z0_mosaic,HFX_mosaic,QFX_mosaic,LH_mosaic,GRDFLX_mosaic,SNOTIME_mosaic,TR_URB2D_mosaic,TB_URB2D_mosaic,TG_URB2D_mosaic,TC_URB2D_mosaic,TS_URB2D_mosaic,TS_RUL2D_mosaic,QC_URB2D_mosaic,UC_URB2D_mosaic,TRL_URB3D_mosaic,TBL_URB3D_mosaic,TGL_URB3D_mosaic,SH_URB2D_mosaic,LH_URB2D_mosaic,G_URB2D_mosaic,RN_URB2D_mosaic,mosaic_cat_index,landusef2,smcrel,RS_mosaic,LAI_mosaic
# IRRIGATION
package channel sf_surf_irr_alloc==1 - state:irrigation,irr_rand_field
Expand Down
4 changes: 1 addition & 3 deletions Registry/Registry.NMM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,8 +1211,6 @@ state real season_gdd ij - 1 - i02rhd=(interp_mask_land
state integer cropcat ij - 1 - rh "cropcat" "dominant crop category" "category"
state integer pgsxy ij - 1 - rh "pgs" "pgs" ""

state real gecros_state i{gecros}j - 1 Z rhd=(interp_mask_land_field:lu_index)u=(UpNear) "gecros" "gecros state array" "-"

# added state for etampnew microphysics (needed for restarts)
state real mp_restart_state p misc 1 - r "MP_RESTART_STATE" "STATE VECTOR FOR MICROPHYSICS RESTARTS"
state real tbpvs_state p misc 1 - r "TBPVS_STATE" "STATE FOR ETAMPNEW MICROPHYSICS"
Expand Down Expand Up @@ -1846,7 +1844,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,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

package clmscheme sf_surface_physics==5 - -
package gfdlslab sf_surface_physics==88 - -
Expand Down
1 change: 0 additions & 1 deletion Registry/registry.dimspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ dimspec lake_intl 2 constant=16 z interface_level
dimspec lake_sll 2 constant=10 z soil_levels_or_lake_levels
dimspec crop 2 constant=5 z crop_types
dimspec soilc 2 constant=8 z soil_composition_layers
dimspec gecros 2 constant=60 z gecros

# Set up the dust erosion dimension irrespective of WRF-Chem, but namelist erosion_dim=3 mandatory when not using WRF-Chem (gthompsn, 2017Jun23)
dimspec . 3 namelist=erosion_dim z dust_erosion_dimension
Expand Down
2 changes: 0 additions & 2 deletions Registry/registry.noahmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,3 @@ state real season_gdd ij - 1 - i012rd=(interp_mask_fiel
state integer cropcat ij - 1 - rh "cropcat" "dominant crop category" "category"
state integer pgsxy ij - 1 - rh "pgs" "pgs" ""

# Gecros crop model only
state real gecros_state i{gecros}j - 1 Z rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "gecros" "gecros state array" "-"
1 change: 0 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 @@ -821,7 +821,6 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,riverbedxy=grid%riverbedxy, eqzwt=grid%eqzwt, pexpxy=grid%pexpxy &
& ,qrfxy=grid%qrfxy, qspringxy=grid%qspringxy, qslatxy=grid%qslatxy, qrfsxy=grid%qrfsxy &
& ,qspringsxy=grid%qspringsxy, smoiseq=grid%smoiseq, wtddt=config_flags%wtddt, stepwtd=grid%stepwtd &
& ,gecros_state=grid%gecros_state & ! Optional gecros crop
! Noah UA changes
& ,ua_phys=config_flags%ua_phys,flx4=grid%flx4,fvb=grid%fvb &
& ,fbur=grid%fbur,fgsn=grid%fgsn &
Expand Down
1 change: 0 additions & 1 deletion dyn_em/start_em.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,6 @@ SUBROUTINE start_domain_em ( grid, allowed_to_read &
grid%GRAINXY, grid%GDDXY, & ! 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
grid%T2MVXY, grid%T2MBXY, grid%CHSTARXY, & ! Optional Noah-MP
grid%SMOISEQ ,grid%SMCWTDXY ,grid%RECHXY, grid%DEEPRECHXY, grid%AREAXY, & ! Optional Noah-MP
Expand Down
1 change: 0 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 @@ -1592,7 +1592,6 @@ SUBROUTINE TURBL(NTSD,DT,NPHS,RESTRT &
& , chv2xy=grid%chv2xy , chb2xy=grid%chb2xy , chstarxy=grid%chstarxy &
& , smoiseq=grid%smoiseq, smcwtdxy=grid%smcwtdxy, rechxy=grid%rechxy &
& , deeprechxy=grid%deeprechxy &
& ,gecros_state=grid%gecros_state & ! Optional gecros crop
& ,coszen=grid%czen,xlat_urb2d=grid%hlat &
& ,rs=rs,xlaidyn=xlaidyn &
! mosaic tiling for Noah
Expand Down
1 change: 0 additions & 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 @@ -2199,7 +2199,6 @@ END SUBROUTINE med_set_egrid_locs
& smoiseq=grid%smoiseq, smcwtdxy=grid%smcwtdxy, rechxy=grid%rechxy, &
& deeprechxy=grid%deeprechxy, &
& iopt_crop=config_flags%opt_crop, &
& gecros_state=grid%gecros_state, & ! Optional gecros crop
& lakedepth2d=grid%lakedepth2d, savedtke12d=grid%savedtke12d, snowdp2d=grid%snowdp2d, h2osno2d=grid%h2osno2d, & !lake
& snl2d= grid%snl2d, t_grnd2d=grid%t_grnd2d, t_lake3d=grid%t_lake3d, lake_icefrac3d=grid%lake_icefrac3d, & !lake
& z_lake3d=grid%z_lake3d, dz_lake3d=grid%dz_lake3d, t_soisno3d=grid%t_soisno3d, h2osoi_ice3d=grid%h2osoi_ice3d, & !lake
Expand Down
2 changes: 0 additions & 2 deletions main/depend.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,14 +463,12 @@ module_sf_noahmpdrv.o: module_sf_noahmplsm.o \
module_data_gocart_dust.o \
module_sf_noahmp_glacier.o \
module_sf_noahmp_groundwater.o \
module_sf_gecros.o \
../share/module_model_constants.o \
module_sf_urban.o module_sf_bep.o module_sf_bep_bem.o

module_sf_noahlsm_glacial_only.o: module_sf_noahlsm.o module_sf_noahmplsm.o

module_sf_noahmplsm.o: ../share/module_model_constants.o \
module_sf_gecros.o \
module_sf_myjsfc.o

module_sf_noahmp_groundwater.o: module_sf_noahmplsm.o
Expand Down
1 change: 0 additions & 1 deletion phys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ MODULES = \
module_sf_noah_seaice_drv.o \
module_sf_noahlsm_glacial_only.o \
module_sf_noahmp_groundwater.o \
module_sf_gecros.o \
module_sf_noahmpdrv.o \
module_sf_noahmplsm.o \
module_sf_noahmp_glacier.o \
Expand Down
8 changes: 1 addition & 7 deletions phys/module_physics_init.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ SUBROUTINE phy_init ( id, config_flags, DT, restart, zfull, zhalf, &
GRAINXY, GDDXY, & ! Optional Noah-MP
croptype, cropcat, & ! Noah-MP Crop model
iopt_crop, &
gecros_state, & ! Optional gecros crop
XSAIXY, LAI, & ! Optional Noah-MP
T2MVXY, T2MBXY, CHSTARXY , & ! Optional Noah-MP
SMOISEQ ,SMCWTDXY ,RECHXY, DEEPRECHXY, AREAXY, & ! Optional Noah-MP
Expand Down Expand Up @@ -540,7 +539,6 @@ SUBROUTINE phy_init ( id, config_flags, DT, restart, zfull, zhalf, &
INTEGER, OPTIONAL, DIMENSION(ims:ime, jms:jme), INTENT(OUT) :: CROPCAT
REAL, OPTIONAL, DIMENSION(ims:ime,5,jms:jme), INTENT(IN ) :: CROPTYPE
INTEGER, INTENT(IN ) :: iopt_crop
REAL, OPTIONAL, DIMENSION(ims:ime,60,jms:jme) :: gecros_state ! Optional gecros crop

! REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), OPTIONAL, INTENT(INOUT ) :: qnn_curr

Expand Down Expand Up @@ -1350,7 +1348,6 @@ SUBROUTINE phy_init ( id, config_flags, DT, restart, zfull, zhalf, &
GRAINXY, GDDXY, & ! Noah-MP Crop model
croptype, cropcat, & ! Noah-MP Crop model
iopt_crop, &
gecros_state, & ! Optional gecros crop
XSAIXY, LAI, &
SMOISEQ, SMCWTDXY, RECHXY, DEEPRECHXY, AREAXY, &
WTDDT, STEPWTD, QRFSXY ,QSPRINGSXY ,QSLATXY, &
Expand Down Expand Up @@ -2357,7 +2354,6 @@ SUBROUTINE bl_init(STEPBL,BLDT,DT,RUBLTEN,RVBLTEN,RTHBLTEN, &
GRAINXY, GDDXY, & ! Noah-MP Crop model
croptype, cropcat, & ! Noah-MP Crop model
iopt_crop, &
gecros_state, & ! Optional gecros crop
XSAIXY, LAI, &
SMOISEQ, SMCWTDXY, RECHXY, DEEPRECHXY, AREAXY, &
WTDDT, STEPWTD,QRFSXY ,QSPRINGSXY ,QSLATXY, &
Expand Down Expand Up @@ -2680,7 +2676,6 @@ SUBROUTINE bl_init(STEPBL,BLDT,DT,RUBLTEN,RVBLTEN,RTHBLTEN, &
INTEGER, OPTIONAL, DIMENSION(ims:ime, jms:jme), INTENT(OUT) :: CROPCAT
REAL, OPTIONAL, DIMENSION(ims:ime,5,jms:jme), INTENT(IN ) :: CROPTYPE
INTEGER , INTENT(IN) :: iopt_crop
REAL, OPTIONAL, DIMENSION(ims:ime,60,jms:jme) :: gecros_state ! Optional gecros crop
INTEGER, OPTIONAL, INTENT(IN) :: ISICE
INTEGER , OPTIONAL, INTENT(OUT) :: STEPWTD
REAL , OPTIONAL, INTENT(IN) :: WTDDT
Expand Down Expand Up @@ -3197,8 +3192,7 @@ SUBROUTINE bl_init(STEPBL,BLDT,DT,RUBLTEN,RVBLTEN,RTHBLTEN, &
,smoiseq ,smcwtdxy ,rechxy ,deeprechxy, areaxy ,dx, dy, msftx, msfty,&
wtddt ,stepwtd ,dt ,qrfsxy ,qspringsxy ,qslatxy, &
fdepthxy ,ht ,riverbedxy ,eqzwt ,rivercondxy ,pexpxy, &
rechclim, &
gecros_state & ! Optional gecros crop
rechclim &
#endif
)

Expand Down
Loading