Skip to content

Commit

Permalink
Bug fix in rad_lwsw_min scaling parameter. Merge GFS_rrtmg/rrtmgp_pos…
Browse files Browse the repository at this point in the history
…t.F90 in to GFS_radiation_post.F90 in ccpp/physics, requiring changes to all suites.
  • Loading branch information
LarissaReames-NOAA committed Dec 19, 2024
1 parent e602edb commit 0908052
Show file tree
Hide file tree
Showing 45 changed files with 45 additions and 46 deletions.
3 changes: 1 addition & 2 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,14 @@
'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',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90',
'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_rad_reset.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15p2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16_flake.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16_ras.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_p8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<scheme>rrtmgp_aerosol_optics</scheme>
<scheme>rrtmgp_sw_main</scheme>
<scheme>rrtmgp_lw_main</scheme>
<scheme>GFS_rrtmgp_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HRRR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HRRR_c3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HRRR_gf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP_clm_lake.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP_flake.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP_noah.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP_sfcdiff.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RRFS_v1beta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RRFS_v1nssl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_WoFS_v0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_global_nest_v1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_RRFSens_phy1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_RRFSens_phy2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_RRFSens_phy3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_RRFSens_phy4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_RRFSens_phy5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
<scheme>GFS_radiation_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
Loading

0 comments on commit 0908052

Please sign in to comment.