Skip to content

Commit 3f4ad81

Browse files
grantfirlgrantfirl
authored
Merge pull request NCAR#1203 from grantfirl/NRL_combo_20260316
Combination of NCAR#1199, NCAR#1201, and NCAR#1202
2 parents fff5748 + 08726c8 commit 3f4ad81

8 files changed

Lines changed: 227 additions & 251 deletions

File tree

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ physics/GWD/drag_suite.* @md
3030
physics/GWD/gwdc.* @Songyou184 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3131
physics/GWD/gwdps.* @Songyou184 @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3232
physics/GWD/rayleigh_damp.* @yangfanglin @grantfirl @rhaesung @Qingfu-Liu @dustinswales
33-
physics/GWD/ugwp_driver_v0.F @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
33+
physics/GWD/ugwp_driver_v0.F90 @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3434
physics/GWD/ugwpv1_gsldrag.* @mdtoyNOAA @BoYang-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3535
physics/GWD/ugwpv1_gsldrag_post.* @mdtoyNOAA @BoYang-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3636
physics/GWD/unified_ugwp* @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
@@ -149,7 +149,7 @@ physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.*
149149
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
150150
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
151151
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
152-
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
152+
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
153153
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
154154
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.* @grantfirl @rhaesung @Qingfu-Liu @dustinswales
155155
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.* @dustinswales @Qingfu-Liu @grantfirl @rhaesung @Qingfu-Liu @dustinswales

‎physics/GWD/cires_ugwp.F90‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,9 @@ subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr
294294
ugrs, vgrs, tgrs, qgrs(:,:,1), kpbl, prsi,del,prsl, prslk, phii, phil, &
295295
dtp, kdt, sgh30, hprime, oc, oa4, clx, theta, sigma, gamma, elvmax, &
296296
dusfcg, dvsfcg, xlat_d, sinlat, coslat, area, cdmbgwd(1:2), &
297-
me, master, rdxzb, con_g, con_omega, zmtb, zogw, tau_mtb, tau_ogw, &
298-
tau_tofd, dudt_mtb, dudt_ogw, dudt_tms)
297+
me, master, rdxzb, zmtb, zogw, tau_mtb, tau_ogw, &
298+
tau_tofd, dudt_mtb, dudt_ogw, dudt_tms, &
299+
errmsg, errflg)
299300

300301
else ! calling old GFS gravity wave drag as is
301302

‎physics/GWD/cires_ugwp.meta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
type = scheme
44
# DH* 20200804 - this is a result of the nasty hack to call gwdps from within ugwp-v0!
55
dependencies=cires_ugwp_triggers.F90,cires_ugwp_initialize.F90
6-
dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,../hooks/machine.F,ugwp_driver_v0.F
6+
dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,../hooks/machine.F,ugwp_driver_v0.F90
77

88
########################################################################
99
[ccpp-arg-table]

physics/GWD/ugwp_driver_v0.F renamed to physics/GWD/ugwp_driver_v0.F90

Lines changed: 210 additions & 227 deletions
Large diffs are not rendered by default.

‎physics/GWD/unified_ugwp.meta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
type = scheme
44
dependencies = ../hooks/machine.F
55
dependencies = cires_ugwp_triggers.F90,cires_ugwp_initialize.F90
6-
dependencies = cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,ugwp_driver_v0.F
6+
dependencies = cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,ugwp_driver_v0.F90
77
dependencies = drag_suite.F90
88

99
########################################################################

‎physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.f‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
!>\file cnvc90.f
2-
!! This file contains the calculation of fraction of convective cloud,
3-
!! pressure at bottom of convective cloud and at top of convective
4-
!! cloud.
2+
!! This module computes the convective cloud fraction, as well as
3+
!! the pressure at the base and top of the convective cloud.
54
module cnvc90
65

76
contains
@@ -11,9 +10,6 @@ end subroutine cnvc90_init
1110

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

4440
! Local variables
4541
integer :: i,ibot,itop,lc,lz,n,ncc
46-
real(kind=kind_phys) :: ah,cc1,cc2,cvb0,p1,p2,rkbot,rktop,val
42+
real(kind=kind_phys) :: ah,cc1,cc2,cvb0,p1,p2
4743
integer :: NMD(IM)
4844
real(kind=kind_phys) :: PMD(IM)
49-
!
45+
5046
real (kind=kind_phys), parameter :: cons_100=100.0
5147
real(kind=kind_phys) :: R_KBOT_I, R_KTOP_I
52-
!
48+
5349
PARAMETER(NCC=9)
5450
real(kind=kind_phys) :: CC(NCC),P(NCC)
5551
DATA CC/0.,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8/
5652
DATA P/.14,.31,.70,1.6,3.4,7.7,17.,38.,85./
5753
DATA CVB0/100./
58-
!
54+
5955
! Initialize CCPP error handling variables
6056
errmsg = ''
6157
errflg = 0
62-
!
58+
6359
LZ=0
6460
LC=0
6561
IF(CLSTP.GE.1000.) LZ=1
@@ -123,9 +119,6 @@ SUBROUTINE cnvc90_run(CLSTP,IM,RN,KBOT,KTOP,KM,PRSI, &
123119
ENDIF
124120
ENDDO
125121
ENDIF
126-
RETURN
127122
END SUBROUTINE cnvc90_run
128123
!> @}
129-
130124
end module cnvc90
131-

‎physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.meta‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,3 @@
122122
dimensions = ()
123123
type = integer
124124
intent = out
125-

‎physics/Radiation/RRTMG/radlw_main.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7751,6 +7751,6 @@ subroutine cldprmc(nlayers, inflag, iceflag, liqflag, cldfmc, &
77517751
end subroutine cldprmc
77527752

77537753
!> @}
7754-
!........................................!$
7755-
end module rrtmg_lw !$
7756-
!========================================!$
7754+
!........................................!
7755+
end module rrtmg_lw !
7756+
!========================================!

0 commit comments

Comments
 (0)