Skip to content

Commit

Permalink
PR162 Host-side changes and HR3 SDF and namelist with a fix for readi…
Browse files Browse the repository at this point in the history
…ng sfc fluxes for DEPHYv1 format

ccpp-physics PR162: ufs-community/ccpp-physics#162
fv3atm PR779: NOAA-EMC/fv3atm#779
ccppscm PR428: https://github.com/NCAR/ccpp-scm/pull/428/files
	modified:   ../../ccpp/config/ccpp_prebuild_config.py
	modified:   ../../ccpp/physics
	new file:   ../../ccpp/physics_namelists/input_GFS_v16_gfdlmpv3.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C1152.nml
	modified:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C192.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C3072.nml
	modified:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C384.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C768.nml
	modified:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C96.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_gfdlmpv1_C384.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_gfdlmpv1_C768.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_gfdlmpv3_C768.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_nssl_C384.nml
	new file:   ../../ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_nssl_C768.nml
	new file:   ../../ccpp/suites/suite_SCM_GFS_v16_gfdlmpv3.xml
	new file:   ../../ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_gfdlmpv1.xml
	new file:   ../../ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_gfdlmpv3.xml
	new file:   ../../ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_nssl.xml
	modified:   ../etc/Hera_setup_intel.sh
	modified:   CCPP_typedefs.F90
	modified:   CCPP_typedefs.meta
	modified:   GFS_typedefs.F90
	modified:   GFS_typedefs.meta
	modified:   run_scm.py
	modified:   scm_input.F90
	modified:   scm_type_defs.F90
	modified:   suite_info.py
  • Loading branch information
bluefinweiwei committed Mar 29, 2024
1 parent 0badb2f commit c35d5e4
Show file tree
Hide file tree
Showing 27 changed files with 2,054 additions and 33 deletions.
4 changes: 2 additions & 2 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@
'ccpp/physics/physics/photochem/h2ophys.f',
'ccpp/physics/physics/photochem/module_ozphys.F90',
'ccpp/physics/physics/MP/Ferrier_Aligo/mp_fer_hires.F90',
'ccpp/physics/physics/MP/GFDL/gfdl_cloud_microphys.F90',
'ccpp/physics/physics/MP/GFDL/fv_sat_adj.F90',
'ccpp/physics/physics/MP/GFDL_2019_v1/gfdl_cloud_microphys.F90',
'ccpp/physics/physics/MP/GFDL_2022_v3/gfdl_cld_mp_v3.F90',
'ccpp/physics/physics/MP/Morrison_Gettelman/m_micro.F90',
'ccpp/physics/physics/MP/Morrison_Gettelman/m_micro_pre.F90',
'ccpp/physics/physics/MP/Morrison_Gettelman/m_micro_post.F90',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 42 files
+6 −2 CMakeLists.txt
+12 −7 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta
+3 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_common.F90
+5 −4 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.meta
+6 −4 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.meta
+2 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90
+7 −4 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
+5 −3 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta
+5 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta
+4 −3 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta
+11 −9 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90
+8 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta
+5 −3 physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta
+8 −5 physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90
+3 −2 physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta
+0 −0 physics/MP/GFDL_2019_v1/fv_sat_adj.F90
+1 −1 physics/MP/GFDL_2019_v1/fv_sat_adj.meta
+0 −0 physics/MP/GFDL_2019_v1/gfdl_cloud_microphys.F90
+0 −0 physics/MP/GFDL_2019_v1/gfdl_cloud_microphys.meta
+0 −0 physics/MP/GFDL_2019_v1/module_gfdl_cloud_microphys.F90
+1,441 −0 physics/MP/GFDL_2022_v3/fv_sat_adj_v3.F90
+440 −0 physics/MP/GFDL_2022_v3/fv_sat_adj_v3.meta
+391 −0 physics/MP/GFDL_2022_v3/gfdl_cld_mp_v3.F90
+519 −0 physics/MP/GFDL_2022_v3/gfdl_cld_mp_v3.meta
+7,700 −0 physics/MP/GFDL_2022_v3/module_gfdl_cld_mp.F90
+0 −0 physics/MP/GFDL_parse_tracers.F90
+1 −1 physics/MP/Morrison_Gettelman/aerinterp.F90
+0 −0 physics/MP/multi_gases.F90
+5 −4 physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90
+7 −0 physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta
+14 −4 physics/Radiation/radiation_clouds.f
+6 −6 physics/SFC_Models/Land/RUC/lsm_ruc.F90
+7 −0 physics/SFC_Models/Land/RUC/lsm_ruc.meta
141 changes: 141 additions & 0 deletions ccpp/physics_namelists/input_GFS_v16_gfdlmpv3.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@

&gfs_physics_nml
cal_pre = .false.
cdmbgwd = 4.0, 0.15, 1.0, 1.0
cnvcld = .true.
cnvgwd = .true.
debug = .false.
do_shum = .false.
do_skeb = .false.
do_spp = .false.
do_sppt = .false.
do_tofd = .true.
do_ugwp = .false.
dspheat = .true.
effr_in = .true.
fhcyc = 0
fhlwr = 1200.0
fhswr = 1200.0
fhzero = 1.0
h2o_phys = .true.
hybedmf = .false.
iaer = 5111
ialb = 1
iau_inc_files = ''
icliq_sw = 2
ico2 = 2
iems = 1
imfdeepcnv = 2
imfshalcnv = 2
imp_physics = 13
iopt_alb = 2
iopt_btr = 1
iopt_crs = 1
iopt_dveg = 1
iopt_frz = 1
iopt_inf = 1
iopt_rad = 1
iopt_run = 1
iopt_sfc = 1
iopt_snf = 4
iopt_stc = 1
iopt_tbot = 2
iovr = 3
isatmedmf = 1
isol = 2
isot = 1
isubc_lw = 2
isubc_sw = 2
ivegsrc = 1
ldiag3d = .true.
ldiag_ugwp = .false.
lgfdlmprad = .true.
lheatstrg = .true.
lndp_type = 0
lsm = 1
lsoil = 4
lwhtr = .true.
n_var_lndp = 0
n_var_spp = 0
nsfullradar_diag = 3600
nst_anl = .true.
nstf_name = 2, 1, 0, 0, 0
oz_phys = .false.
oz_phys_2015 = .true.
pdfcld = .false.
prautco = 0.00015, 0.00015
pre_rad = .false.
print_diff_pgr = .false.
prslrd0 = 0.0
psautco = 0.0008, 0.0005
qdiag3d = .true.
random_clds = .false.
redrag = .true.
satmedmf = .true.
shal_cnv = .true.
swhtr = .true.
trans_trac = .true.
use_ufo = .true.
/

&gfdl_mp_nml
c_paut = 0.5
c_pgacs = 0.01
c_psaci = 0.05
ccn_l = 300.0
ccn_o = 100.0
const_vg = .false.
const_vi = .false.
const_vr = .false.
const_vs = .false.
do_qa = .true.
do_sedi_heat = .false.
dw_land = 0.16
dw_ocean = 0.1
fix_negative = .true.
icloud_f = 1
mp_time = 150.0
prog_ccn = .false.
qi0_crt = 8e-05
qi_lim = 1.0
ql_gen = 0.001
ql_mlt = 0.001
qs0_crt = 0.001
rad_graupel = .true.
rad_rain = .true.
rad_snow = .true.
reiflag = 2
rh_inc = 0.3
rh_inr = 0.3
rh_ins = 0.3
do_cld_adj = .false.
use_rhc_revap = .true.
f_dq_p = 3.0
rthresh = 8.0e-06
tau_i2s = 1000.0
tau_l2v = 225.0
tau_v2l = 150.0
vg_max = 12.0
vi_max = 1.0
vr_max = 12.0
vs_max = 2.0
rewmax = 10.0
rermin = 10.0
z_slope_ice = .true.
z_slope_liq = .true.
/

&cires_ugwp_nml
knob_ugwp_azdir = 2, 4, 4, 4
knob_ugwp_doaxyz = 1
knob_ugwp_doheat = 1
knob_ugwp_dokdis = 1
knob_ugwp_effac = 1, 1, 1, 1
knob_ugwp_ndx4lh = 1
knob_ugwp_solver = 2
knob_ugwp_source = 1, 1, 0, 0
knob_ugwp_stoch = 0, 0, 0, 0
knob_ugwp_version = 0
knob_ugwp_wvspec = 1, 25, 25, 25
launch_level = 27
/
171 changes: 171 additions & 0 deletions ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C1152.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
&gfs_physics_nml
fhzero = 6
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
print_diff_pgr = .false.
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
imp_physics = 8
iovr = 3
ltaerosol = .false.
lradar = .true.
ttendlim = -999
dt_inner = 60.0
sedi_semi = .true.
decfl = 10
oz_phys = .false.
oz_phys_2015 = .true.
lsoil_lsm = 4
do_mynnedmf = .false.
do_mynnsfclay = .false.
icloud_bl = 1
bl_mynn_edmf = 1
bl_mynn_tkeadvect = .true.
bl_mynn_edmf_mom = 1
do_ugwp = .false.
do_tofd = .false.
gwd_opt = 2
do_ugwp_v0 = .false.
do_ugwp_v1 = .true.
do_ugwp_v0_orog_only = .false.
do_ugwp_v0_nst_only = .false.
do_gsl_drag_ls_bl = .true.
do_gsl_drag_ss = .true.
do_gsl_drag_tofd = .true.
do_ugwp_v1_orog_only = .false.
min_lakeice = 0.15
min_seaice = 0.15
use_cice_alb = .false.
pdfcld = .false.
fhswr = 1200.
fhlwr = 1200.
ialb = 1
iems = 1
iaer = 5111
icliq_sw = 2
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 = .true.
lseaspray = .true.
random_clds = .false.
trans_trac = .true.
cnvcld = .true.
imfshalcnv = 2
imfdeepcnv = 2
ras = .false.
cdmbgwd = 1.67,8.8,1.0,1.0
prslrd0 = 0.
ivegsrc = 1
isot = 1
lsoil = 4
lsm = 2
iopt_dveg = 4
iopt_crs = 2
iopt_btr = 1
iopt_run = 1
iopt_sfc = 3
iopt_trs = 2
iopt_frz = 1
iopt_inf = 1
iopt_rad = 3
iopt_alb = 1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 3
debug = .false.
nstf_name = 2,1,0,0,0
nst_anl = .true.
psautco = 0.0008,0.0005
prautco = 0.00015,0.00015
lgfdlmprad = .false.
effr_in = .true.
ldiag_ugwp = .false.
fscav_aero = "'*:0.0'"
do_sppt = .false.
do_shum = .false.
do_skeb = .false.
do_RRTMGP = .false.
doGP_cldoptics_LUT = .true.
doGP_lwscat = .true.
active_gases = 'h2o_co2_o3_n2o_ch4_o2'
ngases = 6
rrtmgp_root = '../../ccpp/physics/physics/rte-rrtmgp/'
lw_file_gas = 'rrtmgp/data/rrtmgp-data-lw-g128-210809.nc'
lw_file_clouds = 'extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-lw.nc'
sw_file_gas = 'rrtmgp/data/rrtmgp-data-sw-g112-210809.nc'
sw_file_clouds = 'extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-sw.nc'
rrtmgp_nGptsSW = 112
rrtmgp_nGptsLW = 128
rrtmgp_nBandsLW = 16
rrtmgp_nBandsSW = 14
frac_grid = .true.
cplchm = .false.
cplflx = .false.
cplice = .false.
cplwav = .false.
cplwav2atm = .false.
do_ca = .false.
ca_global = .false.
ca_sgs = .false.
nca = 1
ncells = 5
nlives = 12
nseed = 1
nfracseed = 0.5
nthresh = 18
ca_trigger = .true.
nspinup = 1
iseed_ca = 12345
lndp_type = 0
n_var_lndp = 0
do_ccpp_suite_sim = .false.
/

&cires_ugwp_nml
knob_ugwp_solver = 2
knob_ugwp_version = 1
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 = 2
knob_ugwp_ndx4lh = 4
knob_ugwp_palaunch = 275.0e2
knob_ugwp_nslope = 0
knob_ugwp_lzmax = 15.750e3
knob_ugwp_lzmin = 0.75e3
knob_ugwp_lzstar = 2.0e3
knob_ugwp_taumin = 0.25e-3
knob_ugwp_tauamp = 0.35e-3
knob_ugwp_lhmet = 200.0e3
knob_ugwp_orosolv = 'pss-1986'
/

&ccpp_suite_sim_nml
suite_sim_file = ''
nprc_sim = 7
prc_LWRAD_cfg = 0, 0, 1
prc_SWRAD_cfg = 0, 0, 2
prc_PBL_cfg = 1, 0, 3
prc_GWD_cfg = 1, 0, 4
prc_SCNV_cfg = 1, 1, 5
prc_DCNV_cfg = 1, 1, 6
prc_cldMP_cfg = 1, 1, 7
/
4 changes: 2 additions & 2 deletions ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1_C192.nml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ltaerosol = .false.
lradar = .true.
ttendlim = -999
dt_inner = 450.0
dt_inner = 225.0
sedi_semi = .true.
decfl = 10
oz_phys = .false.
Expand Down Expand Up @@ -153,7 +153,7 @@
knob_ugwp_lzmin = 0.75e3
knob_ugwp_lzstar = 2.0e3
knob_ugwp_taumin = 0.25e-3
knob_ugwp_tauamp = 3.0e-3
knob_ugwp_tauamp = 1.5e-3
knob_ugwp_lhmet = 200.0e3
knob_ugwp_orosolv = 'pss-1986'
/
Expand Down
Loading

0 comments on commit c35d5e4

Please sign in to comment.