Skip to content

Combo UFS-dev PR #310 and #312 #1173

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 16 commits into from
Nov 12, 2025
Merged

Combo UFS-dev PR #310 and #312 #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3ef0cff
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.*: remove invalid GFS…
climbfuji Sep 4, 2025
9ed341e
Broaden sfcsub module with external declarations. Use in gcycle
NickSzapiro-NOAA Sep 10, 2025
475e167
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Sep 19, 2025
da0729f
Undo added externals in sfcsub.F as last resort
NickSzapiro-NOAA Oct 10, 2025
3e67146
Merge branch 'ufs-community:ufs/dev' into warning_explicit_sfcsub
NickSzapiro-NOAA Oct 10, 2025
a46c929
init_nazdir in ugwp_common
NickSzapiro-NOAA Oct 10, 2025
625bb6a
Don't use ugwp_common in module
NickSzapiro-NOAA Oct 10, 2025
0a7b49a
Merge branch 'ufs/dev' into feature/gfs_debug_interstitialtoscreen
grantfirl Oct 14, 2025
d19ce26
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Oct 20, 2025
2f2c2e9
Merge branch 'feature/gfs_debug_interstitialtoscreen' of https://gith…
climbfuji Oct 20, 2025
f3affd2
Merge branch 'ufs-community:ufs/dev' into warning_explicit_sfcsub
NickSzapiro-NOAA Nov 3, 2025
00c8d50
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Nov 4, 2025
14f24db
Merge pull request #312 from NickSzapiro-NOAA/warning_explicit_sfcsub
rhaesung Nov 4, 2025
4330557
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Nov 4, 2025
4fbe712
Merge branch 'warning_explicit_sfcsub' into ufs-dev-PR312
grantfirl Nov 11, 2025
ad6f654
Merge branch 'feature/gfs_debug_interstitialtoscreen' into ufs-dev-PR312
grantfirl Nov 11, 2025
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
18 changes: 9 additions & 9 deletions physics/GWD/cires_ugwpv1_initialize.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
module ugwp_common
!
use machine, only : kind_phys

implicit none

real(kind=kind_phys) :: pi, pi2, pih, rad_to_deg, deg_to_rad
Expand Down Expand Up @@ -60,12 +60,11 @@ module ugwp_common
! real(kind=kind_phys), parameter :: fv = rv/rd - 1.0
! real(kind=kind_phys), parameter :: arad = 6370.e3

end module ugwp_common
contains

subroutine init_nazdir(naz, xaz, yaz)

use machine, only : kind_phys
use ugwp_common, only : pi2

implicit none

Expand Down Expand Up @@ -103,7 +102,6 @@ end subroutine init_nazdir
subroutine init_global_gwdis(levs, zkm, pmb, kvg, ktg, krad, kion, me, master)
!
use machine , only : kind_phys
use ugwp_common, only : pih, pi

implicit none
integer , intent(in) :: me, master
Expand Down Expand Up @@ -185,6 +183,8 @@ subroutine init_global_gwdis(levs, zkm, pmb, kvg, ktg, krad, kion, me, master)
! 132 format( 2x, F8.3,' dis-scales:', 4(2x, E10.3))

end subroutine init_global_gwdis

end module ugwp_common
!
! ========================================================================
! Part 2 - sources
Expand Down Expand Up @@ -353,7 +353,7 @@ module ugwp_conv_init
!
subroutine init_conv_gws(nwaves, nazdir, nstoch, effac, lonr, kxw)
!
use ugwp_common, only : pi2, arad
use ugwp_common, only : pi2, arad, init_nazdir

implicit none

Expand Down Expand Up @@ -433,8 +433,8 @@ module ugwp_fjet_init

subroutine init_fjet_gws(nwaves, nazdir, nstoch, effac,lonr, kxw)

use ugwp_common, only : pi2, arad
use ugwp_common, only : pi2, arad, init_nazdir

implicit none

integer :: nwaves, nazdir, nstoch
Expand Down Expand Up @@ -492,7 +492,7 @@ module ugwp_okw_init


subroutine init_okw_gws(nwaves, nazdir, nstoch, effac, lonr, kxw)
use ugwp_common, only : pi2, arad
use ugwp_common, only : pi2, arad, init_nazdir

implicit none

Expand Down
1 change: 1 addition & 0 deletions physics/GWD/cires_ugwpv1_module.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ subroutine cires_ugwpv1_init (me, master, nlunit, logunit, jdat_gfs, con_pi, &
! input_nml_file ='input.nml'=fn_nml ..... OLD_namelist and cdmvgwd(4) Corrected Bug Oct 4
!
use netcdf
use ugwp_common, only : init_global_gwdis
use ugwp_oro_init, only : init_oro_gws
use ugwp_conv_init, only : init_conv_gws
use ugwp_fjet_init, only : init_fjet_gws
Expand Down
81 changes: 1 addition & 80 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,89 +986,10 @@ module GFS_interstitialtoscreen

private

public GFS_interstitialtoscreen_init, GFS_interstitialtoscreen_timestep_init, GFS_interstitialtoscreen_run
public GFS_interstitialtoscreen_run

contains

!> \section arg_table_GFS_interstitialtoscreen_init Argument Table
!! \htmlinclude GFS_interstitialtoscreen_init.html
!!
subroutine GFS_interstitialtoscreen_init (Model, Statein, Stateout, Sfcprop, Coupling, &
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial, &
errmsg, errflg)

implicit none

!--- interface variables
type(GFS_control_type), intent(in) :: Model
type(GFS_statein_type), intent(in) :: Statein
type(GFS_stateout_type), intent(in) :: Stateout
type(GFS_sfcprop_type), intent(in) :: Sfcprop
type(GFS_coupling_type), intent(in) :: Coupling
type(GFS_grid_type), intent(in) :: Grid
type(GFS_tbd_type), intent(in) :: Tbd
type(GFS_cldprop_type), intent(in) :: Cldprop
type(GFS_radtend_type), intent(in) :: Radtend
type(GFS_diag_type), intent(in) :: Diag
type(GFS_interstitial_type), intent(in) :: Interstitial(:)
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

!--- local variables
integer :: i

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

do i=1,size(Interstitial)
call GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, &
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial(i), &
size(Interstitial), -999, errmsg, errflg)
end do

end subroutine GFS_interstitialtoscreen_init

!> \section arg_table_GFS_interstitialtoscreen_timestep_init Argument Table
!! \htmlinclude GFS_interstitialtoscreen_timestep_init.html
!!
subroutine GFS_interstitialtoscreen_timestep_init (Model, Statein, Stateout, Sfcprop, Coupling, &
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial, &
errmsg, errflg)

implicit none

!--- interface variables
type(GFS_control_type), intent(in) :: Model
type(GFS_statein_type), intent(in) :: Statein
type(GFS_stateout_type), intent(in) :: Stateout
type(GFS_sfcprop_type), intent(in) :: Sfcprop
type(GFS_coupling_type), intent(in) :: Coupling
type(GFS_grid_type), intent(in) :: Grid
type(GFS_tbd_type), intent(in) :: Tbd
type(GFS_cldprop_type), intent(in) :: Cldprop
type(GFS_radtend_type), intent(in) :: Radtend
type(GFS_diag_type), intent(in) :: Diag
type(GFS_interstitial_type), intent(in) :: Interstitial(:)
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

!--- local variables
integer :: i

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


do i=1,size(Interstitial)
call GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, &
Grid, Tbd, Cldprop, Radtend, Diag, Interstitial(i), &
size(Interstitial), -999, errmsg, errflg)
end do

end subroutine GFS_interstitialtoscreen_timestep_init

!> \section arg_table_GFS_interstitialtoscreen_run Argument Table
!! \htmlinclude GFS_interstitialtoscreen_run.html
!!
Expand Down
194 changes: 0 additions & 194 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,200 +314,6 @@
type = scheme
dependencies = ../../hooks/machine.F

########################################################################
[ccpp-arg-table]
name = GFS_interstitialtoscreen_init
type = scheme
[Model]
standard_name = GFS_control_type_instance
long_name = instance of derived type GFS_control_type in FV3
units = DDT
dimensions = ()
type = GFS_control_type
intent = in
[Statein]
standard_name = GFS_statein_type_instance
long_name = prognostic state data in from dycore
units = DDT
dimensions = ()
type = GFS_statein_type
intent = in
[Stateout]
standard_name = GFS_stateout_type_instance
long_name = prognostic state or tendencies return to dycore
units = DDT
dimensions = ()
type = GFS_stateout_type
intent = in
[Sfcprop]
standard_name = GFS_sfcprop_type_instance
long_name = instance of derived type GFS_sfcprop_type
units = DDT
dimensions = ()
type = GFS_sfcprop_type
intent = in
[Coupling]
standard_name = GFS_coupling_type_instance
long_name = instance of derived type GFS_coupling_type
units = DDT
dimensions = ()
type = GFS_coupling_type
intent = in
[Grid]
standard_name = GFS_grid_type_instance
long_name = instance of derived type GFS_grid_type
units = DDT
dimensions = ()
type = GFS_grid_type
intent = in
[Tbd]
standard_name = GFS_tbd_type_instance
long_name = instance of derived type GFS_tbd_type
units = DDT
dimensions = ()
type = GFS_tbd_type
intent = in
[Cldprop]
standard_name = GFS_cldprop_type_instance
long_name = instance of derived type GFS_cldprop_type
units = DDT
dimensions = ()
type = GFS_cldprop_type
intent = in
[Radtend]
standard_name = GFS_radtend_type_instance
long_name = instance of derived type GFS_radtend_type
units = DDT
dimensions = ()
type = GFS_radtend_type
intent = in
[Diag]
standard_name = GFS_diag_type_instance
long_name = instance of derived type GFS_diag_type
units = DDT
dimensions = ()
type = GFS_diag_type
intent = in
[Interstitial]
standard_name = GFS_interstitial_type_instance_all_threads
long_name = instance of derived type GFS_interstitial_type
units = DDT
dimensions = (number_of_openmp_threads)
type = GFS_interstitial_type
intent = in
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
units = none
dimensions = ()
type = character
kind = len=*
intent = out
[errflg]
standard_name = ccpp_error_code
long_name = error code for error handling in CCPP
units = 1
dimensions = ()
type = integer
intent = out

########################################################################
[ccpp-arg-table]
name = GFS_interstitialtoscreen_timestep_init
type = scheme
[Model]
standard_name = GFS_control_type_instance
long_name = instance of derived type GFS_control_type in FV3
units = DDT
dimensions = ()
type = GFS_control_type
intent = in
[Statein]
standard_name = GFS_statein_type_instance
long_name = prognostic state data in from dycore
units = DDT
dimensions = ()
type = GFS_statein_type
intent = in
[Stateout]
standard_name = GFS_stateout_type_instance
long_name = prognostic state or tendencies return to dycore
units = DDT
dimensions = ()
type = GFS_stateout_type
intent = in
[Sfcprop]
standard_name = GFS_sfcprop_type_instance
long_name = instance of derived type GFS_sfcprop_type
units = DDT
dimensions = ()
type = GFS_sfcprop_type
intent = in
[Coupling]
standard_name = GFS_coupling_type_instance
long_name = instance of derived type GFS_coupling_type
units = DDT
dimensions = ()
type = GFS_coupling_type
intent = in
[Grid]
standard_name = GFS_grid_type_instance
long_name = instance of derived type GFS_grid_type
units = DDT
dimensions = ()
type = GFS_grid_type
intent = in
[Tbd]
standard_name = GFS_tbd_type_instance
long_name = instance of derived type GFS_tbd_type
units = DDT
dimensions = ()
type = GFS_tbd_type
intent = in
[Cldprop]
standard_name = GFS_cldprop_type_instance
long_name = instance of derived type GFS_cldprop_type
units = DDT
dimensions = ()
type = GFS_cldprop_type
intent = in
[Radtend]
standard_name = GFS_radtend_type_instance
long_name = instance of derived type GFS_radtend_type
units = DDT
dimensions = ()
type = GFS_radtend_type
intent = in
[Diag]
standard_name = GFS_diag_type_instance
long_name = instance of derived type GFS_diag_type
units = DDT
dimensions = ()
type = GFS_diag_type
intent = in
[Interstitial]
standard_name = GFS_interstitial_type_instance_all_threads
long_name = instance of derived type GFS_interstitial_type
units = DDT
dimensions = (number_of_openmp_threads)
type = GFS_interstitial_type
intent = in
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
units = none
dimensions = ()
type = character
kind = len=*
intent = out
[errflg]
standard_name = ccpp_error_code
long_name = error code for error handling in CCPP
units = 1
dimensions = ()
type = integer
intent = out

########################################################################
[ccpp-arg-table]
name = GFS_interstitialtoscreen_run
Expand Down
1 change: 1 addition & 0 deletions physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ subroutine gcycle (me, nthrds, nx, ny, isc, jsc, nsst, tile_num, nlunit, fn_nml,
!
!
use machine, only: kind_phys, kind_io8
use sfccyc_module, only: sfccycle
implicit none

integer, intent(in) :: me, nthrds, nx, ny, isc, jsc, nsst, &
Expand Down
Loading