Ccpp release 3 work

.gitignore

@@ -5,3 +5,5 @@ scm/bin/*
 *.pyc
 .metadata
 non-tracked_files/
+scm/data/GFS_physics_data/qr_acr*.dat
+scm/data/GFS_physics_data/freezeH2O.dat

ccpp/config/ccpp_prebuild_config.py

@@ -24,7 +24,7 @@
     'ccpp/physics/physics/GFDL_parse_tracers.F90',
     'ccpp/physics/physics/aer_cloud.F',
     'ccpp/physics/physics/aerclm_def.F',
-    #'ccpp/physics/physics/aerinterp.F90',
+    'ccpp/physics/physics/aerinterp.F90',
     'ccpp/physics/physics/calpreciptype.f90',
     'ccpp/physics/physics/cldwat2m_micro.F',
     'ccpp/physics/physics/cldmacro.F',
@@ -35,7 +35,7 @@
     'ccpp/physics/physics/h2o_def.f',
     'ccpp/physics/physics/h2ointerp.f90',
     'ccpp/physics/physics/iccn_def.F',
-    #'ccpp/physics/physics/iccninterp.F90',
+    'ccpp/physics/physics/iccninterp.F90',
     'ccpp/physics/physics/iounitdef.f',
     'ccpp/physics/physics/machine.F',
     'ccpp/physics/physics/mersenne_twister.f',
@@ -44,20 +44,22 @@
     'ccpp/physics/physics/micro_mg2_0.F90',
     'ccpp/physics/physics/micro_mg3_0.F90',
     'ccpp/physics/physics/module_bfmicrophysics.f',
+    'ccpp/physics/physics/multi_gases.F90',
     'ccpp/physics/physics/module_gfdl_cloud_microphys.F90',
     'ccpp/physics/physics/module_nst_model.f90',
     'ccpp/physics/physics/module_nst_parameters.f90',
     'ccpp/physics/physics/module_nst_water_prop.f90',
-    'ccpp/physics/physics/module_mp_thompson_hrrr_radar.F90',
-    'ccpp/physics/physics/module_mp_thompson_hrrr.F90',
+    'ccpp/physics/physics/module_mp_radar.F90',
+    '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',
     'ccpp/physics/physics/num_parthds.F',
-    'ccpp/physics/physics/ozinterp.f90',
     'ccpp/physics/physics/ozne_def.f',
+    'ccpp/physics/physics/ozinterp.f90',
     'ccpp/physics/physics/physcons.F90',
     'ccpp/physics/physics/physparam.f',
     'ccpp/physics/physics/radcons.f90',
@@ -72,8 +74,8 @@
     'ccpp/physics/physics/radsw_param.f',
     'ccpp/physics/physics/rascnvv2.f',
     'ccpp/physics/physics/sfcsub.F',
-    'ccpp/physics/physics/set_soilveg.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',
@@ -84,75 +86,81 @@
     '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',
-    'scm/src/CCPP_typedefs.F90'
+    'scm/src/GFS_typedefs.F90'
 ]
 
 # Add all physics scheme files relative to basedir
 SCHEME_FILES = {
     # Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ];
     # current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the
     # suite definition file have to belong to the same physics set
-    'ccpp/physics/physics/GFS_DCNV_generic.F90'         : ['physics'],
-    'ccpp/physics/physics/GFS_MP_generic.F90'           : ['physics'],
-    'ccpp/physics/physics/GFS_PBL_generic.F90'          : ['physics'],
-    'ccpp/physics/physics/GFS_SCNV_generic.F90'         : ['physics'],
-    'ccpp/physics/physics/GFS_phys_time_vary.scm.F90'   : ['physics'],
-    'ccpp/physics/physics/GFS_rad_time_vary.scm.F90'    : ['physics'],
-    'ccpp/physics/physics/GFS_rrtmg_post.F90'           : ['physics'],
-    'ccpp/physics/physics/GFS_rrtmg_pre.F90'            : ['physics'],
-    'ccpp/physics/physics/GFS_rrtmg_setup.F90'          : ['physics'],
-    'ccpp/physics/physics/GFS_suite_interstitial.F90'   : ['physics'],
-    'ccpp/physics/physics/GFS_surface_generic.F90'      : ['physics'],
-    'ccpp/physics/physics/GFS_surface_loop_control.F90' : ['physics'],
-    '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'],
-    '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'],
-    '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'],
-    'ccpp/physics/physics/moninedmf.f'                  : ['physics'],
-    'ccpp/physics/physics/moninshoc.f'                  : ['physics'],
-    'ccpp/physics/physics/mp_thompson_hrrr_pre.F90'     : ['physics'],
-    'ccpp/physics/physics/mp_thompson_hrrr.F90'         : ['physics'],
-    'ccpp/physics/physics/mp_thompson_hrrr_post.F90'    : ['physics'],
-    'ccpp/physics/physics/satmedmfvdif.F'               : ['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/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'],
-    'ccpp/physics/physics/rrtmg_lw_post.F90'            : ['physics'],
-    'ccpp/physics/physics/rrtmg_lw_pre.F90'             : ['physics'],
-    'ccpp/physics/physics/rrtmg_sw_post.F90'            : ['physics'],
-    'ccpp/physics/physics/rrtmg_sw_pre.F90'             : ['physics'],
-    'ccpp/physics/physics/sfc_diag.f'                   : ['physics'],
-    'ccpp/physics/physics/sfc_diag_post.F90'            : ['physics'],
-    'ccpp/physics/physics/sfc_diff.f'                   : ['physics'],
-    'ccpp/physics/physics/sfc_drv.f'                    : ['physics'],
-    'ccpp/physics/physics/sfc_drv_ruc.F90'              : ['physics'],
-    'ccpp/physics/physics/sfc_nst.f'                    : ['physics'],
-    'ccpp/physics/physics/sfc_ocean.F'                  : ['physics'],
-    'ccpp/physics/physics/sfc_sice.f'                   : ['physics'],
-    'ccpp/physics/physics/gmtb_scm_sfc_flux_spec.F90'   : ['physics'],
+    'ccpp/physics/physics/GFS_DCNV_generic.F90'             : ['physics'],
+    'ccpp/physics/physics/GFS_MP_generic.F90'               : ['physics'],
+    'ccpp/physics/physics/GFS_PBL_generic.F90'              : ['physics'],
+    'ccpp/physics/physics/GFS_SCNV_generic.F90'             : ['physics'],
+    'ccpp/physics/physics/GFS_phys_time_vary.scm.F90'       : ['physics'],
+    'ccpp/physics/physics/GFS_rad_time_vary.scm.F90'        : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmg_post.F90'               : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmg_pre.F90'                : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmg_setup.F90'              : ['physics'],
+    'ccpp/physics/physics/GFS_suite_interstitial.F90'       : ['physics'],
+    'ccpp/physics/physics/GFS_surface_generic.F90'          : ['physics'],
+    'ccpp/physics/physics/GFS_surface_composites.F90'       : ['physics'],
+    'ccpp/physics/physics/GFS_surface_loop_control.F90'     : ['physics'],
+    '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/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'],
+    'ccpp/physics/physics/samfdeepcnv.f'                    : ['physics'],
+    'ccpp/physics/physics/samfshalcnv.f'                    : ['physics'],
+    'ccpp/physics/physics/maximum_hourly_diagnostics.F90'   : ['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'],
+    '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'],
+    'ccpp/physics/physics/rrtmg_lw_post.F90'                : ['physics'],
+    'ccpp/physics/physics/rrtmg_lw_pre.F90'                 : ['physics'],
+    'ccpp/physics/physics/rrtmg_sw_post.F90'                : ['physics'],
+    'ccpp/physics/physics/rrtmg_sw_pre.F90'                 : ['physics'],
+    'ccpp/physics/physics/sfc_diag.f'                       : ['physics'],
+    'ccpp/physics/physics/sfc_diag_post.F90'                : ['physics'],
+    'ccpp/physics/physics/sfc_drv_ruc.F90'                  : ['physics'],
+    'ccpp/physics/physics/sfc_diff.f'                       : ['physics'],
+    'ccpp/physics/physics/sfc_drv.f'                        : ['physics'],
+    'ccpp/physics/physics/sfc_nst.f'                        : ['physics'],
+    'ccpp/physics/physics/sfc_ocean.F'                      : ['physics'],
+    'ccpp/physics/physics/sfc_sice.f'                       : ['physics'],
+    'ccpp/physics/physics/gmtb_scm_sfc_flux_spec.F90'       : ['physics'],
     }
 
 # Auto-generated makefile/cmakefile snippets that contain all schemes
@@ -172,6 +180,9 @@
 # Directory where to put all auto-generated physics caps
 CAPS_DIR = 'ccpp/physics/physics'
 
+# Directory where the suite definition files are stored
+SUITES_DIR = 'ccpp/suites'
+
 # Optional arguments - only required for schemes that use
 # optional arguments. ccpp_prebuild.py will throw an exception
 # if it encounters a scheme subroutine with optional arguments
@@ -205,14 +216,14 @@
              'mean_effective_radius_for_snow_flake',
              ],
         },
-    'mp_thompson_hrrr' : {
-        'mp_thompson_hrrr_init' : [
-            'tendency_of_water_friendly_aerosols_at_surface',
-            'tendency_of_ice_friendly_aerosols_at_surface',
+    'mp_thompson' : {
+        'mp_thompson_init' : [
             'water_friendly_aerosol_number_concentration',
             'ice_friendly_aerosol_number_concentration',
+            'tendency_of_water_friendly_aerosols_at_surface',
+            'tendency_of_ice_friendly_aerosols_at_surface',
             ],
-        'mp_thompson_hrrr_run' : [
+        'mp_thompson_run' : [
             'cloud_droplet_number_concentration_updated_by_physics',
             'water_friendly_aerosol_number_concentration_updated_by_physics',
             'ice_friendly_aerosol_number_concentration_updated_by_physics',
@@ -223,17 +234,15 @@
             'mean_effective_radius_for_snow_flake',
             ],
         },
-    'mp_thompson_hrrr_pre' : {
-        'mp_thompson_hrrr_pre_run' : [
+    'mp_thompson_pre' : {
+        'mp_thompson_pre_run' : [
+            'cloud_droplet_number_concentration_updated_by_physics',
             'water_friendly_aerosol_number_concentration_updated_by_physics',
             'ice_friendly_aerosol_number_concentration_updated_by_physics',
             'tendency_of_water_friendly_aerosols_at_surface',
             'tendency_of_ice_friendly_aerosols_at_surface',
             ],
         },
-    'memcheck' : {
-        'memcheck_run' : [ 'mpi_root' ],
-        },
     #'subroutine_name_1' : 'all',
     #'subroutine_name_2' : 'none',
     #'subroutine_name_2' : [ 'var1', 'var3'],

scm/etc/case_config/input_namelists/input_fv3_cpt.nml → ccpp/physics_namelists/input_CPT_v0.nml

@@ -2,7 +2,6 @@
        fhzero         = 6.
        ldiag3d        = .true.
        fhcyc          = 24.
-       nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
        crtrh          = 0.93,0.90,0.95
@@ -24,12 +23,13 @@
        shal_cnv       = .true.
        cal_pre        = .false.
        redrag         = .true.
-       dspheat        = .false.
+       dspheat        = .true.
        hybedmf        = .true.
        satmedmf       = .false.
+       lheatstrg      = .false.
        random_clds    = .true.
        trans_trac     = .true.
-       cnvcld         = .false.
+       cnvcld         = .true.
        imfshalcnv     = 2
        imfdeepcnv     = -1
        cdmbgwd        = 3.5,0.25
@@ -38,18 +38,19 @@
        isot           = 1
        oz_phys        = .false.
        oz_phys_2015   = .true.
-       debug          = .true.
+       debug          = .false.
        ras            = .false.
        cscnv          = .true.
        do_shoc        = .false.
-       shoc_parm      = 7000.0,1.0,2.0,0.7,-999.0
        do_aw          = .true.
        shoc_cld       = .false.
        h2o_phys       = .true.
        shcnvcw        = .false.
        xkzm_h         = 0.5
        xkzm_m         = 0.5
        xkzm_s         = 1.0
+       nstf_name      = 2,1,1,0,5
+       nst_anl        = .true.
        ccwf           = 1.0,1.0
        dlqf           = 0.25,0.05
        mg_dcs         = 200.0
@@ -65,13 +66,15 @@
        mg_do_ice_gmao = .false.
        mg_do_liq_liu  = .true.
        cs_parm        = 8.0,4.0,1.0e3,3.5e3,20.0,1.0,0.0,1.0,0.6,0.0
+       shoc_parm      = 7000.0,1.0,2.0,0.7,-999.0
        ctei_rm        = 0.60,0.23
        max_lon        = 8000
        max_lat        = 4000
        rhcmax         = 0.9999999
        effr_in        = .true.
-
-       nstf_name      = 2,1,1,0,5
+       ltaerosol      = .false.
+       lradar         = .false.
+       cplflx         = .false.
        iau_delthrs    = 6
        iaufhrs        = 30
        iau_inc_files  = "''"

scm/etc/case_config/input_namelists/input_fv3_gfdlmp.nml → ccpp/physics_namelists/input_GFS_v15.nml

@@ -26,6 +26,11 @@
        dspheat        = .true.
        hybedmf        = .true.
        satmedmf       = .false.
+       shinhong       = .false.
+       do_ysu         = .false.
+       lheatstrg      = .false.
+       lgfdlmprad     = .false.
+       effr_in        = .false.
        random_clds    = .false.
        trans_trac     = .false.
        cnvcld         = .true.
@@ -36,6 +41,9 @@
        ivegsrc        = 1
        isot           = 1
        debug          = .false.
+       oz_phys        = .false.
+       oz_phys_2015   = .true.
+       h2o_phys       = .true.
        nstf_name      = 2,1,1,0,5
        xkzminv        = 0.3
        xkzm_m         = 1.0

scm/etc/case_config/input_namelists/input_fv3_suite2.nml → ccpp/physics_namelists/input_GFS_v15plus.nml

@@ -26,6 +26,11 @@
        dspheat        = .true.
        hybedmf        = .false.
        satmedmf       = .true.
+       shinhong       = .false.
+       do_ysu         = .false.
+       lheatstrg      = .false.
+       lgfdlmprad     = .false.
+       effr_in        = .false.
        random_clds    = .false.
        trans_trac     = .false.
        cnvcld         = .true.
@@ -36,6 +41,9 @@
        ivegsrc        = 1
        isot           = 1
        debug          = .false.
+       oz_phys        = .false.
+       oz_phys_2015   = .true.
+       h2o_phys       = .true.
        nstf_name      = 2,1,1,0,5
        xkzminv        = 0.3
        xkzm_m         = 1.0