Skip to content

Combination of #1199, #1201, and #1202 #1203

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.

Sign up for GitHub

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

Merged
grantfirl merged 13 commits into from
Mar 17, 2026
Merged

Combination of #1199, #1201, and #1202 #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
82e0d17
Update radlw_main.F90: remove comments at end of file for LLVM 22
climbfuji Feb 26, 2026
b6a5792
Apply suggestion from @climbfuji
climbfuji Feb 26, 2026
ce4e0c9
Remove unused variables and improve comments in cnvc90.f
matusmartini Feb 28, 2026
2dfd4e4
Rename GWD/ugwp_driver_v0.F to GWD/ugwp_driver_v0.F90 and change
matusmartini Mar 3, 2026
3128ac8
Update line continuation in GWD/ugwp_driver_v0.F90
matusmartini Mar 3, 2026
f40264e
Add errflg, errmsg and remove unused constants in GWD/ugwp_driver_v0.F90
matusmartini Mar 3, 2026
20c79f5
Cleanup in GWD/ugwp_driver_v0.F90
matusmartini Mar 3, 2026
b983723
More cleanup in GWD/ugwp_driver_v0.F90
matusmartini Mar 3, 2026
35494d4
More cleanup in GWD/ugwp_driver_v0.F90
matusmartini Mar 3, 2026
bc8d0cc
Update CODEOWNERS with F90 change
matusmartini Mar 4, 2026
2da943b
Merge branch 'bugfix/radlwmain_llvm22' into NRL_combo_20260316
grantfirl Mar 16, 2026
f863015
Merge branch 'cnvc90' into NRL_combo_20260316
grantfirl Mar 16, 2026
08726c8
Merge branch 'cleanup-ugwp_driver_v0' into NRL_combo_20260316
grantfirl Mar 16, 2026
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 CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ physics/GWD/drag_suite.* @md
physics/GWD/gwdc.* @Songyou184 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/GWD/gwdps.* @Songyou184 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/GWD/rayleigh_damp.* @yangfanglin @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/GWD/ugwp_driver_v0.F @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/GWD/ugwp_driver_v0.F90 @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/GWD/ugwpv1_gsldrag.* @mdtoyNOAA @BoYang-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/GWD/ugwpv1_gsldrag_post.* @mdtoyNOAA @BoYang-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/GWD/unified_ugwp* @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
Expand Down Expand Up @@ -149,7 +149,7 @@ physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.*
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.* @dustinswales @Qingfu-Liu @grantfirl @rhaesung @Qingfu-Liu @dustinswales
Expand Down
5 changes: 3 additions & 2 deletions physics/GWD/cires_ugwp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,9 @@ subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr
ugrs, vgrs, tgrs, qgrs(:,:,1), kpbl, prsi,del,prsl, prslk, phii, phil, &
dtp, kdt, sgh30, hprime, oc, oa4, clx, theta, sigma, gamma, elvmax, &
dusfcg, dvsfcg, xlat_d, sinlat, coslat, area, cdmbgwd(1:2), &
me, master, rdxzb, con_g, con_omega, zmtb, zogw, tau_mtb, tau_ogw, &
tau_tofd, dudt_mtb, dudt_ogw, dudt_tms)
me, master, rdxzb, zmtb, zogw, tau_mtb, tau_ogw, &
tau_tofd, dudt_mtb, dudt_ogw, dudt_tms, &
errmsg, errflg)

else ! calling old GFS gravity wave drag as is

Expand Down
2 changes: 1 addition & 1 deletion physics/GWD/cires_ugwp.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
type = scheme
# DH* 20200804 - this is a result of the nasty hack to call gwdps from within ugwp-v0!
dependencies=cires_ugwp_triggers.F90,cires_ugwp_initialize.F90
dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,../hooks/machine.F,ugwp_driver_v0.F
dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,../hooks/machine.F,ugwp_driver_v0.F90

########################################################################
[ccpp-arg-table]
Expand Down
437 changes: 210 additions & 227 deletions physics/GWD/ugwp_driver_v0.F → physics/GWD/ugwp_driver_v0.F90
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion physics/GWD/unified_ugwp.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
type = scheme
dependencies = ../hooks/machine.F
dependencies = cires_ugwp_triggers.F90,cires_ugwp_initialize.F90
dependencies = cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,ugwp_driver_v0.F
dependencies = cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,ugwp_driver_v0.F90
dependencies = drag_suite.F90

########################################################################
Expand Down
21 changes: 7 additions & 14 deletions physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
!>\file cnvc90.f
!! This file contains the calculation of fraction of convective cloud,
!! pressure at bottom of convective cloud and at top of convective
!! cloud.
!! This module computes the convective cloud fraction, as well as
!! the pressure at the base and top of the convective cloud.
module cnvc90

contains
Expand All @@ -11,9 +10,6 @@ end subroutine cnvc90_init

!>\defgroup GFS_cnvc90 GFS Convective Cloud Diagnostics Module
!> @{
!! This module contains the calculation of fraction of convective cloud,
!! pressure at bottom of convective cloud and at top of convective
!! cloud.
!> \section arg_table_cnvc90_run Argument Table
!! \htmlinclude cnvc90_run.html
!!
Expand Down Expand Up @@ -43,23 +39,23 @@ SUBROUTINE cnvc90_run(CLSTP,IM,RN,KBOT,KTOP,KM,PRSI, &

! Local variables
integer :: i,ibot,itop,lc,lz,n,ncc
real(kind=kind_phys) :: ah,cc1,cc2,cvb0,p1,p2,rkbot,rktop,val
real(kind=kind_phys) :: ah,cc1,cc2,cvb0,p1,p2
integer :: NMD(IM)
real(kind=kind_phys) :: PMD(IM)
!

real (kind=kind_phys), parameter :: cons_100=100.0
real(kind=kind_phys) :: R_KBOT_I, R_KTOP_I
!

PARAMETER(NCC=9)
real(kind=kind_phys) :: CC(NCC),P(NCC)
DATA CC/0.,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8/
DATA P/.14,.31,.70,1.6,3.4,7.7,17.,38.,85./
DATA CVB0/100./
!

! Initialize CCPP error handling variables
errmsg = ''
errflg = 0
!

LZ=0
LC=0
IF(CLSTP.GE.1000.) LZ=1
Expand Down Expand Up @@ -123,9 +119,6 @@ SUBROUTINE cnvc90_run(CLSTP,IM,RN,KBOT,KTOP,KM,PRSI, &
ENDIF
ENDDO
ENDIF
RETURN
END SUBROUTINE cnvc90_run
!> @}

end module cnvc90

1 change: 0 additions & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,3 @@
dimensions = ()
type = integer
intent = out

6 changes: 3 additions & 3 deletions physics/Radiation/RRTMG/radlw_main.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7751,6 +7751,6 @@ subroutine cldprmc(nlayers, inflag, iceflag, liqflag, cldfmc, &
end subroutine cldprmc

!> @}
!........................................!$
end module rrtmg_lw !$
!========================================!$
!........................................!
end module rrtmg_lw !
!========================================!
Loading