Skip to content

Commit

Permalink
Merge pull request NCAR#181 from dustinswales/dtc/develop
Browse files Browse the repository at this point in the history
RRTMGP w/ GFS SDFs + some houskeeping
  • Loading branch information
grantfirl authored Aug 11, 2020
2 parents babd792 + bf87ff6 commit 42e295b
Show file tree
Hide file tree
Showing 18 changed files with 972 additions and 352 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "ccpp-framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = dtc/develop
branch = master
[submodule "ccpp-physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = dtc/develop
branch = master
59 changes: 38 additions & 21 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_kind.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_lw.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_sw.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_config.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90',
Expand All @@ -202,7 +203,9 @@
'ccpp/physics/physics/rte-rrtmgp/extensions/mo_heating_rates.F90',
'ccpp/physics/physics/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90',
'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90',
'ccpp/physics/physics/rrtmg_lw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmg_sw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmgp_aux.F90' ,
# derived data type definitions
'scm/src/GFS_typedefs.F90',
'scm/src/gmtb_scm_kinds.F90',
Expand Down Expand Up @@ -304,24 +307,25 @@
'ccpp/physics/physics/mp_fer_hires.F90' ,
'ccpp/physics/physics/gmtb_scm_sfc_flux_spec.F90' ,
# RRTMGP
'ccpp/physics/physics/rrtmg_lw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmg_sw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmgp_aux.F90' ,
'ccpp/physics/physics/rrtmgp_lw_gas_optics.F90' ,
'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmgp_sw_gas_optics.F90' ,
'ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90' ,
'ccpp/physics/physics/rrtmgp_lw_rte.F90' ,
'ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90' ,
'ccpp/physics/physics/rrtmgp_sw_rte.F90' ,
'ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90' ,
'ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_setup.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_pre.F90' ,
'ccpp/physics/physics/rrtmgp_lw_pre.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_lw_post.F90' ,
'ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90' ,
'ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90' ,
'ccpp/physics/physics/GFS_cloud_diagnostics.F90' ,
'ccpp/physics/physics/mo_cloud_sampling.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_gfdlmp_pre.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_zhaocarr_pre.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'
]

Expand Down Expand Up @@ -362,20 +366,6 @@
# if no entry is made here. Possible values are: 'all', 'none',
# or a list of standard_names: [ 'var1', 'var3' ].
OPTIONAL_ARGUMENTS = {
'rrtmgp_sw_rte' : {
'rrtmgp_sw_rte_run' : [
'components_of_surface_downward_shortwave_fluxes',
],
},
'GFS_rrtmgp_sw_post' : {
'GFS_rrtmgp_sw_post_run' : 'none',
},
'rrtmgp_lw_rte' : {
'rrtmgp_lw_rte_run' : 'none',
},
'GFS_rrtmgp_lw_post' : {
'GFS_rrtmgp_lw_post_run' : 'none',
},
'rrtmg_sw' : {
'rrtmg_sw_run' : [
'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step_and_radiation_levels',
Expand Down Expand Up @@ -431,7 +421,34 @@
'rime_factor',
],
},

'rrtmgp_lw_rte' : {
'rrtmgp_lw_rte_run' : [
'RRTMGP_jacobian_of_lw_flux_profile_upward',
'RRTMGP_jacobian_of_lw_flux_profile_downward',
],
},
'rrtmgp_sw_rte' : {
'rrtmgp_sw_rte_run' : [
'components_of_surface_downward_shortwave_fluxes',
],
},
'GFS_rrtmgp_sw_post' : {
'GFS_rrtmgp_sw_post_run' : [
'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
'components_of_surface_downward_shortwave_fluxes',
],
},
'GFS_rrtmgp_lw_post' : {
'GFS_rrtmgp_lw_post_run' : [
'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
],
},
'GFS_suite_interstitial_2' : {
'GFS_suite_interstitial_2_run' : [
'RRTMGP_jacobian_of_lw_flux_profile_upward',
'RRTMGP_lw_flux_profile_upward_allsky',
],
},
#'subroutine_name_1' : 'all',
#'subroutine_name_2' : 'none',
#'subroutine_name_2' : [ 'var1', 'var3'],
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 41 files
+596 −0 physics/GFS_cloud_diagnostics.F90
+159 −0 physics/GFS_cloud_diagnostics.meta
+234 −0 physics/GFS_rrtmgp_gfdlmp_pre.F90
+385 −0 physics/GFS_rrtmgp_gfdlmp_pre.meta
+116 −132 physics/GFS_rrtmgp_lw_post.F90
+100 −46 physics/GFS_rrtmgp_lw_post.meta
+98 −547 physics/GFS_rrtmgp_pre.F90
+179 −189 physics/GFS_rrtmgp_pre.meta
+45 −21 physics/GFS_rrtmgp_setup.F90
+61 −13 physics/GFS_rrtmgp_setup.meta
+174 −159 physics/GFS_rrtmgp_sw_post.F90
+210 −66 physics/GFS_rrtmgp_sw_post.meta
+54 −43 physics/GFS_rrtmgp_sw_pre.F90
+247 −48 physics/GFS_rrtmgp_sw_pre.meta
+253 −0 physics/GFS_rrtmgp_zhaocarr_pre.F90
+406 −0 physics/GFS_rrtmgp_zhaocarr_pre.meta
+73 −7 physics/GFS_suite_interstitial.F90
+45 −1 physics/GFS_suite_interstitial.meta
+1 −0 physics/drag_suite.F90
+398 −0 physics/mo_cloud_sampling.F90
+2 −0 physics/module_sf_noahmp_glacier.f90
+4 −0 physics/physcons.F90
+9 −1 physics/physparam.f
+200 −1 physics/radiation_clouds.f
+9 −162 physics/rrtmg_lw_cloud_optics.F90
+42 −174 physics/rrtmg_sw_cloud_optics.F90
+104 −75 physics/rrtmgp_lw_cloud_optics.F90
+63 −14 physics/rrtmgp_lw_cloud_optics.meta
+150 −29 physics/rrtmgp_lw_cloud_sampling.F90
+43 −0 physics/rrtmgp_lw_cloud_sampling.meta
+11 −4 physics/rrtmgp_lw_gas_optics.F90
+51 −52 physics/rrtmgp_lw_rte.F90
+34 −18 physics/rrtmgp_lw_rte.meta
+151 −68 physics/rrtmgp_sw_cloud_optics.F90
+61 −12 physics/rrtmgp_sw_cloud_optics.meta
+197 −51 physics/rrtmgp_sw_cloud_sampling.F90
+43 −0 physics/rrtmgp_sw_cloud_sampling.meta
+26 −9 physics/rrtmgp_sw_gas_optics.F90
+20 −22 physics/rrtmgp_sw_rte.F90
+8 −9 physics/rrtmgp_sw_rte.meta
+1 −1 physics/rte-rrtmgp
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_RRTMGP.nml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
lw_file_clouds = 'extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-lw.nc'
sw_file_gas = 'rrtmgp/data/rrtmgp-data-sw-g224-2018-12-04.nc'
sw_file_clouds = 'extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-sw.nc'
rrtmgp_cld_optics = 0
doG_cldoptics = .true.
rrtmgp_ngauss_ang = 3
rrtmgp_nrghice = 3
/
Expand Down
126 changes: 126 additions & 0 deletions ccpp/physics_namelists/input_GFS_v15p2_RRTMGP_LWjac.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
&gfs_physics_nml
fhzero = 6.
h2o_phys = .true.
ldiag3d = .true.
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
fhlwr = 3600.
ialb = 1
iems = 1
iaer = 111
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 = .true.
random_clds = .false.
trans_trac = .true.
cnvcld = .true.
imfshalcnv = 2
imfdeepcnv = 2
cdmbgwd = 3.5,0.25
prslrd0 = 0.
ivegsrc = 1
isot = 1
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
nstf_name = 2,1,0,0,0
nst_anl = .true.
psautco = 0.0008,0.0005
prautco = 0.00015,0.00015
lgfdlmprad = .true.
effr_in = .true.
do_sppt = .false.
do_shum = .false.
do_skeb = .false.
do_sfcperts = .false.
do_RRTMGP = .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-g256-2018-12-04.nc'
lw_file_clouds = 'extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-lw.nc'
sw_file_gas = 'rrtmgp/data/rrtmgp-data-sw-g224-2018-12-04.nc'
sw_file_clouds = 'extensions/cloud_optics/rrtmgp-cloud-optics-coeffs-sw.nc'
doG_cldoptics = .true.
use_LW_jacobian = .true.
rrtmgp_ngauss_ang = 3
rrtmgp_nrghice = 3
/

&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 = .false.
fast_sat_adj = .false.
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.
/

&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 = 25
/
Loading

0 comments on commit 42e295b

Please sign in to comment.