-
Notifications
You must be signed in to change notification settings - Fork 249
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.
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
Add a WAM regression test with the MULTI_GASES and MOLECULAR_DIFFUSION options on #714
Merged
junwang-noaa
merged 48 commits into
ufs-community:develop
from
XiaqiongZhou-NOAA:udhmhj6
Oct 27, 2021
Merged
Changes from 12 commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
521e530
Point FV3 to personal branch
XiaqiongZhou-NOAA 8a33360
Update input.nml for the MULTI_GASES RT
XiaqiongZhou-NOAA 651fe72
Add the MOLECULAR_DIFFUSION option
XiaqiongZhou-NOAA 8e3a118
Update the submodule FV3
XiaqiongZhou-NOAA 6434f2b
Merge remote tracking branch ufs-community/ufs-weather-model/develop …
XiaqiongZhou-NOAA 89bf150
Update submoduels
XiaqiongZhou-NOAA da602ea
Update submodules
XiaqiongZhou-NOAA 6fd63b7
Add a WAM regresstion test with MULTI_GASES and MOLECULAR_DIFFUSION on
XiaqiongZhou-NOAA 241c032
Update the FV3 version
XiaqiongZhou-NOAA a9de025
Merge remote-tracking branch 'ufs-community/develop' into udhmhj6
XiaqiongZhou-NOAA a9646e5
Correct baseline directory name
XiaqiongZhou-NOAA f7d84bb
update FV3 to a new version
XiaqiongZhou-NOAA bcc17d5
Update wam.nml.IN
XiaqiongZhou-NOAA 37c58ec
Revise the regression test for molecular diffusion
XiaqiongZhou-NOAA 0c3e334
Update FV3 submodule
XiaqiongZhou-NOAA a4e01c5
Update FV3 submodule
XiaqiongZhou-NOAA 777724b
Merge remote-tracking ufs-community/ufs-weather-model
XiaqiongZhou-NOAA 8061851
Update submodules
XiaqiongZhou-NOAA 415fa47
Use consistent true/false flag for the WAM RT
XiaqiongZhou-NOAA 61cca3c
Upgrade upp lib to 10.0.10
WenMeng-NOAA 41b2b9b
Merge remote-tracking branch 'upstream/develop' into feature/upp_RRFS
WenMeng-NOAA 5a83e59
Update the FV3 submodule
XiaqiongZhou-NOAA 7ec07e3
Merge remote-tracking branch 'ufs-community/ufs-weather-model
XiaqiongZhou-NOAA fa1f1dc
Update FV3
XiaqiongZhou-NOAA 4ba420c
Merge remote-tracking branch 'ufs-community/develop' into udhmhj6
XiaqiongZhou-NOAA 1cefc23
Change the WAM run scripts to read re-organized input data
XiaqiongZhou-NOAA 2f6cc5d
Update the FV3 submodule
XiaqiongZhou-NOAA 1f5283b
Minor change for the WAM RT
XiaqiongZhou-NOAA 247cfd3
Merge remote-tracking branch 'upstream/develop' into feature/upp_RRFS
WenMeng-NOAA 99fb3b8
Merge remote-tracking branch 'upstream/develop' into feature/upp_RRFS
WenMeng-NOAA ed04c62
Update FV3 submodule
XiaqiongZhou-NOAA 91a9aa7
Merge remote-tracking branch 'ufs-community/develop' into udhmhj6
XiaqiongZhou-NOAA e556523
Modify the WAM RT to use parm/field_table directory
XiaqiongZhou-NOAA 3d7dc97
Update FV3 submodule
XiaqiongZhou-NOAA d26b1f7
Merge remote-tracking branch 'ufs-community/develop' into udhmhj6
XiaqiongZhou-NOAA 7712255
Merge remote-tracking branch 'WenMeng-NOAA/feature/upp_RRFS' into udh…
XiaqiongZhou-NOAA 50a5b2d
Update the intel compiler on DELL from 18.0.1 to 18.0.5
XiaqiongZhou-NOAA 5af402b
Update FV3 submodule
XiaqiongZhou-NOAA 3f4c6d6
Merge remote-tracking branch 'ufs-community/develop' into udhmhj6
XiaqiongZhou-NOAA 05833df
Update baseline date
XiaqiongZhou-NOAA bd62e72
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA 208a045
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA 614e5bc
Upload RT log files
XiaqiongZhou-NOAA b1b67b0
Merge branch 'udhmhj6' of https://github.com/XiaqiongZhou-NOAA/ufs-we…
XiaqiongZhou-NOAA ae671ac
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA be2358d
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA 061b4bf
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA d465a10
Point FV3 to the public version
XiaqiongZhou-NOAA File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Submodule FV3
updated
27 files
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 |
---|---|---|
|
@@ -34,15 +34,15 @@ | |
ntiles = 6, | ||
npz = @[NPZ] | ||
grid_type = -1 | ||
ncnst = 5 | ||
ncnst = 11 | ||
make_nh = @[MAKE_NH] | ||
fv_debug = .F. | ||
|
||
range_warn = .F. | ||
reset_eta = .F. | ||
n_sponge = -1 | ||
nudge_qv = .T. | ||
tau = 0.015 | ||
tau = -5.0e1 | ||
rf_cutoff = 2.e2 | ||
d2_bg_k1 = 0.20 | ||
d2_bg_k2 = 0.005 | ||
|
@@ -58,7 +58,7 @@ | |
p_fac = 0.1 | ||
k_split = 2 | ||
n_split = 6 | ||
nwat = 2 | ||
nwat = 6 | ||
na_init = @[NA_INIT] | ||
d_ext = 0.0 | ||
dnats = 0 | ||
|
@@ -84,7 +84,8 @@ | |
hord_dp = 6 | ||
hord_tr = 8 | ||
adjust_dry_mass = .F. | ||
consv_te = 1. | ||
consv_te = 0. | ||
do_sat_adj = .false. | ||
consv_am = .F. | ||
fill = .T. | ||
dwind_2d = .F. | ||
|
@@ -123,9 +124,9 @@ | |
ldiag3d = .false. | ||
fhcyc = 24. | ||
nst_anl = .true. | ||
use_ufo = .true. | ||
use_ufo = true. | ||
XiaqiongZhou-NOAA marked this conversation as resolved.
Show resolved
Hide resolved
|
||
pre_rad = .false. | ||
imp_physics = 99 | ||
imp_physics = 11 | ||
pdfcld = .false. | ||
fhswr = 3600. | ||
fhlwr = 3600. | ||
|
@@ -143,16 +144,16 @@ | |
cal_pre = .true. | ||
redrag = .true. | ||
dspheat = .true. | ||
hybedmf = @[HYBEDMF] | ||
satmedmf = @[SATMEDMF] | ||
hybedmf = .false. | ||
satmedmf = .true. | ||
lheatstrg = @[LHEATSTRG] | ||
lseaspray = @[LSEASPRAY] | ||
random_clds = .true. | ||
trans_trac = .false. | ||
cnvcld = .true. | ||
imfshalcnv = 2 | ||
imfdeepcnv = 2 | ||
isatmedmf = @[ISATMEDMF] | ||
isatmedmf = 1 | ||
cdmbgwd = 3.5,0.25 | ||
prslrd0 = 0. | ||
ivegsrc = 1 | ||
|
@@ -171,8 +172,11 @@ | |
iopt_tbot = 2 | ||
iopt_stc = 1 | ||
debug = .false. | ||
levr = 90 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good to see that the code runs fine with |
||
h2o_phys = @[H2O_PHYS] | ||
nstf_name = @[NSTF_NAME] | ||
oz_phys = .F. | ||
oz_phys_2015 = .T. | ||
cplflx = @[CPLFLX] | ||
cplwav = @[CPLWAV] | ||
iau_delthrs = 6 | ||
|
@@ -184,6 +188,56 @@ | |
lndp_type = @[LNDP_TYPE] | ||
n_var_lndp = @[N_VAR_LNDP] | ||
/ | ||
&gfdl_cloud_microphysics_nml | ||
sedi_transport = .true. | ||
do_sedi_heat = .false. | ||
rad_snow = .true. | ||
rad_graupel = .true. | ||
rad_rain = .true. | ||
const_vi = .F. | ||
const_vs = .F. | ||
const_vg = .F. | ||
const_vr = .F. | ||
vi_max = 1. | ||
vs_max = 2. | ||
vg_max = 12. | ||
vr_max = 12. | ||
qi_lim = 1. | ||
prog_ccn = .false. | ||
do_qa = .true. | ||
fast_sat_adj = .true. | ||
tau_l2v = 225. | ||
tau_v2l = 150. | ||
tau_g2v = 900. | ||
rthresh = 10.e-6 ! This is a key parameter for cloud water | ||
dw_land = 0.16 | ||
dw_ocean = 0.10 | ||
ql_gen = 1.0e-3 | ||
ql_mlt = 1.0e-3 | ||
qi0_crt = 8.0E-5 | ||
qs0_crt = 1.0e-3 | ||
tau_i2s = 1000. | ||
c_psaci = 0.05 | ||
c_pgacs = 0.01 | ||
rh_inc = 0.30 | ||
rh_inr = 0.30 | ||
rh_ins = 0.30 | ||
ccn_l = 300. | ||
ccn_o = 100. | ||
c_paut = 0.5 | ||
c_cracw = 0.8 | ||
use_ppm = .false. | ||
use_ccn = .true. | ||
mono_prof = .true. | ||
z_slope_liq = .true. | ||
z_slope_ice = .true. | ||
de_ice = .false. | ||
fix_negative = .true. | ||
icloud_f = 1 | ||
mp_time = 150. | ||
reiflag = 2 | ||
/ | ||
|
||
|
||
&interpolator_nml | ||
interp_method = 'conserve_great_circle' | ||
|
@@ -278,6 +332,16 @@ | |
launch_level = 25 | ||
/ | ||
&multi_gases_nml | ||
ri = 287.050, 461.50, 0.0, 173.2247, 0.0, 0.0 | ||
cpi = 1004.600, 1846.00, 0.0, 820.2391, 0.0, 0.0 | ||
ri= 295.3892, 461.50, 0., 0., 0., 0., 0., 173.2247, 519.674, 259.8370 ,0.,0. | ||
cpi=1031.1083, 1846.00, 0., 0., 0., 0., 0., 820.2391, 1299.185, 918.0969, 0.,0. | ||
/ | ||
&molecular_diffusion_nml | ||
tau_visc = 1.0 | ||
tau_cond = 1.0 | ||
tau_diff = 1.0 | ||
md_layers = 70 | ||
md_tadj_layers = 0 | ||
md_consv_te = 1.0 | ||
md_wait_hr = 0.0 | ||
/ | ||
|
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 was deleted.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
############################################################################### | ||
# | ||
# Global control multigases test | ||
# | ||
############################################################################### | ||
|
||
export TEST_DESCR="Compare global control multigases results with previous trunk version" | ||
|
||
export CNTL_DIR=control_wam | ||
|
||
export LIST_FILES="sfcf024.nc \ | ||
atmf024.nc" | ||
|
||
export_fv3 | ||
export NPZ=149 | ||
export NPZP=150 | ||
export DT_ATMOS="225" | ||
export SYEAR="2021" | ||
export SMONTH="03" | ||
export SDAY="22" | ||
export SHOUR="06" | ||
export FHMAX=24 | ||
export WARM_START=.T. | ||
export NA_INIT=0 | ||
export EXTERNAL_IC=.F. | ||
export NGGPS_IC=.F. | ||
export MAKE_NH=.F. | ||
export MOUNTAIN=.T. | ||
export FDIAG=3 | ||
export NSTF_NAME=0,0,1,0,5 | ||
export INPUT_NML=wam.nml.IN | ||
export FV3_RUN=wam_run.IN | ||
export CCPP_SUITE=FV3_GFS_v16_fv3wam | ||
export IAER=5111 | ||
export QUILTING=.T. | ||
export OUTPUT_GRID="gaussian_grid" | ||
export OZ_PHYS_OLD=.F. | ||
export OZ_PHYS_NEW=.T. | ||
export H2O_PHYS=.T. | ||
export NFHOUT=6 | ||
export NFHMAX=24 | ||
export NFHOUT_HF=6 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does a negative
tau
do to the dycore?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tau<0 uses the GFS type RF damping, instead of the GFDL type.