Skip to content

Commit

Permalink
update v3.0 branch to work with gmtb/develop branches of ccpp-physics…
Browse files Browse the repository at this point in the history 
… and ccpp-framework; add back files in ccpp_prebuild_config.py; chamge lsm namelist variable to 3 for GSD suite; remove sfc_sice_post from SDFs; sync gmtb_scm_type_defs.f90 and GFS_typedefs.F90 in scm/src with GFS_typedefs.F90 from NEMSfv3gfs
  • Loading branch information
@grantfirl
grantfirl committed Jul 29, 2019
1 parent 9459ad4 commit d73c208
Show file tree
Hide file tree
Showing 11 changed files with 1,093 additions and 598 deletions.
67 changes: 40 additions & 27 deletions ccpp/config/ccpp_prebuild_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
'ccpp/physics/physics/cldmacro.F',
'ccpp/physics/physics/date_def.f',
'ccpp/physics/physics/funcphys.f90',
'ccpp/physics/physics/gfs_phy_tracer_config.f',
'ccpp/physics/physics/gfs_phy_tracer_config.F',
'ccpp/physics/physics/gocart_tracer_config_stub.f',
'ccpp/physics/physics/h2o_def.f',
'ccpp/physics/physics/h2ointerp.f90',
Expand All @@ -53,6 +53,7 @@
'ccpp/physics/physics/module_mp_thompson.F90',
'ccpp/physics/physics/module_mp_thompson_make_number_concentrations.F90',
'ccpp/physics/physics/module_bl_mynn.F90',
'ccpp/physics/physics/module_sf_mynn.F90',
'ccpp/physics/physics/namelist_soilveg.f',
'ccpp/physics/physics/mfpblt.f',
'ccpp/physics/physics/mfscu.f',
Expand All @@ -71,17 +72,18 @@
'ccpp/physics/physics/radlw_param.f',
'ccpp/physics/physics/radsw_datatb.f',
'ccpp/physics/physics/radsw_param.f',
'ccpp/physics/physics/sfcsub.F',
'ccpp/physics/physics/sflx.f',
'ccpp/physics/physics/set_soilveg.f',
'ccpp/physics/physics/surface_perturbation.F90',
'ccpp/physics/physics/cu_gf_deep.F90',
'ccpp/physics/physics/cu_gf_sh.F90',
'ccpp/physics/physics/tridi.f',
'ccpp/physics/physics/wv_saturation.F',
'ccpp/physics/physics/module_sf_ruclsm.F90',
'ccpp/physics/physics/namelist_soilveg_ruc.F90',
'ccpp/physics/physics/set_soilveg_ruc.F90',
'ccpp/physics/physics/module_soil_pre.F90',
'ccpp/physics/physics/wv_saturation.F',
'scm/src/GFS_typedefs.F90'
]

Expand All @@ -107,9 +109,14 @@
'ccpp/physics/physics/cnvc90.f' : ['physics'],
'ccpp/physics/physics/cs_conv.F90' : ['physics'],
'ccpp/physics/physics/cs_conv_aw_adj.F90' : ['physics'],
'ccpp/physics/physics/cu_ntiedtke_pre.F90' : ['physics'],
'ccpp/physics/physics/cu_ntiedtke.F90' : ['physics'],
'ccpp/physics/physics/cu_ntiedtke_post.F90' : ['physics'],
'ccpp/physics/physics/dcyc2.f' : ['physics'],
'ccpp/physics/physics/gcm_shoc.F90' : ['physics'],
'ccpp/physics/physics/get_prs_fv3.F90' : ['physics'],
'ccpp/physics/physics/gfdl_cloud_microphys.F90' : ['physics'],
'ccpp/physics/physics/gscond.f' : ['physics'],
'ccpp/physics/physics/gwdc.f' : ['physics'],
'ccpp/physics/physics/gwdps.f' : ['physics'],
'ccpp/physics/physics/h2ophys.f' : ['physics'],
Expand All @@ -122,14 +129,20 @@
'ccpp/physics/physics/cu_gf_driver.F90' : ['physics'],
'ccpp/physics/physics/cu_gf_driver_post.F90' : ['physics'],
'ccpp/physics/physics/moninedmf.f' : ['physics'],
'ccpp/physics/physics/moninshoc.f' : ['physics'],
'ccpp/physics/physics/satmedmfvdif.F' : ['physics'],
'ccpp/physics/physics/shinhongvdif.F90' : ['physics'],
'ccpp/physics/physics/ysuvdif.F90' : ['physics'],
'ccpp/physics/physics/module_MYNNPBL_wrapper.F90' : ['physics'],
'ccpp/physics/physics/module_MYNNSFC_wrapper.F90' : ['physics'],
'ccpp/physics/physics/module_MYNNrad_pre.F90' : ['physics'],
'ccpp/physics/physics/module_MYNNrad_post.F90' : ['physics'],
'ccpp/physics/physics/mp_thompson_pre.F90' : ['physics'],
'ccpp/physics/physics/mp_thompson.F90' : ['physics'],
'ccpp/physics/physics/mp_thompson_post.F90' : ['physics'],
'ccpp/physics/physics/ozphys.f' : ['physics'],
'ccpp/physics/physics/ozphys_2015.f' : ['physics'],
'ccpp/physics/physics/precpd.f' : ['physics'],
'ccpp/physics/physics/radlw_main.f' : ['physics'],
'ccpp/physics/physics/radsw_main.f' : ['physics'],
'ccpp/physics/physics/rayleigh_damp.f' : ['physics'],
Expand Down Expand Up @@ -175,31 +188,31 @@
# or a list of standard_names: [ 'var1', 'var3' ].
OPTIONAL_ARGUMENTS = {
'rrtmg_sw' : {
'rrtmg_sw_run' : [
'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
'components_of_surface_downward_shortwave_fluxes',
'cloud_liquid_water_path',
'mean_effective_radius_for_liquid_cloud',
'cloud_ice_water_path',
'mean_effective_radius_for_ice_cloud',
'cloud_rain_water_path',
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
],
},
'rrtmg_lw' : {
'rrtmg_lw_run' : [
'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
'cloud_liquid_water_path',
'mean_effective_radius_for_liquid_cloud',
'cloud_ice_water_path',
'mean_effective_radius_for_ice_cloud',
'cloud_rain_water_path',
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
],
'rrtmg_sw_run' : [
'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
'components_of_surface_downward_shortwave_fluxes',
'cloud_liquid_water_path',
'mean_effective_radius_for_liquid_cloud',
'cloud_ice_water_path',
'mean_effective_radius_for_ice_cloud',
'cloud_rain_water_path',
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
],
},
'rrtmg_lw' : {
'rrtmg_lw_run' : [
'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
'cloud_liquid_water_path',
'mean_effective_radius_for_liquid_cloud',
'cloud_ice_water_path',
'mean_effective_radius_for_ice_cloud',
'cloud_rain_water_path',
'mean_effective_radius_for_rain_drop',
'cloud_snow_water_path',
'mean_effective_radius_for_snow_flake',
],
},
'mp_thompson' : {
'mp_thompson_init' : [
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GSD_v0.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
do_shum = .false.
do_skeb = .false.
do_sfcperts = .false.
lsm = 2
lsm = 3
lsoil_lsm = 9
icloud_bl = 1
bl_mynn_tkeadvect = .true.
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_sice_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15_prescribed_surface.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_sice_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15plus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_sice_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_GFS_v15plus_prescribed_surface.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_sice_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_csawmg.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
<scheme>m_micro_post</scheme>
<scheme>cs_conv_aw_adj</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_sice_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_SCM_csawmg_prescribed_surface.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<scheme>m_micro_post</scheme>
<scheme>cs_conv_aw_adj</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>sfc_sice_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
Expand Down
Loading

0 comments on commit d73c208

Please sign in to comment.