RRTMGP in fv3atm

.gitmodules

@@ -8,5 +8,5 @@
 	branch = dtc/develop
 [submodule "ccpp/physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = dtc/develop
+	url = https://github.com/dustinswales/ccpp-physics
+	branch = rrtmgp-dev

ccpp/config/ccpp_prebuild_config.py

@@ -18,6 +18,11 @@
     'FV3/gfsphysics/CCPP_layer/CCPP_typedefs.F90',
     'FV3/gfsphysics/GFS_layer/GFS_typedefs.F90',
     'FV3/gfsphysics/CCPP_layer/CCPP_data.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90'
     ]
 
 TYPEDEFS_NEW_METADATA = {
@@ -56,6 +61,27 @@
         'GFS_stateout_type'     : 'GFS_Data(cdata%blk_no)%Stateout',
         'GFS_typedefs' : '',
         },
+    '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
@@ -147,6 +173,32 @@
     # derived data type definitions
     'FV3/gfsphysics/GFS_layer/GFS_typedefs.F90',
     'FV3/gfsphysics/CCPP_layer/CCPP_typedefs.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_reorder.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/kernels/mo_rrtmgp_util_reorder_kernels.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_fluxes.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_util_array.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_kind.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_lw.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_rte_sw.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/mo_compute_bc.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/mo_fluxes_byband.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/mo_fluxes_byband_kernels.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/mo_fluxes_bygpoint.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/mo_heating_rates.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
+    'FV3/ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90'
     ]
 
 # Add all physics scheme files relative to basedir
@@ -239,6 +291,26 @@
     'FV3/ccpp/physics/physics/mp_fer_hires.F90'                  : [ 'slow_physics' ],
     # for testing the <init> and <finalize> sections
     'FV3/ccpp/physics/physics/GFS_suite_init_finalize_test.F90'  : [ 'slow_physics' ],
+    # RRTMGP                                                                                                                                                        
+    'FV3/ccpp/physics/physics/rrtmg_lw_cloud_optics.F90'                                    : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmg_sw_cloud_optics.F90'                                    : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_aux.F90'                                               : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_lw_gas_optics.F90'                                     : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90'                                   : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_sw_gas_optics.F90'                                     : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90'                                   : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90'                                 : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_lw_rte.F90'                                            : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90'                                 : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_sw_rte.F90'                                            : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90'                                 : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90'                                 : ['slow_physics'],
+    'FV3/ccpp/physics/physics/GFS_rrtmgp_setup.F90'                                         : ['slow_physics'],
+    'FV3/ccpp/physics/physics/GFS_rrtmgp_pre.F90'                                           : ['slow_physics'],
+    'FV3/ccpp/physics/physics/rrtmgp_lw_pre.F90'                                            : ['slow_physics'],
+    'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90'                                        : ['slow_physics'],
+    'FV3/ccpp/physics/physics/GFS_rrtmgp_lw_post.F90'                                       : ['slow_physics'],
+    'FV3/ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'                                       : ['slow_physics'],
     }
 
 # Default build dir, relative to current working directory,
@@ -274,6 +346,41 @@
 # if no entry is made here. Possible values are: 'all', 'none',
 # or a list of standard_names: [ 'var1', 'var3' ].
 OPTIONAL_ARGUMENTS = {
+    'rrtmgp_sw_rte' : {
+         'rrtmgp_sw_rte_run' : [
+             'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
+             'components_of_surface_downward_shortwave_fluxes',
+             'sw_fluxes_sfc',
+             'sw_fluxes_toa',
+             ],
+         },
+    'GFS_rrtmgp_sw_post' : {
+         'GFS_rrtmgp_sw_post_run' : [
+             'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
+             'components_of_surface_downward_shortwave_fluxes',
+             'sw_fluxes_sfc',
+             'sw_fluxes_toa',
+             ],
+         },
+    'rrtmgp_lw_rte' : {
+         'rrtmgp_lw_rte_run' : [
+             'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
+             'lw_fluxes_sfc',
+             'lw_fluxes_toa',
+             ],
+        },
+    'GFS_rrtmgp_lw_post' : {
+         'GFS_rrtmgp_lw_post_run' : [
+             'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
+             'lw_fluxes_sfc',
+             'lw_fluxes_toa',
+             ],
+         },
+    'GFS_rrtmgp_post' : {
+         'GFS_rrtmgp_post_run' : [
+             'components_of_surface_downward_shortwave_fluxes',
+             ],
+         },
     'rrtmg_sw' : {
         'rrtmg_sw_run' : [
             'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',

ccpp/suites/suite_FV3_GFS_2017_RRTMGP.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_GFS_2017_RRTMGP" lib="ccppphys" ver="3">
+  <!-- <init></init> -->
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmgp_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmgp_pre</scheme>
+      <scheme>GFS_rrtmgp_sw_pre</scheme>
+      <scheme>rrtmgp_sw_gas_optics</scheme>
+      <scheme>rrtmgp_sw_aerosol_optics</scheme>
+      <scheme>rrtmgp_sw_cloud_optics</scheme>
+      <scheme>rrtmgp_sw_cloud_sampling</scheme>
+      <scheme>rrtmgp_sw_rte</scheme>
+      <scheme>GFS_rrtmgp_sw_post</scheme>
+      <scheme>rrtmgp_lw_pre</scheme>
+      <scheme>rrtmgp_lw_gas_optics</scheme>
+      <scheme>rrtmgp_lw_aerosol_optics</scheme>
+      <scheme>rrtmgp_lw_cloud_optics</scheme>
+      <scheme>rrtmgp_lw_cloud_sampling</scheme>
+      <scheme>rrtmgp_lw_rte</scheme>
+      <scheme>GFS_rrtmgp_lw_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>sfc_diff</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_nst_pre</scheme>
+      <scheme>sfc_nst</scheme>
+      <scheme>sfc_nst_post</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>dcyc2t3_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>hedmf</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>cires_ugwp</scheme>
+      <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>rayleigh_damp</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>samfdeepcnv</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>samfshalcnv</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>cnvc90</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>zhaocarr_gscond</scheme>
+      <scheme>zhaocarr_precpd</scheme>
+      <scheme>GFS_MP_generic_post</scheme>
+      <scheme>maximum_hourly_diagnostics</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>