Merge pull request #1 from grantfirl/feature/setup_testing_gjf

Update feature/setup_testing to latest master

README.md

@@ -1,3 +1,3 @@
 # User's Guide
 
-Please find the up-to-date User's Guide located in this repository in gmtb-scm/scm/doc/TechGuide/main.pdf
+Please find the up-to-date User's Guide located in this repository in ccpp-scm/scm/doc/TechGuide/main.pdf

ccpp/config/ccpp_prebuild_config.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# CCPP prebuild config for GMTB Single Column Model (SCM)
+# CCPP prebuild config for CCPP Single Column Model (SCM)
 
 
 ###############################################################################
@@ -21,10 +21,10 @@
     'ccpp/physics/physics/ozne_def.f',
     'ccpp/physics/physics/radlw_param.f',
     'scm/src/GFS_typedefs.F90',
-    'scm/src/gmtb_scm_kinds.F90',
-    'scm/src/gmtb_scm_type_defs.F90',
-    'scm/src/gmtb_scm_physical_constants.F90',
-    'scm/src/gmtb_scm_utils.F90', #no definitions, but gmtb_scm_type_defs.F90 uses a module from this file
+    'scm/src/scm_kinds.F90',
+    'scm/src/scm_type_defs.F90',
+    'scm/src/scm_physical_constants.F90',
+    'scm/src/scm_utils.F90', #no definitions, but scm_type_defs.F90 uses a module from this file
     'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
     'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
     'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
@@ -60,11 +60,11 @@
         'GFS_stateout_type' : 'physics%Stateout',
         'GFS_typedefs' : '',
         },
-    'gmtb_scm_physical_constants' : {
-        'gmtb_scm_physical_constants' : '',
+    'scm_physical_constants' : {
+        'scm_physical_constants' : '',
         },
-    'gmtb_scm_type_defs' : {
-        'gmtb_scm_type_defs' : '',
+    'scm_type_defs' : {
+        'scm_type_defs' : '',
         'physics_type' : 'physics',
         },
    'mo_gas_concentrations' : {
@@ -184,7 +184,7 @@
     'ccpp/physics/physics/sfc_ocean.F'                      ,
     'ccpp/physics/physics/sfc_sice.f'                       ,
     'ccpp/physics/physics/mp_fer_hires.F90'                 ,
-    'ccpp/physics/physics/gmtb_scm_sfc_flux_spec.F90'       ,
+    'ccpp/physics/physics/scm_sfc_flux_spec.F90'            ,
     # RRTMGP
     'ccpp/physics/physics/rrtmgp_lw_gas_optics.F90'         ,
     'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90'       ,
@@ -288,13 +288,6 @@
             'tendency_of_ice_friendly_aerosols_at_surface',
             ],
         },
-    'mp_fer_hires' : {
-        'mp_fer_hires_init' : [
-            'fraction_of_ice_water_cloud',
-            'fraction_of_rain_water_cloud',
-            'rime_factor',
-            ],
-        },
     'rrtmgp_sw_rte' : {
          'rrtmgp_sw_rte_run' : [
              'components_of_surface_downward_shortwave_fluxes',

ccpp/physics_namelists/input_GFS_v16_ps.nml

@@ -0,0 +1,138 @@
+&gfs_physics_nml
+       fhzero         = 0.16667
+       h2o_phys       = .true.
+       ldiag3d        = .true.
+       qdiag3d        = .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           = 5111
+       icliq_sw       = 2
+       iovr           = 3
+       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      = .false.
+       random_clds    = .false.
+       trans_trac     = .true.
+       cnvcld         = .true.
+       imfshalcnv     = 2
+       imfdeepcnv     = 2
+       cdmbgwd        = 4.0,0.15,1.0,1.0
+       prslrd0        = 0.
+       ivegsrc        = 1
+       isot           = 1
+       lsoil          = 4
+       lsm            = 1
+       iopt_dveg      = 1
+       iopt_crs       = 1
+       iopt_btr       = 1
+       iopt_run       = 1
+       iopt_sfc       = 1
+       iopt_frz       = 1
+       iopt_inf       = 1
+       iopt_rad       = 1
+       iopt_alb       = 2
+       iopt_snf       = 4
+       iopt_tbot      = 2
+       iopt_stc       = 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.
+       ldiag_ugwp     = .false.
+       do_ugwp        = .false.
+       do_tofd        = .true.
+       do_sppt        = .false.
+       do_shum        = .false.
+       do_skeb        = .false.
+/
+
+&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.
+  reiflag = 2
+/
+
+&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      = 27
+/
+

ccpp/physics_namelists/input_RRFS_v1beta.nml → ccpp/physics_namelists/input_RRFS_v1alpha.nml

@@ -1,34 +1,21 @@
-&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 = 25
-/
-
 &gfs_physics_nml
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
     cal_pre = .false.
     cdmbgwd = 3.5,0.25
-    cnvcld = .true.
-    cnvgwd = .true.
+    cnvcld = .false.
+    cnvgwd = .false.
     cplflx = .false.
     debug = .false.
+    do_deep = .false.
     do_mynnedmf = .true.
-    do_mynnsfclay = .true.
+    do_mynnsfclay = .false.
     do_shum = .false.
     do_skeb = .false.
     do_sppt = .false.
     dspheat = .true.
+    effr_in = .true.
     fhcyc = 0.0
     fhlwr = 1200.0
     fhswr = 1200.0
@@ -46,35 +33,61 @@
     imfdeepcnv = -1
     imfshalcnv = -1
     imp_physics = 8
+    iopt_alb = 2
+    iopt_btr = 1
+    iopt_crs = 1
+    iopt_dveg = 2
+    iopt_frz = 1
+    iopt_inf = 1
+    iopt_rad = 1
+    iopt_run = 1
+    iopt_sfc = 1
+    iopt_snf = 4
+    iopt_stc = 1
+    iopt_tbot = 2
     isol = 2
     isot = 1
     isubc_lw = 2
     isubc_sw = 2
     ivegsrc = 1
     ldiag3d = .true.
-    qdiag3d = .true.
     lheatstrg = .false.
     lradar = .true.
     lsm = 2
     lsoil_lsm = 4
     ltaerosol = .true.
     lwhtr = .true.
     ncld = 5
+    nsradar_reset = 3600
     nst_anl = .true.
-    nstf_name = 2,1,1,0,5
+    nstf_name = 2,1,0,0,0
     oz_phys = .false.
     oz_phys_2015 = .true.
     pdfcld = .false.
     pre_rad = .false.
     prslrd0 = 0.0
+    qdiag3d = .true.
     random_clds = .false.
     redrag = .true.
     satmedmf = .false.
-    shal_cnv = .true.
+    shal_cnv = .false.
     swhtr = .true.
     trans_trac = .true.
-    ttendlim = 50.0
+    ttendlim = -999
     use_ufo = .true.
-    do_deep = .false.
-    effr_in = .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 = 25
 /

ccpp/suites/suite_HAFS_v0_hwrf_ps.xml

@@ -32,7 +32,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <scheme>hedmf</scheme>
       <scheme>GFS_PBL_generic_post</scheme>

ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml

@@ -34,7 +34,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <scheme>hedmf</scheme>
       <scheme>GFS_PBL_generic_post</scheme>

ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml

@@ -31,7 +31,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <!--<scheme>bl_acm</scheme>-->
       <scheme>GFS_PBL_generic_post</scheme>

ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml

@@ -40,7 +40,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <scheme>hedmf</scheme>
       <scheme>GFS_PBL_generic_post</scheme>

ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml

@@ -31,7 +31,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <scheme>ysuvdif</scheme>
       <scheme>GFS_PBL_generic_post</scheme>

ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml

@@ -31,7 +31,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <scheme>hedmf</scheme>
       <scheme>GFS_PBL_generic_post</scheme>

ccpp/suites/suite_SCM_GFS_v15p2_ps.xml

@@ -31,7 +31,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <scheme>hedmf</scheme>
       <scheme>GFS_PBL_generic_post</scheme>

ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml

@@ -31,7 +31,7 @@
       <scheme>GFS_surface_generic_pre</scheme>
       <scheme>dcyc2t3</scheme>
       <scheme>GFS_suite_interstitial_2</scheme>
-      <scheme>gmtb_scm_sfc_flux_spec</scheme>
+      <scheme>scm_sfc_flux_spec</scheme>
       <scheme>GFS_PBL_generic_pre</scheme>
       <scheme>shinhongvdif</scheme>
       <scheme>GFS_PBL_generic_post</scheme>