Skip to content

Commit

Permalink
Merge pull request ufs-community#80 from grantfirl/ufs-dev-PR18
Browse files Browse the repository at this point in the history
UFS-dev PR#18
  • Loading branch information
grantfirl authored Dec 26, 2022
2 parents 1379e69 + 5f9a052 commit 3992d58
Show file tree
Hide file tree
Showing 30 changed files with 4,160 additions and 3,880 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 1 files
+1 −1 ccpp/physics
728 changes: 307 additions & 421 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

2,223 changes: 990 additions & 1,233 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

734 changes: 310 additions & 424 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

2,259 changes: 1,008 additions & 1,251 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/opnReqTests/thr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ elif [[ $application == 'cpld' ]]; then
NPROC_ICE=$ICE_tasks
TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
NODES=$(((TASKS+TPN-1)/TPN))
elif [[ $TEST_NAME =~ 'cpld_control_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_ciceC_p8' ]]; then
elif [[ $TEST_NAME =~ 'cpld_control_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_ciceC_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_gfsv17' ]]; then
INPES=3
JNPES=4
OCN_tasks=20
Expand Down
354 changes: 354 additions & 0 deletions tests/parm/control_gfsv17.nml.IN
Original file line number Diff line number Diff line change
@@ -0,0 +1,354 @@
&atmos_model_nml
blocksize = 32
chksum_debug = .false.
dycore_only = .false.
ccpp_suite = '@[CCPP_SUITE]'
/

&diag_manager_nml
prepend_date = .false.
max_output_fields = @[MAX_OUTPUT_FIELDS]
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&fms_nml
clock_grain = 'ROUTINE'
domains_stack_size = 3000000
print_memory_usage = .false.
/

&fv_core_nml
layout = @[INPES],@[JNPES]
io_layout = 1,1
npx = @[NPX]
npy = @[NPY]
ntiles = 6
npz = @[NPZ]
grid_type = -1
make_nh = @[MAKE_NH]
fv_debug = .false.
range_warn = .false.
reset_eta = .false.
n_sponge = 42
nudge_qv = .true.
nudge_dz = .false.
tau = 10.
rf_cutoff = 7.5e2
d2_bg_k1 = 0.20
d2_bg_k2 = 0.0
kord_tm = -9
kord_mt = 9
kord_wz = 9
kord_tr = 9
hydrostatic = .false.
phys_hydrostatic = .false.
use_hydro_pressure = .false.
beta = 0.
a_imp = 1.
p_fac = 0.1
k_split = 2
n_split = 6
nwat = 6
na_init = @[NA_INIT]
d_ext = 0.
dnats = @[DNATS]
fv_sg_adj = 450
d2_bg = 0.
nord = 2
dddmp = 0.1
d4_bg = 0.12
vtdm4 = 0.02
delt_max = 0.002
ke_bg = 0.
do_vort_damp = .true.
external_ic = @[EXTERNAL_IC]
external_eta = .true.
gfs_phil = .false.
nggps_ic = @[NGGPS_IC]
mountain = @[MOUNTAIN]
ncep_ic = .false.
d_con = 1.
hord_mt = 5
hord_vt = 5
hord_tm = 5
hord_dp = -5
hord_tr = 8
adjust_dry_mass = .false.
consv_te = 1.
do_sat_adj = .true.
consv_am = .false.
fill = .true.
dwind_2d = .false.
print_freq = 6
warm_start = @[WARM_START]
no_dycore = .false.
z_tracer = .true.
agrid_vel_rst = .true.
read_increment = @[READ_INCREMENT]
res_latlon_dynamics = @[RES_LATLON_DYNAMICS]
/

&external_ic_nml
filtered_terrain = .true.
levp = @[NPZP]
gfs_dwinds = .true.
checker_tr = .false.
nt_checker = 0
/

&gfs_physics_nml
fhzero = @[FHZERO]
h2o_phys = .true.
ldiag3d = @[LDIAG3D]
qdiag3d = @[QDIAG3D]
print_diff_pgr = @[PRINT_DIFF_PGR]
fhcyc = @[FHCYC]
use_ufo = .true.
pre_rad = .false.
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
fhlwr = 3600.
ialb = 1
iems = 1
iaer = @[IAER]
icliq_sw = 2
iovr = @[IOVR]
ico2 = 2
isubc_sw = 2
isubc_lw = 2
isol = 2
lwhtr = .true.
swhtr = .true.
cnvgwd = .true.
shal_cnv = .true.
cal_pre = .false.
redrag = .true.
dspheat = .true.
hybedmf = .false.
satmedmf = .true.
isatmedmf = 1
lheatstrg = @[LHEATSTRG]
lseaspray = @[LSEASPRAY]
random_clds = @[RANDOM_CLDS]
trans_trac = .true.
cnvcld = @[CNVCLD]
imfshalcnv = @[IMFSHALCNV]
imfdeepcnv = @[IMFDEEPCNV]
ras = @[RAS]
cdmbgwd = @[CDMBWD]
progsigma = @[PROGSIGMA]
prslrd0 = 0.
ivegsrc = 1
isot = 1
lsoil = 4
lsm = 1
iopt_dveg = 1
iopt_crs = 1
iopt_btr = 1
iopt_run = 1
iopt_sfc = 1
iopt_frz = 1
iopt_inf = 1
iopt_rad = 1
iopt_alb = 2
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
nstf_name = 2,0,0,0,0
nst_anl = .true.
psautco = 0.0008,0.0005
prautco = 0.00015,0.00015
lgfdlmprad = .true.
cplchm = @[CPLCHM]
cplwav = @[CPLWAV]
cplwav2atm = @[CPLWAV2ATM]
effr_in = .true.
ldiag_ugwp = .false.
do_ugwp = .false.
do_tofd = .true.
do_sppt = @[DO_SPPT]
do_shum = @[DO_SHUM]
do_skeb = @[DO_SKEB]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
fscav_aero = @[FSCAV_AERO]
do_RRTMGP = @[DO_RRTMGP]
active_gases = 'h2o_co2_o3_n2o_ch4_o2'
ngases = 6
lw_file_gas = 'rrtmgp-data-lw-g128-210809.nc'
lw_file_clouds = 'rrtmgp-cloud-optics-coeffs-lw.nc'
sw_file_gas = 'rrtmgp-data-sw-g112-210809.nc'
sw_file_clouds = 'rrtmgp-cloud-optics-coeffs-sw.nc'
rrtmgp_nGptsSW = 112
rrtmgp_nGptsLW = 128
rrtmgp_nBandsLW = 16
rrtmgp_nBandsSW = 14
doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
doGP_lwscat = @[DOGP_LWSCAT]
/

&gfdl_cloud_microphysics_nml
sedi_transport = .true.
do_sedi_heat = .false.
rad_snow = .true.
rad_graupel = .true.
rad_rain = .true.
const_vi = .false.
const_vs = .false.
const_vg = .false.
const_vr = .false.
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'
/

&namsfc
FNGLAC = 'global_glacier.2x2.grb'
FNMXIC = 'global_maxice.2x2.grb'
FNTSFC = 'RTGSST.1982.2012.monthly.clim.grb'
FNSNOC = 'global_snoclim.1.875.grb'
FNZORC = 'igbp'
FNALBC = @[FNALBC]
FNALBC2 = 'global_albedo4.1x1.grb'
FNAISC = 'CFSR.SEAICE.1982.2012.monthly.clim.grb'
FNTG3C = 'global_tg3clim.2.6x1.5.grb'
FNVEGC = 'global_vegfrac.0.144.decpercent.grb'
FNVETC = @[FNVETC]
FNSOTC = @[FNSOTC]
FNSMCC = @[FNSMCC_control]
FNMSKH = @[FNMSKH_control]
FNTSFA = ''
FNACNA = ''
FNSNOA = ''
FNVMNC = 'global_shdmin.0.144x0.144.grb'
FNVMXC = 'global_shdmax.0.144x0.144.grb'
FNSLPC = 'global_slope.1x1.grb'
FNABSC = @[FNABSC]
LDEBUG = .false.
FSMCL(2) = 99999
FSMCL(3) = 99999
FSMCL(4) = 99999
LANDICE = .true.
FTSFS = 90
FAISL = 99999
FAISS = 99999
FSNOL = 99999
FSNOS = 99999
FSICL = 99999
FSICS = 99999
FTSFL = 99999
FVETL = 99999
FSOTL = 99999
FvmnL = 99999
FvmxL = 99999
FSLPL = 99999
FABSL = 99999
/

&fv_grid_nml
grid_file = 'INPUT/grid_spec.nc'
/

&nam_stochy
STOCHINI=@[STOCHINI],
SKEBNORM=1,
SKEB_NPASS=30,
SKEB_VDOF=5,
SKEB=@[SKEB],
SKEB_TAU=2.16E4,
SKEB_LSCALE=1000.E3,
SKEBINT=1800,
SHUM=@[SHUM],
SHUM_TAU=21600,
SHUM_LSCALE=500000,
SHUMINT=3600,
SPPT=@[SPPT],
SPPT_TAU=21600,
SPPT_LSCALE=500000,
SPPT_LOGIT=.TRUE.,
SPPT_SFCLIMIT=.TRUE.,
SPPTINT=1800,
ISEED_SHUM=1,
ISEED_SKEB=2,
ISEED_SPPT=3,
/

&nam_sfcperts
lndp_type = @[LNDP_TYPE]
lndp_model_type = @[LNDP_MODEL_TYPE]
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010,
lndp_var_list = @[LNDP_VAR_LIST]
lndp_prt_list = @[LNDP_PRT_LIST]
/

&cires_ugwp_nml
knob_ugwp_solver = 2
knob_ugwp_source = 1,1,0,0
knob_ugwp_wvspec = 1,25,25,25
knob_ugwp_azdir = 2,4,4,4
knob_ugwp_stoch = 0,0,0,0
knob_ugwp_effac = 1,1,1,1
knob_ugwp_doaxyz = 1
knob_ugwp_doheat = 1
knob_ugwp_dokdis = 1
knob_ugwp_ndx4lh = 1
knob_ugwp_version = 0
launch_level = 54
/

Loading

0 comments on commit 3992d58

Please sign in to comment.