NCAR · grantfirl · May 4, 2020 · Sep 19, 2019 · Dec 4, 2019 · Dec 4, 2019
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ scm/bin/*
 non-tracked_files/
 scm/data/physics_input_data/qr_acr*.dat
 scm/data/physics_input_data/freezeH2O.dat
+scm/data/physics_input_data/CCN_ACTIVATE.BIN
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "ccpp-framework"]
 	path = ccpp/framework
 	url = https://github.com/NCAR/ccpp-framework
-	branch = master
+	branch = dtc/develop
 [submodule "ccpp-physics"]
 	path = ccpp/physics
 	url = https://github.com/NCAR/ccpp-physics
-	branch = master
+	branch = dtc/develop
diff --git a/README.md b/README.md
@@ -1,97 +1,3 @@
 # User's Guide
 
-A more complete User's Guide can be found at https://dtcenter.org/GMTB/v3.0/scm-ccpp-guide-v3.pdf. If the instructions in this README and the more complete User's Guide differ, the linked guide should be more up-to-date and accurate.
-
-This guide provides instructions for obtaining, compiling and running a simple
-case for the GMTB single column model (SCM). The SCM code calls CCPP-compliant
-physics schemes through the CCPP infrastructure code. As such, it requires the
-CCPP infrastructure code and physics code, both of which are included as git
-submodules within the SCM code. This package can be considered a simple example
-for an atmospheric model to interact with physics through the CCPP.
-
-## Prerequisite
-There are several utility libraries as part of the NCEPlibs package that must be installed prior to building the SCM.
-* bacio - Binary I/O Library
-* sp - Spectral Transformation Library
-* w3nco - GRIB decoder and encoder library
-
-These libraries are prebuilt on most NOAA machines using the Intel compiler. For those needing to build the libraries themselves, GMTB recommends using the source code from GitHub at https://github.com/NCAR/NCEPlibs.git, which includes build files for various compilers and machines using OpenMP flags and which are threadsafe. Instructions for installing NCEPlibs are included on the GitHub repository webpage, but for the sake of example, execute the following for obtaining and building from source in /usr/local/NCEPlibs on a Mac:
-1. `cd /usr/local/src`
-2. `git clone https://github.com/NCAR/NCEPlibs.git`
-3. `cd NCEPlibs`
-4. `./make_ncep_libs.sh -s macosx -c gnu -d /usr/local/NCEPlibs -o 1 -m 0`
-
-Note that the option `-m 0` can be used if MPI is not installed on the machine that is being used. The nemsio library will not be installed, however, since it requires MPI. Once NCEPlibs is built, the NCEPLIBS_DIR environment variable must be set to the location of the installation. For example, if NCEPlibs was installed in /usr/local/NCEPlibs, one would execute
-
-`export NCEPLIBS_DIR=/usr/local/NCEPlibs`
-
-If using Theia or Cheyenne HPC systems, this environment variable is automatically set to an appropriate installation of NCEPlibs on those machines through use of one of the setup scripts described below.
-
-## Obtaining Code
-
-For obtaining the last stable release, execute the following:
-
-1. Clone the source using:
-  * `git clone --recursive -b v3.0 https://github.com/NCAR/gmtb-scm`
-2. Change directory into the project.
-  * `cd gmtb-scm`
-
-For working with the development branches, after executing the steps above, check out the master branches of the repository (and submodules):
-
-1. `git checkout master`
-2. `cd ccpp/physics`
-3. `git checkout master`
-4. `cd ../framework`
-5. `git checkout master`
-6. `cd ../..`
-
-## Building and Compiling the SCM with CCPP
-1. Run the CCPP prebuild script to match required physics variables with those
-available from the dycore (SCM) and to generate physics caps and makefile
-segments.
-  * `./ccpp/framework/scripts/ccpp_prebuild.py --config=./ccpp/config/ccpp_prebuild_config.py`
-  Note: add `--debug` to see the full output of the script.
-2. Change directory to the top-level SCM directory.
-  * `cd scm`
-3. [Optional] Run the machine setup script if necessary. This script loads
-compiler modules (Fortran 2003-compliant), netCDF module, etc. and sets
-compiler environment variables.
-  * `source etc/Theia_setup_gnu.csh` (for csh) or `. etc/Theia_setup_gnu.sh` (for bash)
-  * `source etc/Theia_setup_intel.csh` (for csh) or `. etc/Theia_setup_intel.sh` (for bash)
-  * `source etc/Theia_setup_pgi.csh` (for csh) or `. etc/Theia_setup_pgi.sh` (for bash)
-  * `source etc/Cheyenne_setup_gnu.csh` (for csh) or `. etc/Cheyenne_setup_gnu.sh` (for bash)
-  * `source etc/Cheyenne_setup_intel.csh` (for csh) or `. etc/Cheyenne_setup_intel.sh` (for bash)
-  * `source etc/Cheyenne_setup_pgi.csh` (for csh) or `. etc/Cheyenne_setup_pgi.sh` (for bash)
-  * `source etc/UBUNTU_setup.csh` (for csh) or `. etc/UBUNTU_setup.sh` (for bash) if following the instructions in doc/README_UBUNTU.txt
-  * `source etc/CENTOS_setup.csh` (for csh) or `. etc/CENTOS_setup.sh` (for bash) if following the instructions in doc/README_CENTOS.txt
-  * `source etc/MACOSX_setup.csh` (for csh) or `. etc/MACOSX_setup.sh` (for bash) if following the instructions in doc/README_MACOSX.txt
-  * NOTE: The NETCDF environment variable must be set to the path of the netCDF installation that was compiled with the same compiler used in the following steps.
-4. Make a build directory and change into it.
-  * `mkdir bin && cd bin`
-5. Invoke cmake on the source code to build.
-  * `cmake ../src` (without threading/OpenMP)
-  * `cmake -DOPENMP=1 ../src` (with threading/OpenMP)
-  * `cmake -DCMAKE_BUILD_TYPE=Debug ../src` (debug mode)
-6. Compile. Add `VERBOSE=1` to obtain more information on the build process.
-  * `make`
-
-## Running the SCM with CCPP
-1. Run the SCM with a supplied case. The SCM will go through the time
- steps, applying forcing and calling the physics defined in the suite definition
- file.
-  * `.run_gmtb_scm.py -c CASE_NAME [-s SUITE_NAME] [-n PHYSICS_NAMELIST_PATH] [-g]`
-  * When invoking the run script, the only required argument is the name of the case to run. The case name used must match one of the case configuration files located in ../etc/case_config (without the .nml extension!). If specifying a suite other than the default, the suite name used must match the value of the suite name in one of the suite definition files located in ../../ccpp/suites, (e.g. `SCM_GFS_v15`). If specifying a namelist other than the default, the value must be an entire filename that exists in ../../ccpp/physics_namelists. The -g flag can be used to run the executable through the gdb debugger (assuming it is installed on the system).
-2. A netcdf output file is generated in the location specified in the case
-configuration file (is present), or in an output directory created by default in `bin` with the case name and suite name appended.
-
-## Running the SCM with FV3GFS initial conditions
-model initial conditions are needed to initialize the land surface in order to run with an interactive land model
-1. Prepare model initial conditions.
-  * `cd to scm/etc/scripts/`
-  modify path to files you can read in extract_FV3GFS_column_ic.py, this is set up for C96
-2. run extract_FV3GFS_column_ic.py, it will create fv3_model_point.nc in ../../data/processed_case_input/
-  * `./extract_FV3GFS_column_ic.py`
-3. cd to bin directory
-  * `cd ../../bin/`
-4. Run the SCM with the fv3_model_point case and C96 namelist
-  * `./run_gmtb_scm.py -c fv3_model_point -n input_GFS_v15_C96.nml`
+Please find the up-to-date User's Guide located in this repository in gmtb-scm/scm/doc/TechGuide/main.pdf
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -9,15 +9,22 @@
 
 HOST_MODEL_IDENTIFIER = "SCM"
 
-# Add all files with metadata tables on the host model side,
-# relative to basedir = top-level directory of host model
+# Add all files with metadata tables on the host model side and in CCPP,
+# relative to basedir = top-level directory of host model. This includes
+# kind and type definitions used in CCPP physics.
 VARIABLE_DEFINITION_FILES = [
     'ccpp/physics/physics/machine.F',
     'ccpp/physics/physics/radsw_param.f',
     'ccpp/physics/physics/radlw_param.f',
     'scm/src/GFS_typedefs.F90',
-    'scm/src/gmtb_scm_type_defs.f90',
-    'scm/src/gmtb_scm_physical_constants.f90'
+    'scm/src/gmtb_scm_kinds.F90',
+    'scm/src/gmtb_scm_type_defs.F90',
+    'scm/src/gmtb_scm_physical_constants.F90',
+    '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',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90'
     ]
 
 TYPEDEFS_NEW_METADATA = {
@@ -55,6 +62,27 @@
         'gmtb_scm_type_defs' : '',
         'physics_type' : 'physics',
         },
+   'mo_gas_concentrations' : {
+        'ty_gas_concs' : '',
+        'mo_gas_concentrations' : '',
+        },
+    'mo_gas_optics_rrtmgp' : {
+        'ty_gas_optics_rrtmgp' : '',
+        'mo_gas_optics_rrtmgp' : '',
+        },
+    'mo_optical_props' : {
+        'ty_optical_props_1scl' : '',
+        'ty_optical_props_2str' : '',
+        'mo_optical_props' : '',
+        },
+    'mo_cloud_optics' : {
+        'ty_cloud_optics' : '',
+        'mo_cloud_optics' : '',
+        },
+    'mo_source_functions' : {
+        'ty_source_func_lw' : '',
+        'mo_source_functions' : '',
+        },
     }
 
 # Add all physics scheme dependencies relative to basedir - note that the CCPP
@@ -142,10 +170,38 @@
     'ccpp/physics/physics/namelist_soilveg_ruc.F90',
     'ccpp/physics/physics/set_soilveg_ruc.F90',
     'ccpp/physics/physics/module_soil_pre.F90',
+    # RRTMGP
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_reorder.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rrtmgp/kernels/mo_rrtmgp_util_reorder_kernels.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_fluxes.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_util_array.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_kind.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_lw.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_sw.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90',
+    'ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/mo_compute_bc.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/mo_fluxes_byband.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/mo_fluxes_byband_kernels.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/mo_fluxes_bygpoint.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/mo_heating_rates.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
+    'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90', 
     # derived data type definitions
     'scm/src/GFS_typedefs.F90',
-    'scm/src/gmtb_scm_kinds.f90',
-    'scm/src/gmtb_scm_type_defs.f90',
+    'scm/src/gmtb_scm_kinds.F90',
+    'scm/src/gmtb_scm_physical_constants.F90',
+    'scm/src/gmtb_scm_type_defs.F90',
 ]
 
 # Add all physics scheme files relative to basedir
@@ -233,12 +289,37 @@
     'ccpp/physics/physics/sfc_sice.f'                       : ['physics'],
     'ccpp/physics/physics/mp_fer_hires.F90'                 : ['physics'],
     'ccpp/physics/physics/gmtb_scm_sfc_flux_spec.F90'       : ['physics'],
+    # RRTMGP
+    'ccpp/physics/physics/rrtmg_lw_cloud_optics.F90'        : ['physics'],
+    'ccpp/physics/physics/rrtmg_sw_cloud_optics.F90'        : ['physics'],
+    'ccpp/physics/physics/rrtmgp_aux.F90'                   : ['physics'],
+    'ccpp/physics/physics/rrtmgp_lw_gas_optics.F90'         : ['physics'],
+    'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90'       : ['physics'],
+    'ccpp/physics/physics/rrtmgp_sw_gas_optics.F90'         : ['physics'],
+    'ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90'       : ['physics'],
+    'ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90'     : ['physics'],
+    'ccpp/physics/physics/rrtmgp_lw_rte.F90'                : ['physics'],
+    'ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90'     : ['physics'],
+    'ccpp/physics/physics/rrtmgp_sw_rte.F90'                : ['physics'],
+    'ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90'     : ['physics'],
+    'ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90'     : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmgp_setup.F90'             : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmgp_pre.F90'               : ['physics'],
+    'ccpp/physics/physics/rrtmgp_lw_pre.F90'                : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90'            : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmgp_lw_post.F90'           : ['physics'],
+    'ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'           : ['physics'],
     }
 
 # Default build dir, relative to current working directory,
 # if not specified as command-line argument
 DEFAULT_BUILD_DIR = 'scm/bin'
 
+# Auto-generated makefile/cmakefile snippets that contain all type definitions
+TYPEDEFS_MAKEFILE   = 'ccpp/physics/CCPP_TYPEDEFS.mk'
+TYPEDEFS_CMAKEFILE  = 'ccpp/physics/CCPP_TYPEDEFS.cmake'
+TYPEDEFS_SOURCEFILE = 'ccpp/physics/CCPP_TYPEDEFS.sh'
+
 # Auto-generated makefile/cmakefile snippets that contain all schemes
 SCHEMES_MAKEFILE = 'ccpp/physics/CCPP_SCHEMES.mk'
 SCHEMES_CMAKEFILE = 'ccpp/physics/CCPP_SCHEMES.cmake'
@@ -247,7 +328,7 @@
 # CCPP host cap in which to insert the ccpp_field_add statements;
 # determines the directory to place ccpp_{modules,fields}.inc
 TARGET_FILES = [
-    'scm/src/gmtb_scm.f90',
+    'scm/src/gmtb_scm.F90',
     ]
 
 # Auto-generated makefile/cmakefile snippets that contain all caps
@@ -269,7 +350,7 @@
 OPTIONAL_ARGUMENTS = {
     'rrtmg_sw' : {
         'rrtmg_sw_run' : [
-            'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
+            'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step_and_radiation_levels',
             'components_of_surface_downward_shortwave_fluxes',
             'cloud_liquid_water_path',
             'mean_effective_radius_for_liquid_cloud',
@@ -283,7 +364,7 @@
         },
     'rrtmg_lw' : {
         'rrtmg_lw_run' : [
-            'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
+            'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step_and_radiation_levels',
             'cloud_liquid_water_path',
             'mean_effective_radius_for_liquid_cloud',
             'cloud_ice_water_path',
@@ -328,6 +409,37 @@
             'rime_factor',
             ],
         },
+    'rrtmgp_sw_rte' : {
+         'rrtmgp_sw_rte_run' : [
+             'components_of_surface_downward_shortwave_fluxes',
+             'sw_fluxes_sfc',
+             'sw_fluxes_toa',
+             ],
+         },
+    'GFS_rrtmgp_sw_post' : {
+         'GFS_rrtmgp_sw_post_run' : [
+             'components_of_surface_downward_shortwave_fluxes',
+             'sw_fluxes_sfc',
+             'sw_fluxes_toa',
+             ],
+         },
+    'rrtmgp_lw_rte' : {
+         'rrtmgp_lw_rte_run' : [
+             'lw_fluxes_sfc',
+             'lw_fluxes_toa',
+             ],
+        },
+    'GFS_rrtmgp_lw_post' : {
+         'GFS_rrtmgp_lw_post_run' : [
+             'lw_fluxes_sfc',
+             'lw_fluxes_toa',
+             ],
+         },
+    'GFS_rrtmgp_post' : {
+         'GFS_rrtmgp_post_run' : [
+             'components_of_surface_downward_shortwave_fluxes',
+             ],
+         },
     #'subroutine_name_1' : 'all',
     #'subroutine_name_2' : 'none',
     #'subroutine_name_2' : [ 'var1', 'var3'],

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/physics_namelists/input_GFS_v15p2.nml b/ccpp/physics_namelists/input_GFS_v15p2.nml
@@ -1,11 +1,8 @@
 &gfs_physics_nml
        fhzero         = 6.
+       h2o_phys       = .true.
        ldiag3d        = .true.
-       ldiag_ugwp     = .false.
-       do_ugwp        = .false.
-       do_tofd        = .false.
        fhcyc          = 24.
-       nst_anl        = .true.
        use_ufo        = .true.
        pre_rad        = .false.
        ncld           = 5
@@ -15,7 +12,7 @@
        fhlwr          = 3600.
        ialb           = 1
        iems           = 1
-       IAER           = 111
+       iaer           = 111
        ico2           = 2
        isubc_sw       = 2
        isubc_lw       = 2
@@ -28,14 +25,6 @@
        redrag         = .true.
        dspheat        = .true.
        hybedmf        = .true.
-       satmedmf       = .false.
-       do_myjsfc      = .false.
-       do_myjpbl      = .false.
-       shinhong       = .false.
-       do_ysu         = .false.
-       lheatstrg      = .false.
-       lgfdlmprad     = .true.
-       effr_in        = .true.
        random_clds    = .false.
        trans_trac     = .true.
        cnvcld         = .true.
@@ -45,29 +34,15 @@
        prslrd0        = 0.
        ivegsrc        = 1
        isot           = 1
-       lsm            = 1
-       iopt_dveg      = 2
-       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.
-       h2o_phys       = .true.
        nstf_name      = 2,1,0,0,0
+       nst_anl        = .true.
        psautco        = 0.0008,0.0005
        prautco        = 0.00015,0.00015
-       xkzminv        = 0.3
-       xkzm_m         = 1.0
-       xkzm_h         = 1.0
+       lgfdlmprad     = .true.
+       effr_in        = .true.
        do_sppt        = .false.
        do_shum        = .false.
        do_skeb        = .false.
+18 −16		CMakeLists.txt
+1 −1		CODEOWNERS
+5 −5		schemes/check/ccpp_prebuild_config.py
+140 −29		scripts/ccpp_prebuild.py
+4 −3		scripts/common.py
+44 −2		scripts/conversion_tools/__init__.py
+8 −0		scripts/conversion_tools/unit_conversion.py
+3 −3		scripts/metadata_parser.py
+1 −1		scripts/metadata_table.py
+134 −9		scripts/mkcap.py
+2 −2		scripts/mkdoc.py
+175 −19		scripts/mkstatic.py
+16 −16		scripts/parse_tools/__init__.py
+1 −1		scripts/parse_tools/parse_checkers.py
+1 −1		scripts/parse_tools/parse_object.py
+5 −3		src/CMakeLists.txt