Skip to content
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

Update global_control.nml.IN based on GW specs #8

Merged
merged 3 commits into from
Dec 12, 2024
Merged

Update global_control.nml.IN based on GW specs #8

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
b6dd358
Initial changes to nml
dpsarmie Nov 26, 2024
9676c2c
Merge branch 'ufs-community:develop' into feature/global_nml_edits_GW
dpsarmie Dec 4, 2024
ab5d860
Fix control_c48_lnd_iau with default_vars changes
dpsarmie Dec 4, 2024
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
11 changes: 1 addition & 10 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,19 +890,10 @@ export MAX_OUTPUT_FIELDS=310
export UPDATE_FULL_OMEGA=.false.

# Stochastic physics
export HIDE_LAND_PERT=' '
export HIDE_NEST='!'
export HIDE_SPPT='!'
export HIDE_SKEB='!'
export HIDE_SHUM='!'
export HIDE_OCNSPPT='!'
export HIDE_EPBL='!'
export HIDE_IAU='!'

export LCNORM=.false.
export PERT_MP=.false.
export PERT_RADTEND=.false.
export PERT_CLDS=.true.
export PERT_CLDS=.false.

export STOCHINI=.false.
export DO_SPPT=.false.
Expand Down
86 changes: 43 additions & 43 deletions tests/parm/global_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,15 @@
ca_trigger = @[CA_TRIGGER]
nspinup = @[NSPINUP]
iseed_ca = @[ISEED_CA]
@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE]
@[HIDE_LAND_PERT] n_var_lndp = @[N_VAR_LNDP]
@[HIDE_NEST] lcnorm = @[LCNORM]
@[HIDE_SPPT] pert_mp = @[PERT_MP]
@[HIDE_SPPT] pert_radtend = @[PERT_RADTEND]
@[HIDE_SPPT] pert_clds = @[PERT_CLDS]
@[HIDE_IAU] iau_inc_files= @[IAU_INC_FILES]
@[HIDE_IAU] iau_drymassfixer = .false.
@[HIDE_IAU] iau_filter_increments = @[IAU_FILTER_INCREMENTS]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lcnorm = @[LCNORM]
pert_mp = @[PERT_MP]
pert_radtend = @[PERT_RADTEND]
pert_clds = @[PERT_CLDS]
iau_inc_files= @[IAU_INC_FILES]
iau_drymassfixer = .false.
iau_filter_increments = @[IAU_FILTER_INCREMENTS]
/

&cires_ugwp_nml
Expand Down Expand Up @@ -391,43 +391,43 @@
/

&nam_stochy
@[HIDE_SKEB] skeb = @[SKEB]
@[HIDE_SKEB] iseed_skeb = @[ISEED_SKEB]
@[HIDE_SKEB] skeb_tau = @[SKEB_TAU]
@[HIDE_SKEB] skeb_lscale = @[SKEB_LSCALE]
@[HIDE_SKEB] skebnorm = @[SKEBNORM]
@[HIDE_SKEB] skeb_npass = @[SKEB_NPASS]
@[HIDE_SKEB] skeb_vdof = @[SKEB_VDOF]
@[HIDE_SHUM] shum = @[SHUM]
@[HIDE_SHUM] iseed_shum = @[ISEED_SHUM]
@[HIDE_SHUM] shum_tau = @[SHUM_TAU]
@[HIDE_SHUM] shum_lscale = @[SHUM_LSCALE]
@[HIDE_SPPT] sppt = @[SPPT]
@[HIDE_SPPT] iseed_sppt = @[ISEED_SPPT]
@[HIDE_SPPT] sppt_tau = @[SPPT_TAU]
@[HIDE_SPPT] sppt_lscale = @[SPPT_LSCALE]
@[HIDE_SPPT] sppt_logit = @[SPPT_LOGIT]
@[HIDE_SPPT] sppt_sfclimit = @[SPPT_SFCLIMIT]
@[HIDE_SPPT] use_zmtnblck = @[USE_ZMTNBLCK]
@[HIDE_SPPT] pbl_taper = @[PBL_TAPER]
@[HIDE_OCNSPPT] OCNSPPT = @[OCNSPPT]
@[HIDE_OCNSPPT] OCNSPPT_LSCALE = @[OCNSPPT_LSCALE]
@[HIDE_OCNSPPT] OCNSPPT_TAU = @[OCNSPPT_TAU]
@[HIDE_OCNSPPT] ISEED_OCNSPPT =@[ISEED_OCNSPPT]
@[HIDE_EPBL] EPBL = @[EPBL]
@[HIDE_EPBL] EPBL_LSCALE = @[EPBL_LSCALE]
@[HIDE_EPBL] EPBL_TAU = @[EPBL_TAU]
@[HIDE_EPBL] ISEED_EPBL = @[ISEED_EPBL]
skeb = @[SKEB]
iseed_skeb = @[ISEED_SKEB]
skeb_tau = @[SKEB_TAU]
skeb_lscale = @[SKEB_LSCALE]
skebnorm = @[SKEBNORM]
skeb_npass = @[SKEB_NPASS]
skeb_vdof = @[SKEB_VDOF]
shum = @[SHUM]
iseed_shum = @[ISEED_SHUM]
shum_tau = @[SHUM_TAU]
shum_lscale = @[SHUM_LSCALE]
sppt = @[SPPT]
iseed_sppt = @[ISEED_SPPT]
sppt_tau = @[SPPT_TAU]
sppt_lscale = @[SPPT_LSCALE]
sppt_logit = @[SPPT_LOGIT]
sppt_sfclimit = @[SPPT_SFCLIMIT]
use_zmtnblck = @[USE_ZMTNBLCK]
pbl_taper = @[PBL_TAPER]
OCNSPPT = @[OCNSPPT]
OCNSPPT_LSCALE = @[OCNSPPT_LSCALE]
OCNSPPT_TAU = @[OCNSPPT_TAU]
ISEED_OCNSPPT =@[ISEED_OCNSPPT]
EPBL = @[EPBL]
EPBL_LSCALE = @[EPBL_LSCALE]
EPBL_TAU = @[EPBL_TAU]
ISEED_EPBL = @[ISEED_EPBL]
/

&nam_sfcperts
@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE]
@[HIDE_LAND_PERT] lndp_model_type = @[LNDP_MODEL_TYPE]
@[HIDE_LAND_PERT] LNDP_TAU=@[LNDP_TAU]
@[HIDE_LAND_PERT] LNDP_LSCALE=@[LNDP_LSCALE]
@[HIDE_LAND_PERT] ISEED_LNDP=@[ISEED_LNDP]
@[HIDE_LAND_PERT] lndp_var_list = @[LNDP_VAR_LIST]
@[HIDE_LAND_PERT] lndp_prt_list = @[LNDP_PRT_LIST]
lndp_type = @[LNDP_TYPE]
lndp_model_type = @[LNDP_MODEL_TYPE]
LNDP_TAU=@[LNDP_TAU]
LNDP_LSCALE=@[LNDP_LSCALE]
ISEED_LNDP=@[ISEED_LNDP]
lndp_var_list = @[LNDP_VAR_LIST]
lndp_prt_list = @[LNDP_PRT_LIST]
/

&MOM_input_nml
Expand Down
53 changes: 7 additions & 46 deletions tests/parm/global_control_lnd_iau.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,6 @@
ca_trigger = @[CA_TRIGGER]
nspinup = @[NSPINUP]
iseed_ca = @[ISEED_CA]
@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE]
@[HIDE_LAND_PERT] n_var_lndp = @[N_VAR_LNDP]
@[HIDE_NEST] lcnorm = @[LCNORM]
@[HIDE_SPPT] pert_mp = @[PERT_MP]
@[HIDE_SPPT] pert_radtend = @[PERT_RADTEND]
@[HIDE_SPPT] pert_clds = @[PERT_CLDS]
@[HIDE_IAU] iau_inc_files= @[IAU_INC_FILES]
@[HIDE_IAU] iau_drymassfixer = .false.
@[HIDE_IAU] iau_filter_increments = @[IAU_FILTER_INCREMENTS]
/

&land_iau_nml
Expand Down Expand Up @@ -403,44 +394,14 @@
grid_file = 'INPUT/grid_spec.nc'
/

&nam_stochy
@[HIDE_SKEB] skeb = @[SKEB]
@[HIDE_SKEB] iseed_skeb = @[ISEED_SKEB]
@[HIDE_SKEB] skeb_tau = @[SKEB_TAU]
@[HIDE_SKEB] skeb_lscale = @[SKEB_LSCALE]
@[HIDE_SKEB] skebnorm = @[SKEBNORM]
@[HIDE_SKEB] skeb_npass = @[SKEB_NPASS]
@[HIDE_SKEB] skeb_vdof = @[SKEB_VDOF]
@[HIDE_SHUM] shum = @[SHUM]
@[HIDE_SHUM] iseed_shum = @[ISEED_SHUM]
@[HIDE_SHUM] shum_tau = @[SHUM_TAU]
@[HIDE_SHUM] shum_lscale = @[SHUM_LSCALE]
@[HIDE_SPPT] sppt = @[SPPT]
@[HIDE_SPPT] iseed_sppt = @[ISEED_SPPT]
@[HIDE_SPPT] sppt_tau = @[SPPT_TAU]
@[HIDE_SPPT] sppt_lscale = @[SPPT_LSCALE]
@[HIDE_SPPT] sppt_logit = @[SPPT_LOGIT]
@[HIDE_SPPT] sppt_sfclimit = @[SPPT_SFCLIMIT]
@[HIDE_SPPT] use_zmtnblck = @[USE_ZMTNBLCK]
@[HIDE_SPPT] pbl_taper = @[PBL_TAPER]
@[HIDE_OCNSPPT] OCNSPPT = @[OCNSPPT]
@[HIDE_OCNSPPT] OCNSPPT_LSCALE = @[OCNSPPT_LSCALE]
@[HIDE_OCNSPPT] OCNSPPT_TAU = @[OCNSPPT_TAU]
@[HIDE_OCNSPPT] ISEED_OCNSPPT =@[ISEED_OCNSPPT]
@[HIDE_EPBL] EPBL = @[EPBL]
@[HIDE_EPBL] EPBL_LSCALE = @[EPBL_LSCALE]
@[HIDE_EPBL] EPBL_TAU = @[EPBL_TAU]
@[HIDE_EPBL] ISEED_EPBL = @[ISEED_EPBL]
/

&nam_sfcperts
@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE]
@[HIDE_LAND_PERT] lndp_model_type = @[LNDP_MODEL_TYPE]
@[HIDE_LAND_PERT] LNDP_TAU=@[LNDP_TAU]
@[HIDE_LAND_PERT] LNDP_LSCALE=@[LNDP_LSCALE]
@[HIDE_LAND_PERT] ISEED_LNDP=@[ISEED_LNDP]
@[HIDE_LAND_PERT] lndp_var_list = @[LNDP_VAR_LIST]
@[HIDE_LAND_PERT] lndp_prt_list = @[LNDP_PRT_LIST]
lndp_type = @[LNDP_TYPE]
lndp_model_type = @[LNDP_MODEL_TYPE]
LNDP_TAU=@[LNDP_TAU]
LNDP_LSCALE=@[LNDP_LSCALE]
ISEED_LNDP=@[ISEED_LNDP]
lndp_var_list = @[LNDP_VAR_LIST]
lndp_prt_list = @[LNDP_PRT_LIST]
/

&MOM_input_nml
Expand Down
2 changes: 2 additions & 0 deletions tests/tests/control_c48_lnd_iau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ export IOVR=3
export IMO=192
export JMO=94

export PERT_CLDS=.true.

export FNSMCC_control="'global_soilmgldas.statsgo.t92.192.94.grb'"
export FNMSKH_control="'global_slmask.t62.192.94.grb'"
export FNSMCC=${FNSMCC_control}
Expand Down
4 changes: 0 additions & 4 deletions tests/tests/cpld_debug_pdlib_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,5 @@ export K_SPLIT=2
export N_SPLIT=5

# HR4 GFSv17 GWD update
export DO_UGWP_V0=.false.
export DO_UGWP_V1=.true.
export DO_GSL_DRAG_LS_BL=.true.
export DO_GWD_OPT_PSL=.true.
export DO_GSL_DRAG_SS=.false.
export DO_GSL_DRAG_TOFD=.true.
Loading