-
Notifications
You must be signed in to change notification settings - Fork 249
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature/lndp noahmp2 : add land perturbation scheme for Noah-MP fract…
…ional veg (#1143) Updates to allow land perturbation scheme to be applied for Noah-MP. Currently, for Noah-MP model parameters can perturb only vegetation fraction. Main code changes: -added lsm_noahmp model option to lndp_type==2 land perturbation scheme (fv3-atm, stochastic_physics) -updated comments -cleaned up the namelists to make the different options clearer. Removed misleading lndp_each_step variable from gfs_physics_nml, and replaced it with "lndp_model_type" in the nam_sfcperts namelist for the different forecast types (cycling DA, short forecasts, perturbing only initial conditions) (fv3-atm, stochastic_physics, ufs-weather-model) NOTE: see note below, re: specification of smc perturbation for RAP/HRRR/etc (lndp_model_type==2) -revised code in stochastic_physics_wrapper to only allocate arrays that will be used when passed into lndp_apply_perts (fv3-atm) -deleted unused albedo arrays in stochastic_physics_wrapper and lndp_apply_perts (fv3-atm, stochastic_physics) -fixed bug causing precision errors when calculating the soil moisture ice content (often ~0.0; stochastic_physics) -fixed bug in which lndp_apply_perts wasn't called for nscyc = 0. (fv3-atm) -increased max_nvar_lndp at Jeff Ator's request (fv3-atm) -added a new test for the Noah-MP and lndp==2 combination (ufs-weather-model)
- Loading branch information
1 parent
5abaed5
commit 9bf10ca
Showing
24 changed files
with
6,483 additions
and
6,155 deletions.
There are no files selected for viewing
Submodule FV3
updated
3 files
+11 −16 | ccpp/data/GFS_typedefs.F90 | |
+3 −13 | ccpp/driver/GFS_diagnostics.F90 | |
+138 −106 | stochastic_physics/stochastic_physics_wrapper.F90 |
Submodule stochastic_physics
updated
from 2b1240 to 523284
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,145 @@ | ||
############################################################################### | ||
# | ||
# Global control test GFSv16 atmosphere only at C96L127, P8 configuration | ||
# | ||
############################################################################### | ||
|
||
export TEST_DESCR="Compare global control results with previous trunk version" | ||
|
||
export CNTL_DIR=control_p8_lndp | ||
|
||
export LIST_FILES="sfcf000.nc \ | ||
sfcf021.nc \ | ||
sfcf024.nc \ | ||
sfcf048.nc \ | ||
atmf000.nc \ | ||
atmf021.nc \ | ||
atmf024.nc \ | ||
atmf048.nc \ | ||
GFSFLX.GrbF00 \ | ||
GFSFLX.GrbF21 \ | ||
GFSFLX.GrbF24 \ | ||
GFSFLX.GrbF48 \ | ||
GFSPRS.GrbF00 \ | ||
GFSPRS.GrbF21 \ | ||
GFSPRS.GrbF24 \ | ||
GFSPRS.GrbF48" | ||
|
||
export_fv3 | ||
export NPZ=127 | ||
export NPZP=128 | ||
export DT_ATMOS=720 | ||
export SYEAR=2021 | ||
export SMONTH=03 | ||
export SDAY=22 | ||
export SHOUR=06 | ||
export RESTART_INTERVAL="12 -1" | ||
export OUTPUT_GRID='gaussian_grid' | ||
export WRITE_DOPOST=.true. | ||
export FHMAX=48 | ||
export OUTPUT_FH='0 21 24 48' | ||
|
||
# P7 default | ||
export IALB=2 | ||
export IEMS=2 | ||
export LSM=2 | ||
export IOPT_DVEG=4 | ||
export IOPT_CRS=2 | ||
export IOPT_RAD=3 | ||
export IOPT_ALB=1 | ||
export IOPT_STC=3 | ||
# P8 | ||
export IOPT_SFC=3 | ||
|
||
# FV3 P7 settings | ||
export D2_BG_K1=0.20 | ||
export D2_BG_K2=0.04 | ||
export PSM_BC=1 | ||
# P8 | ||
export DDDMP=0.1 | ||
|
||
# P7 Merra2 Aerosols & NSST | ||
export USE_MERRA2=.true. | ||
export IAER=1011 | ||
export NSTF_NAME=2,1,0,0,0 | ||
|
||
export LHEATSTRG=.true. | ||
export LSEASPRAY=.true. | ||
|
||
# P7 UGWP1 | ||
export GWD_OPT=2 | ||
export DO_UGWP_V1=.false. | ||
export KNOB_UGWP_VERSION=0 | ||
export KNOB_UGWP_NSLOPE=1 | ||
export DO_UGWP_V0=.true. | ||
export DO_GSL_DRAG_LS_BL=.false. | ||
export DO_GSL_DRAG_SS=.true. | ||
export DO_GSL_DRAG_TOFD=.true. | ||
export DO_UGWP_V1_OROG_ONLY=.false. | ||
export DO_UGWP_V0_NST_ONLY=.false. | ||
export LDIAG_UGWP=.false. | ||
|
||
# P7 CA | ||
export DO_CA=.true. | ||
export CA_SGS=.true. | ||
export CA_GLOBAL=.false. | ||
export NCA=1 | ||
export NCELLS=5 | ||
export NLIVES=12 | ||
export NTHRESH=18 | ||
export NSEED=1 | ||
export NFRACSEED=0.5 | ||
export CA_TRIGGER=.true. | ||
export NSPINUP=1 | ||
export ISEED_CA=12345 | ||
|
||
# P7 settings | ||
export TILEDFIX=.true. | ||
export FNALBC="'C96.snowfree_albedo.tileX.nc'" | ||
export FNALBC2="'C96.facsf.tileX.nc'" | ||
export FNTG3C="'C96.substrate_temperature.tileX.nc'" | ||
export FNVEGC="'C96.vegetation_greenness.tileX.nc'" | ||
export FNVETC="'C96.vegetation_type.tileX.nc'" | ||
export FNSOTC="'C96.soil_type.tileX.nc'" | ||
export FNSMCC=${FNSMCC_control} | ||
export FNMSKH=${FNMSKH_control} | ||
export FNVMNC="'C96.vegetation_greenness.tileX.nc'" | ||
export FNVMXC="'C96.vegetation_greenness.tileX.nc'" | ||
export FNSLPC="'C96.slope_type.tileX.nc'" | ||
export FNABSC="'C96.maximum_snow_albedo.tileX.nc'" | ||
export LANDICE=".false." | ||
export FSICL=0 | ||
export FSICS=0 | ||
|
||
export IMP_PHYSICS=8 | ||
export LGFDLMPRAD=.false. | ||
export DO_SAT_ADJ=.false. | ||
export DNATS=2 | ||
export DZ_MIN=6 | ||
|
||
#required for NML.IN sharing | ||
export MIN_SEAICE=0.15 | ||
export FRAC_GRID=.true. | ||
export MOM6_RESTART_SETTING=n | ||
# P8 (not used for standalone) | ||
export USE_CICE_ALB=.false. | ||
|
||
export WRITE_NSFLIP=.true. | ||
|
||
export FV3_RUN=control_run.IN | ||
export CCPP_SUITE=FV3_GFS_v17_p8 | ||
export FIELD_TABLE=field_table_thompson_noaero_tke | ||
export DIAG_TABLE=diag_table_gfsv16_merra2 | ||
# use same namelist for standalone,coupled P7 | ||
export INPUT_NML=cpld_control.nml.IN | ||
export LNDP_TYPE=2 | ||
export N_VAR_LNDP=1 | ||
export LNDP_VAR_LIST="'vgf'," | ||
export LNDP_PRT_LIST='0.05,' | ||
export LNDP_MODEL_TYPE=1 | ||
|
||
# RRTMGP | ||
export DO_RRTMGP=.true. | ||
export DOGP_CLDOPTICS_LUT=.true. | ||
export DOGP_LWSCAT=.true. | ||
export DOGP_SGS_CNV=.true. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters