transfer v5 release changes to master

NCAR · Mar 5, 2021 · 042c0ba · 042c0ba
1 parent 71d1bd1
commit 042c0ba
Show file tree

Hide file tree

Showing 120 changed files with 1,703 additions and 6,262 deletions.
diff --git a/README.md b/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
diff --git a/ccpp/config/ccpp_prebuild_config.py b/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'       ,

diff --git a/ccpp/physics_namelists/input_RRFS_v1beta.nml → .../physics_namelists/input_RRFS_v1alpha.nml b/ccpp/physics_namelists/input_RRFS_v1beta.nml → .../physics_namelists/input_RRFS_v1alpha.nml
@@ -1,38 +1,26 @@
-&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_sfcperts = .false.
     do_shum = .false.
     do_skeb = .false.
     do_sppt = .false.
     dspheat = .true.
+    effr_in = .true.
     fhcyc = 0.0
     fhlwr = 1200.0
     fhswr = 1200.0
-    fhzero = 0.16667
+    fhzero = 1.0
     h2o_phys = .true.
     hybedmf = .false.
     iaer = 111
@@ -46,35 +34,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
 /
diff --git a/ccpp/suites/suite_HAFS_v0_hwrf.xml b/ccpp/suites/suite_HAFS_v0_hwrf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="HAFS_v0_hwrf" version="1">
+<suite name="HAFS_v0_hwrf" version="5">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="HAFS_v0_hwrf_ps" version="1">
+<suite name="HAFS_v0_hwrf_ps" version="5">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -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>

diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="HAFS_v0_hwrf_thompson" version="1">
+<suite name="HAFS_v0_hwrf_thompson" version="5">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="HAFS_v0_hwrf_thompson_ps" version="1">
+<suite name="HAFS_v0_hwrf_thompson_ps" version="5">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -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>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2.xml b/ccpp/suites/suite_SCM_GFS_v15p2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2" version="1">
+<suite name="SCM_GFS_v15p2" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_ACM_ps" version="1">
+<suite name="SCM_GFS_v15p2_ACM_ps" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
@@ -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>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml b/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_FA" version="1">
+<suite name="SCM_GFS_v15p2_FA" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_MYJ" version="1">
+<suite name="SCM_GFS_v15p2_MYJ" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_RRTMGP" version="1">
+<suite name="SCM_GFS_v15p2_RRTMGP" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_RRTMGP_ps" version="1">
+<suite name="SCM_GFS_v15p2_RRTMGP_ps" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
@@ -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>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_YSU_ps" version="1">
+<suite name="SCM_GFS_v15p2_YSU_ps" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
@@ -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>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_no_nsst" version="1">
+<suite name="SCM_GFS_v15p2_no_nsst" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_no_nsst_ps" version="1">
+<suite name="SCM_GFS_v15p2_no_nsst_ps" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
@@ -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>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml b/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_noahmp" version="1">
+<suite name="SCM_GFS_v15p2_noahmp" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_ps" version="1">
+<suite name="SCM_GFS_v15p2_ps" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
@@ -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>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v15p2_saYSU_ps" version="1">
+<suite name="SCM_GFS_v15p2_saYSU_ps" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>
@@ -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>

diff --git a/ccpp/suites/suite_SCM_GFS_v16.xml b/ccpp/suites/suite_SCM_GFS_v16.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16" version="1">
+<suite name="SCM_GFS_v16" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml b/ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16_RRTMGP" version="1">
+<suite name="SCM_GFS_v16_RRTMGP" version="5">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>