Skip to content

Adding variables from Noah, NoahMP and surface layer to history file #399

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
weiwangncar merged 11 commits into from
Mar 20, 2018
Merged

Adding variables from Noah, NoahMP and surface layer to history file #399

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4019af3
Add epa changes for CMAQ app. More output from history
weiwangncar Mar 7, 2018
869e671
address Michaels comments
weiwangncar Mar 8, 2018
a43351f
clean up based on review
weiwangncar Mar 8, 2018
f913d96
removing CMAQ specific comments, clean up code in noahmpdrv
weiwangncar Mar 8, 2018
dfc0531
fix compile for NMM
weiwangncar Mar 10, 2018
df950c3
package xlaidyn array with Noah and remove more comments
weiwangncar Mar 10, 2018
a940f59
removing RS, RA, LANDUSEF, XLAIDYN and mosaic variables from default …
weiwangncar Mar 13, 2018
6186c2f
add sf_surface_mosaic to global attribute in history file
weiwangncar Mar 13, 2018
6de610a
still need to package two new variables
weiwangncar Mar 13, 2018
699dc6a
make xlaidyn local var, and add missing rs to the call
weiwangncar Mar 17, 2018
16a3055
clean up to remove CMAQ ref
weiwangncar Mar 17, 2018
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
29 changes: 17 additions & 12 deletions Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ state real shdmin ij misc 1 - i012rhd=(inte
state real snoalb ij misc 1 - i012rh "SNOALB" "ANNUAL MAX SNOW ALBEDO IN FRACTION" ""
state real slopecat ij misc 1 - i12 "SLOPECAT" "SLOPE CATEGORY" ""
state real toposoil ij misc 1 - i12 "SOILHGT" "ELEVATION OF LSM DATA" "m"
state real landusef iuj misc 1 Z i012rdu "LANDUSEF" "LANDUSE FRACTION BY CATEGORY" ""
state real landusef iuj misc 1 Z i012rhdu "LANDUSEF" "LANDUSE FRACTION BY CATEGORY" ""
state real soilctop isj misc 1 Z i012rdu "SOILCTOP" "SOIL CAT FRACTION (TOP)" ""
state real soilcbot isj misc 1 Z i012rdu "SOILCBOT" "SOIL CAT FRACTION (BOTTOM)" ""
state real soilcat ij misc 1 - i12 "SOILCAT" "SOIL CAT DOMINANT TYPE" ""
Expand Down Expand Up @@ -763,6 +763,7 @@ state integer IFNDSOILW - misc 1 - i "F
state integer IFNDALBSI - misc 1 - ir "FNDALBSI" "ALBSI_LOGICAL"
state integer IFNDSNOWSI - misc 1 - ir "FNDSNOWSI" "SNOWSI_LOGICAL"
state integer IFNDICEDEPTH - misc 1 - ir "FNDICEDEPTH" "ICEDEPTH_LOGICAL"
state real XLAIDYN ij misc 1 - h "XLAIDYN" "Noah Dynamic LEAF AREA INDEX" "m-2/m-2"
# SKIN SST
state real SSTSK ij misc 1 - rhd=(interp_mask_field:lu_index,iswater)u=(copy_fcnm) "SSTSK" "SKIN SEA SURFACE TEMPERATURE" "K"
state real lake_depth ij misc 1 - i012rd=(interp_mask_water_field:lu_index,islake) "lake_depth" "lake depth" "m"
Expand Down Expand Up @@ -883,9 +884,9 @@ state real ALSWNIRDIR ij misc 1 Z r "A
state real ALSWNIRDIF ij misc 1 Z r "ALSWNIRDIF" "ALB NIR DIF component" ""


# Additional for P-X PBL and LSM
state real RA ij misc 1 - r "RA" "AERODYNAMIC RESISTANCE" "s m-1"
state real RS ij misc 1 - r "RS" "SURFACE RESISTANCE" "s m-1"
# Additional for P-X PBL and LSM; RS (RC) and RA also for Noah LSM WRF-CMAQ PCC
state real RA ij misc 1 - rh "RA" "AERODYNAMIC RESISTANCE" "s m-1"
state real RS ij misc 1 - rh "RS" "SURFACE RESISTANCE" "s m-1"
state real LAI ij misc 1 - i0124rh "LAI" "LEAF AREA INDEX" "m-2/m-2"
state real VEGF_PX ij misc 1 - rh "VEGF_PX" "Vegetation Fraction for PX LSM" "area/area"
state real T2OBS ij misc 1 - r "T2OBS" "2-m temperature from analysis " "K"
Expand All @@ -899,6 +900,7 @@ i1 real PSIH ij misc 1 - - "PSIH
state real FM ij misc 1 - - "FM" "INTEGRATED FUNCTION FOR MOMENTUM" ""
state real FH ij misc 1 - - "FH" "INTEGRATED FUNCTION FOR HEAT" ""
i1 real WSPD ij misc 1 - - "WSPD" "Wind speed" "m s-1"
state real WSPDSFC ij misc 1 - - "WSPDSFC" "Wind speed at 10 m " "m s-1"
i1 real GZ1OZ0 ij misc 1 - - "GZ1OZ0" "LOG OF Z1 over Z0" ""
state real BR ij misc 1 - - "BR" "Bulk Richardson" ""
state real ZOL ij misc 1 - - "ZOL" "z/L" ""
Expand Down Expand Up @@ -1545,10 +1547,10 @@ state real fgsn ij - 1 - - "F

# For Noah-Mosaic danli

state real TSK_mosaic i{mocat}j misc 1 - i02rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "TSK_mosaic" "vegetation temperature" "K"
state real TSK_mosaic i{mocat}j misc 1 - i02rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "TSK_mosaic" "vegetation temperature" "K"
state real QSFC_mosaic i{mocat}j misc 1 - i02rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "QSFC_mosaic" "SPECIFIC HUMIDITY AT LOWER BOUNDARY" ""
state real TSLB_mosaic i{mocat2}j misc 1 Z i02rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "TSLB_mosaic" "SOIL TEMPERATURE" "K"
state real SMOIS_mosaic i{mocat2}j misc 1 Z i02rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "SMOIS_mosaic" "SOIL MOISTURE" "m3 m-3"
state real TSLB_mosaic i{mocat2}j misc 1 Z i02rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "TSLB_mosaic" "SOIL TEMPERATURE" "K"
state real SMOIS_mosaic i{mocat2}j misc 1 Z i02rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "SMOIS_mosaic" "SOIL MOISTURE" "m3 m-3"
state real SH2O_mosaic i{mocat2}j misc 1 Z i02rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "SH2O_mosaic" "SOIL LIQUID WATER" "m3 m-3"
state real CANWAT_mosaic i{mocat}j misc 1 - i012rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "CANWAT_mosaic" "CANOPY WATER" "kg m-2"
state real SNOW_mosaic i{mocat}j misc 1 - i012rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "SNOW_mosaic" "SNOW WATER EQUIVALENT" "kg m-2"
Expand All @@ -1559,8 +1561,11 @@ state real ALBEDO_mosaic i{mocat}j misc 1 - r
state real ALBBCK_mosaic i{mocat}j misc 1 - r "ALBBCK_mosaic" "background albedo" ""
state real EMISS_mosaic i{mocat}j misc 1 - r "EMISS_mosaic" "emissivity" ""
state real EMBCK_mosaic i{mocat}j misc 1 - r "EMBCK_mosaic" "background emissivity" ""
state real ZNT_mosaic i{mocat}j misc 1 - r "ZNT_mosaic" "time_varying roughness length" "m"
state real Z0_mosaic i{mocat}j misc 1 - r "Z0_mosaic" "background roughness length" "m"
state real ZNT_mosaic i{mocat}j misc 1 - rh "ZNT_mosaic" "time_varying roughness length" "m"
state real Z0_mosaic i{mocat}j misc 1 - rh "Z0_mosaic" "background roughness length" "m"

state real LAI_mosaic i{mocat}j misc 1 - rh "LAI_mosaic" "LEAF AREA INDEX" "m-2/m-2"
state real RS_mosaic i{mocat}j misc 1 - rh "RS_mosaic" "CANOPY RESISTANCE" "s m-1"

state real HFX_mosaic i{mocat}j misc 1 - r "HFX_mosaic" "UPWARD HEAT FLUX AT THE SURFACE" "W m-2"
state real QFX_mosaic i{mocat}j misc 1 - r "QFX_mosaic" "UPWARD MOISTURE FLUX AT THE SURFACE" "kg m-2 s-1"
Expand All @@ -1584,8 +1589,8 @@ state real LH_URB2D_mosaic i{mocat}j misc 1 - r
state real G_URB2D_mosaic i{mocat}j misc 1 - r "G_URB2D_mosaic" "GROUND HEAT FLUX AT THE SURFACE" "W m-2"
state real RN_URB2D_mosaic i{mocat}j misc 1 - r "RN_URB2D_mosaic" "NET RADIATION" "W m-2"

state integer mosaic_cat_index iuj misc 1 Z i012rd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "mosaic_cat_index" " " ""
state real landusef2 iuj misc 1 Z i012rdu "LANDUSEF2" "sorted landuse fraction" ""
state integer mosaic_cat_index iuj misc 1 Z i012rhd=(interp_mask_land_field:lu_index)u=(copy_fcnm) "mosaic_cat_index" " " ""
state real landusef2 iuj misc 1 Z i012rhdu "LANDUSEF2" "sorted landuse fraction" ""

# State vector for etampnew microphysics. Must be declared state because it is not read-once and is needed for restarting.
state real mp_restart_state p misc 1 - r "MP_RESTART_STATE" "STATE VECTOR FOR MICROPHYSICS RESTARTS"
Expand Down Expand Up @@ -2647,7 +2652,7 @@ package clmscheme sf_surface_physics==5 - state:numc,nu
package pxlsmscheme sf_surface_physics==7 - state:t2_ndg_new,q2_ndg_new,t2_ndg_old,q2_ndg_old,vegf_px,imperv,canfra
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 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
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,landusef,RS_mosaic,LAI_mosaic

package ysuscheme bl_pbl_physics==1 - -
package myjpblscheme bl_pbl_physics==2 - state:tke_pbl,el_pbl
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -812,6 +812,7 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,ZNT_mosaic=grid%ZNT_mosaic, Z0_mosaic=grid%Z0_mosaic & !danli mosaic
& ,HFX_mosaic=grid%HFX_mosaic,QFX_mosaic=grid%QFX_mosaic, LH_mosaic=grid%LH_mosaic &
& ,GRDFLX_mosaic=grid%GRDFLX_mosaic,SNOTIME_mosaic=grid%SNOTIME_mosaic & !danli mosaic
& ,RS_mosaic=grid%RS_mosaic,LAI_mosaic=grid%LAI_mosaic & !WRF-CMAQ PCC/JOB
& ,TR_URB2D_mosaic=grid%TR_URB2D_mosaic,TB_URB2D_mosaic=grid%TB_URB2D_mosaic & !danli mosaic
& ,TG_URB2D_mosaic=grid%TG_URB2D_mosaic,TC_URB2D_mosaic=grid%TC_URB2D_mosaic & !danli mosaic
& ,QC_URB2D_mosaic=grid%QC_URB2D_mosaic,UC_URB2D_mosaic=grid%UC_URB2D_mosaic & !danli mosaic
Expand All @@ -824,6 +825,7 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,ZOL=grid%ZOL &
& ,SDA_HFX=grid%SDA_HFX, SDA_QFX=grid%SDA_QFX,HFX_BOTH=grid%HFX_BOTH & !fasdas
& ,QFX_BOTH=grid%QFX_BOTH,QNORM=grid%QNORM,fasdas=config_flags%fasdas & !fasdas
& ,XLAIDYN=grid%XLAIDYN,WSPDSFC=grid%WSPDSFC & !WRF-CMAQ PCC
& ,spp_lsm=config_flags%spp_lsm,pattern_spp_lsm=grid%pattern_spp_lsm & !SPP
& ,field_sf=grid%field_sf & !SPP
& ,spp_pbl=config_flags%spp_pbl,pattern_spp_pbl=grid%pattern_spp_pbl & !SPP
Expand Down
Loading