From 7d0de3c908be7a3ab4bcd44cc6524c98b9e1d0e1 Mon Sep 17 00:00:00 2001 From: climbfuji Date: Mon, 5 Nov 2018 14:14:31 -0700 Subject: [PATCH 1/2] scripts/ccpp_prebuild_config_FV3.py: add Morrison-Gettelman microphysics and Arakawa-Wu adjustment schemes for FV3 --- scripts/ccpp_prebuild_config_FV3.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/ccpp_prebuild_config_FV3.py b/scripts/ccpp_prebuild_config_FV3.py index 50b46d9c..4dbc49bb 100755 --- a/scripts/ccpp_prebuild_config_FV3.py +++ b/scripts/ccpp_prebuild_config_FV3.py @@ -19,7 +19,10 @@ # rules stipulate that dependencies are not shared between the schemes! SCHEME_FILES_DEPENDENCIES = [ 'ccpp/physics/physics/GFDL_parse_tracers.F90', + 'ccpp/physics/physics/aer_cloud.F', 'ccpp/physics/physics/calpreciptype.f90', + 'ccpp/physics/physics/cldwat2m_micro.F', + 'ccpp/physics/physics/cldmacro.F', 'ccpp/physics/physics/date_def.f', 'ccpp/physics/physics/funcphys.f90', 'ccpp/physics/physics/gcycle.F90', @@ -31,6 +34,9 @@ 'ccpp/physics/physics/machine.F', # DH should this be in FV3/gfsphysics/physics/physparam.f ? 'ccpp/physics/physics/mersenne_twister.f', 'ccpp/physics/physics/mfpbl.f', + 'ccpp/physics/physics/micro_mg_utils.F90', + 'ccpp/physics/physics/micro_mg2_0.F90', + 'ccpp/physics/physics/micro_mg3_0.F90', 'ccpp/physics/physics/module_bfmicrophysics.f', 'ccpp/physics/physics/module_nst_model.f90', 'ccpp/physics/physics/module_nst_parameters.f90', @@ -65,6 +71,7 @@ 'ccpp/physics/physics/tridi.f', 'ccpp/physics/physics/tridi2t3.f', 'ccpp/physics/physics/wam_f107_kp_mod.f90', + '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', @@ -123,6 +130,7 @@ 'ccpp/physics/physics/GFS_time_vary_pre.fv3.F90' : [ 'slow_physics' ], 'ccpp/physics/physics/cnvc90.f' : [ 'slow_physics' ], 'ccpp/physics/physics/cs_conv.F90' : [ 'slow_physics' ], + 'ccpp/physics/physics/cs_conv_aw_adj.F90' : [ 'slow_physics' ], 'ccpp/physics/physics/dcyc2.f' : [ 'slow_physics' ], 'ccpp/physics/physics/gcm_shoc.F90' : [ 'slow_physics' ], 'ccpp/physics/physics/get_prs_fv3.F90' : [ 'slow_physics' ], @@ -135,6 +143,8 @@ 'ccpp/physics/physics/h2ophys.f' : [ 'slow_physics' ], 'ccpp/physics/physics/samfdeepcnv.f' : [ 'slow_physics' ], 'ccpp/physics/physics/samfshalcnv.f' : [ 'slow_physics' ], + 'ccpp/physics/physics/m_micro.F90' : [ 'slow_physics' ], + 'ccpp/physics/physics/m_micro_interstitial.F90' : [ 'slow_physics' ], 'ccpp/physics/physics/cu_gf_driver_pre.F90' : [ 'slow_physics' ], 'ccpp/physics/physics/cu_gf_driver.F90' : [ 'slow_physics' ], 'ccpp/physics/physics/cu_gf_driver_post.F90' : [ 'slow_physics' ], From 0e84f3d9bde43dafeedec5a8c2841b1c252f9d00 Mon Sep 17 00:00:00 2001 From: climbfuji Date: Mon, 5 Nov 2018 14:14:45 -0700 Subject: [PATCH 2/2] scripts/ccpp_prebuild_config_SCM.py: add Morrison-Gettelman microphysics and Arakawa-Wu adjustment schemes for SCM --- scripts/ccpp_prebuild_config_SCM.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/ccpp_prebuild_config_SCM.py b/scripts/ccpp_prebuild_config_SCM.py index 573283ba..91afd350 100755 --- a/scripts/ccpp_prebuild_config_SCM.py +++ b/scripts/ccpp_prebuild_config_SCM.py @@ -21,6 +21,7 @@ 'ccpp/physics/physics/aer_cloud.F', 'ccpp/physics/physics/calpreciptype.f90', 'ccpp/physics/physics/cldwat2m_micro.F', + 'ccpp/physics/physics/cldmacro.F', 'ccpp/physics/physics/date_def.f', 'ccpp/physics/physics/funcphys.f90', 'ccpp/physics/physics/gfs_phy_tracer_config.f', @@ -31,6 +32,9 @@ 'ccpp/physics/physics/machine.F', 'ccpp/physics/physics/mersenne_twister.f', 'ccpp/physics/physics/mfpbl.f', + 'ccpp/physics/physics/micro_mg_utils.F90', + 'ccpp/physics/physics/micro_mg2_0.F90', + 'ccpp/physics/physics/micro_mg3_0.F90', 'ccpp/physics/physics/module_bfmicrophysics.f', 'ccpp/physics/physics/module_nst_model.f90', 'ccpp/physics/physics/module_nst_parameters.f90', @@ -86,6 +90,7 @@ 'ccpp/physics/physics/GFS_time_vary_pre.scm.F90' : ['physics'], '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/dcyc2.f' : ['physics'], 'ccpp/physics/physics/gcm_shoc.F90' : ['physics'], 'ccpp/physics/physics/get_prs_fv3.F90' : ['physics'], @@ -96,6 +101,8 @@ 'ccpp/physics/physics/h2ophys.f' : ['physics'], 'ccpp/physics/physics/samfdeepcnv.f' : ['physics'], 'ccpp/physics/physics/samfshalcnv.f' : ['physics'], + 'ccpp/physics/physics/m_micro.F90' : ['physics'], + 'ccpp/physics/physics/m_micro_interstitial.F90' : ['physics'], 'ccpp/physics/physics/cu_gf_driver_pre.F90' : ['physics'], 'ccpp/physics/physics/cu_gf_driver.F90' : ['physics'], 'ccpp/physics/physics/cu_gf_driver_post.F90' : ['physics'],