Reorganized RRTMGP aerosol optics.

climbfuji · May 24, 2021 · c323a06 · c323a06
1 parent dca609d
commit c323a06
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -191,10 +191,9 @@
     'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90',
     'ccpp/physics/physics/rrtmgp_sw_gas_optics.F90',
     'ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90',
-    'ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90',
+    'ccpp/physics/physics/GFS_rrtmgp_aerosol_optics.F90',
     'ccpp/physics/physics/rrtmgp_lw_rte.F90',
     'ccpp/physics/physics/rrtmgp_sw_rte.F90',
-    'ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90',
     'ccpp/physics/physics/GFS_rrtmgp_setup.F90',
     'ccpp/physics/physics/GFS_rrtmgp_pre.F90',
     'ccpp/physics/physics/rrtmgp_lw_pre.F90',

diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
@@ -17,17 +17,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_thompsonmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</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>

diff --git a/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
@@ -21,17 +21,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</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>

diff --git a/ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
@@ -21,17 +21,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</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>

diff --git a/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml b/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml
@@ -17,17 +17,16 @@
       <scheme>GFS_rrtmgp_pre</scheme>
       <scheme>GFS_rrtmgp_thompsonmp_pre</scheme>
       <scheme>GFS_rrtmgp_cloud_overlap_pre</scheme>
+      <scheme>GFS_rrtmgp_aerosol_optics</scheme>
       <scheme>GFS_cloud_diagnostics</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>
+44 −22		physics/GFS_rrtmgp_aerosol_optics.F90
+29 −21		physics/GFS_rrtmgp_aerosol_optics.meta
+0 −173		physics/rrtmgp_lw_aerosol_optics.meta
+0 −119		physics/rrtmgp_sw_aerosol_optics.F90