diff --git a/ccpp/config/ccpp_prebuild_config_fv3.py b/ccpp/config/ccpp_prebuild_config_fv3.py
index 04a45711c..968c48a77 100755
--- a/ccpp/config/ccpp_prebuild_config_fv3.py
+++ b/ccpp/config/ccpp_prebuild_config_fv3.py
@@ -104,7 +104,7 @@
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90',
- 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90',
+ 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90',
@@ -112,7 +112,6 @@
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90',
- 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90',
diff --git a/ccpp/config/ccpp_prebuild_config_mpas.py b/ccpp/config/ccpp_prebuild_config_mpas.py
index bb85073ad..0403c714a 100755
--- a/ccpp/config/ccpp_prebuild_config_mpas.py
+++ b/ccpp/config/ccpp_prebuild_config_mpas.py
@@ -97,7 +97,7 @@
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.mpas.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90',
- 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90',
+ 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90',
@@ -105,7 +105,6 @@
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90',
- 'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90',
'physics/physics/Radiation/RRTMG/radsw_main.F90',
'physics/physics/Radiation/RRTMG/radlw_main.F90',
'physics/physics/Radiation/RRTMG/rrtmg_lw_post.F90',
diff --git a/ccpp/physics b/ccpp/physics
index fff3c24e4..0722a9d60 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit fff3c24e4963687ca20799c4a1f9f7078c07d439
+Subproject commit 0722a9d60cedbd837ee0d3666ea90541f7758c80
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
index 8028ea7a1..af490fe83 100644
--- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/suite_FV3_GFS_v15p2.xml
index f9db755e9..0682aa0f9 100644
--- a/ccpp/suites/suite_FV3_GFS_v15p2.xml
+++ b/ccpp/suites/suite_FV3_GFS_v15p2.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/suite_FV3_GFS_v16.xml
index ce5736e5c..5fba28575 100644
--- a/ccpp/suites/suite_FV3_GFS_v16.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
index f70d9174d..0f18a0cbd 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v16_flake.xml b/ccpp/suites/suite_FV3_GFS_v16_flake.xml
index 15b547ffb..2548d7c21 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_flake.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_flake.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
index 04191ca7e..918ef4856 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v16_gfdlmpv3.xml b/ccpp/suites/suite_FV3_GFS_v16_gfdlmpv3.xml
index 604343d63..c02d886b1 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_gfdlmpv3.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_gfdlmpv3.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v16_ras.xml b/ccpp/suites/suite_FV3_GFS_v16_ras.xml
index 506964317..918dc7246 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_ras.xml
+++ b/ccpp/suites/suite_FV3_GFS_v16_ras.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
index 3b79d258b..ee5465b66 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
index 439755717..cc30e0987 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
index 28a9085ec..4d586a4f3 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
index b75921dba..57497e134 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8.xml b/ccpp/suites/suite_FV3_GFS_v17_p8.xml
index f08119e9a..05b9c520b 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_p8.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
index d0d15f1b8..66e7f859b 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
index 36bc3d050..3c9dbe250 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
index 0a5b9222e..c4bcb2f39 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
@@ -20,7 +20,7 @@
rrtmgp_aerosol_optics
rrtmgp_sw_main
rrtmgp_lw_main
- GFS_rrtmgp_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
index 6d32a42a2..0e3a28e6f 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1_tempo.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1_tempo.xml
index cd1d1aff5..5dfd909e0 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1_tempo.xml
+++ b/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1_tempo.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
index 09f6ff89d..da8a269a1 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
index 15cca099c..1acc5d523 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmpv3_tedmf.xml b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmpv3_tedmf.xml
index b222245f2..9556c27f9 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmpv3_tedmf.xml
+++ b/ccpp/suites/suite_FV3_HAFS_v1_gfdlmpv3_tedmf.xml
@@ -24,7 +24,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
index a4b84e5f4..c98fee2d5 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
index 2ef7a87cc..b9c1ca61e 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
index 407af6f03..615e0c64e 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+++ b/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml
index aa4654d7c..10ac55112 100644
--- a/ccpp/suites/suite_FV3_HRRR.xml
+++ b/ccpp/suites/suite_FV3_HRRR.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HRRR_c3.xml b/ccpp/suites/suite_FV3_HRRR_c3.xml
index 4eb6410d6..f2ded8fe5 100644
--- a/ccpp/suites/suite_FV3_HRRR_c3.xml
+++ b/ccpp/suites/suite_FV3_HRRR_c3.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HRRR_gf.xml b/ccpp/suites/suite_FV3_HRRR_gf.xml
index c3dca9f50..58d390295 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf.xml
+++ b/ccpp/suites/suite_FV3_HRRR_gf.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
index 6d746f1fa..0f5d26e2f 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+++ b/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/suite_FV3_RAP.xml
index 1e6db9879..36ab67bcb 100644
--- a/ccpp/suites/suite_FV3_RAP.xml
+++ b/ccpp/suites/suite_FV3_RAP.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
index 5d06b63e1..43b439343 100644
--- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+++ b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/suite_FV3_RAP_clm_lake.xml
index adc19d8f6..091415e6e 100644
--- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml
+++ b/ccpp/suites/suite_FV3_RAP_clm_lake.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/suite_FV3_RAP_flake.xml
index b4c90d9e6..f69c2e144 100644
--- a/ccpp/suites/suite_FV3_RAP_flake.xml
+++ b/ccpp/suites/suite_FV3_RAP_flake.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/suite_FV3_RAP_noah.xml
index 6db03b211..fd5d64e67 100644
--- a/ccpp/suites/suite_FV3_RAP_noah.xml
+++ b/ccpp/suites/suite_FV3_RAP_noah.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
index 115c94a21..87195b387 100644
--- a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+++ b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml
index 0ae504da1..2067e7d7a 100644
--- a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+++ b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
index 61aa5fc16..36ce5ed89 100644
--- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+++ b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml
index 234b48b72..003c7b8cc 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml
+++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
index e5c11b97b..160dd0ecf 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+++ b/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/suite_FV3_WoFS_v0.xml
index c1e1f7ccd..2e32afd48 100644
--- a/ccpp/suites/suite_FV3_WoFS_v0.xml
+++ b/ccpp/suites/suite_FV3_WoFS_v0.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_coupled_lowres.xml b/ccpp/suites/suite_FV3_coupled_lowres.xml
index 8b9a78671..141fc8df0 100644
--- a/ccpp/suites/suite_FV3_coupled_lowres.xml
+++ b/ccpp/suites/suite_FV3_coupled_lowres.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/suite_FV3_global_nest_v1.xml
index 956b26741..e74dbff5b 100644
--- a/ccpp/suites/suite_FV3_global_nest_v1.xml
+++ b/ccpp/suites/suite_FV3_global_nest_v1.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml b/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml
index 4df1affce..f9fbab7e9 100644
--- a/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml
+++ b/ccpp/suites/suite_FV3_ideal_pbl_mp_nssl.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_FV3_lowres.xml b/ccpp/suites/suite_FV3_lowres.xml
index 5edcef6e2..cdae7a101 100644
--- a/ccpp/suites/suite_FV3_lowres.xml
+++ b/ccpp/suites/suite_FV3_lowres.xml
@@ -19,7 +19,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_MPAS_RRFS.xml b/ccpp/suites/suite_MPAS_RRFS.xml
index 2f8f81c3c..ab83aadc4 100644
--- a/ccpp/suites/suite_MPAS_RRFS.xml
+++ b/ccpp/suites/suite_MPAS_RRFS.xml
@@ -18,7 +18,7 @@
rrtmg_sw_post
rrtmg_lw
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_RRFS_sas.xml b/ccpp/suites/suite_RRFS_sas.xml
index 7275e151f..f7dd9295b 100644
--- a/ccpp/suites/suite_RRFS_sas.xml
+++ b/ccpp/suites/suite_RRFS_sas.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_RRFS_sas_nogwd.xml b/ccpp/suites/suite_RRFS_sas_nogwd.xml
index d2c1346ec..0c83bb46a 100644
--- a/ccpp/suites/suite_RRFS_sas_nogwd.xml
+++ b/ccpp/suites/suite_RRFS_sas_nogwd.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/suite_RRFSens_phy1.xml
index 51366f2f2..f35bea23d 100644
--- a/ccpp/suites/suite_RRFSens_phy1.xml
+++ b/ccpp/suites/suite_RRFSens_phy1.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/suite_RRFSens_phy2.xml
index db8c2d28d..71edcfcde 100644
--- a/ccpp/suites/suite_RRFSens_phy2.xml
+++ b/ccpp/suites/suite_RRFSens_phy2.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/suite_RRFSens_phy3.xml
index b4767562f..5fe718e1e 100644
--- a/ccpp/suites/suite_RRFSens_phy3.xml
+++ b/ccpp/suites/suite_RRFSens_phy3.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/suite_RRFSens_phy4.xml
index aca458329..47af44d17 100644
--- a/ccpp/suites/suite_RRFSens_phy4.xml
+++ b/ccpp/suites/suite_RRFSens_phy4.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/suite_RRFSens_phy5.xml
index 77c99805a..b5ccb4060 100644
--- a/ccpp/suites/suite_RRFSens_phy5.xml
+++ b/ccpp/suites/suite_RRFSens_phy5.xml
@@ -21,7 +21,7 @@
rrtmg_lw
sgscloud_radpost
rrtmg_lw_post
- GFS_rrtmg_post
+ GFS_radiation_post
diff --git a/fv3/atmos_model.F90 b/fv3/atmos_model.F90
index 611f99b20..91adb06d7 100644
--- a/fv3/atmos_model.F90
+++ b/fv3/atmos_model.F90
@@ -997,6 +997,7 @@ subroutine update_atmos_model_state (Atmos, rc)
!--- local variables
integer :: i, localrc, sec_lastfhzerofh
integer :: isec, seconds, isec_fhzero
+ integer :: dtatm_temp
logical :: tmpflag_fhzero
real(kind=GFS_kind_phys) :: time_int, time_intfull
!
@@ -1031,9 +1032,10 @@ subroutine update_atmos_model_state (Atmos, rc)
if (mpp_pe() == mpp_root_pe()) write(6,*) 'gfs diags time since last bucket empty: ',time_int,' time_intfull=', &
time_intfull,' kdt=',GFS_control%kdt
call atmosphere_nggps_diag(Atmos%Time)
+ call get_time ( Atmos%Time_step, dtatm_temp)
call fv3atm_diag_output(Atmos%Time, GFS_Diag, Atm_block, GFS_control%nx, GFS_control%ny, &
GFS_control%levs, 1, 1, 1.0_GFS_kind_phys, time_int, time_intfull, &
- GFS_control%fhswr, GFS_control%fhlwr, GFS_control)
+ GFS_control%fhswr, GFS_control%fhlwr, GFS_control, dtatm_temp)
endif
!--- find current fhzero
diff --git a/io/fv3atm_history_io.F90 b/io/fv3atm_history_io.F90
index a0f2fac4d..ff407b6c1 100644
--- a/io/fv3atm_history_io.F90
+++ b/io/fv3atm_history_io.F90
@@ -115,13 +115,13 @@ end subroutine fv3atm_diag_register
!! This routine transfers diagnostic data to the FMS diagnostic
!! manager for eventual output to the history files.
subroutine fv3atm_diag_output(time, diag, atm_block, nx, ny, levs, ntcw, ntoz, &
- dt, time_int, time_intfull, time_radsw, time_radlw, Model)
+ dt, time_int, time_intfull, time_radsw, time_radlw, Model, dt_atmos)
!--- subroutine interface variable definitions
type(time_type), intent(in) :: time
type(GFS_externaldiag_type), intent(in) :: diag(:)
type (block_control_type), intent(in) :: atm_block
type(GFS_control_type), intent(in) :: Model
- integer, intent(in) :: nx, ny, levs, ntcw, ntoz
+ integer, intent(in) :: nx, ny, levs, ntcw, ntoz, dt_atmos
real(kind=kind_phys), intent(in) :: dt
real(kind=kind_phys), intent(in) :: time_int
real(kind=kind_phys), intent(in) :: time_intfull
@@ -129,7 +129,7 @@ subroutine fv3atm_diag_output(time, diag, atm_block, nx, ny, levs, ntcw, ntoz, &
real(kind=kind_phys), intent(in) :: time_radlw
call shared_history_data%output(time, diag, atm_block, nx, ny, levs, ntcw, ntoz, &
- dt, time_int, time_intfull, time_radsw, time_radlw, Model)
+ dt, time_int, time_intfull, time_radsw, time_radlw, Model, dt_atmos)
end subroutine fv3atm_diag_output
@@ -282,14 +282,14 @@ end subroutine history_type_register
!! implementation of the public fv3atm_diag_output routine. Never
!! call this directly.
subroutine history_type_output(hist, time, diag, atm_block, nx, ny, levs, ntcw, ntoz, &
- dt, time_int, time_intfull, time_radsw, time_radlw, Model)
+ dt, time_int, time_intfull, time_radsw, time_radlw, Model, dt_atmos)
!--- subroutine interface variable definitions
class(history_type) :: hist
type(time_type), intent(in) :: time
type(GFS_externaldiag_type), intent(in) :: diag(:)
type (block_control_type), intent(in) :: atm_block
type(GFS_control_type), intent(in) :: Model
- integer, intent(in) :: nx, ny, levs, ntcw, ntoz
+ integer, intent(in) :: nx, ny, levs, ntcw, ntoz, dt_atmos
real(kind=kind_phys), intent(in) :: dt
real(kind=kind_phys), intent(in) :: time_int
real(kind=kind_phys), intent(in) :: time_intfull
@@ -322,13 +322,16 @@ subroutine history_type_output(hist, time, diag, atm_block, nx, ny, levs, ntcw,
lcnvfac = lcnvfac*rtime_intfull
! if(mpp_pe()==mpp_root_pe())print *,'in,fv3atm_io. full time avg, field=',trim(Diag(idx)%name),' time=',time_intfull
else if ( trim(diag(idx)%time_avg_kind) == 'rad_lw' ) then
- lcnvfac = lcnvfac*min(rtime_radlw,rtime_int)
+ !lcnvfac = lcnvfac*min(rtime_radlw,rtime_int)
+ lcnvfac = lcnvfac*rtime_radlw/int(time_int/dt_atmos)
! if(mpp_pe()==mpp_root_pe())print *,'in,fv3atm_io. rad longwave avg, field=',trim(Diag(idx)%name),' time=',time_radlw
else if ( trim(diag(idx)%time_avg_kind) == 'rad_sw' ) then
- lcnvfac = lcnvfac*min(rtime_radsw,rtime_int)
+ !lcnvfac = lcnvfac*min(rtime_radsw,rtime_int)
+ lcnvfac = lcnvfac*rtime_radsw/int(time_int/dt_atmos)
! if(mpp_pe()==mpp_root_pe())print *,'in,fv3atm_io. rad shortwave avg, field=',trim(Diag(idx)%name),' time=',time_radsw
else if ( trim(diag(idx)%time_avg_kind) == 'rad_swlw_min' ) then
- lcnvfac = lcnvfac*min(max(rtime_radsw,rtime_radlw),rtime_int)
+ !lcnvfac = lcnvfac*min(max(rtime_radsw,rtime_radlw),rtime_int)
+ lcnvfac = lcnvfac*max(rtime_radsw,rtime_radlw)/int(time_int/dt_atmos)
! if(mpp_pe()==mpp_root_pe())print *,'in,fv3atm_io. rad swlw min avg, field=',trim(Diag(idx)%name),' time=',time_radlw,time_radsw,time_int
else
lcnvfac = lcnvfac*rtime_int