Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update calculation of time-averaged radiation variables #900

Draft
wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/ufs-community/ccpp-physics
branch = ufs/dev
url = https://github.com/LarissaReames-NOAA/ccpp-physics
branch = feature/rad-fix
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
4 changes: 3 additions & 1 deletion atmos_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,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
!
Expand Down Expand Up @@ -1021,9 +1022,10 @@ subroutine update_atmos_model_state (Atmos, rc)
endif
if (mpp_pe() == mpp_root_pe()) write(6,*) ' gfs diags time since last bucket empty: ',time_int/3600.,'hrs'
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%fhswr, GFS_control%fhlwr, dtatm_temp)
endif

!--- find current fhzero
Expand Down
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
Loading