Skip to content

Updates for ccpp-capgen v1 #1221

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

Open
climbfuji wants to merge 18 commits into
base: scm/dev
Choose a base branch
from
+267 −2,951
Open

Updates for ccpp-capgen v1 #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
115e116
[scm/dev] Ability to build with ip and sp library (#1208)
grantfirl Apr 10, 2026
88c6e95
[scm/dev] Update scm/dev from main (includes ccpp_bcast PR + followup…
grantfirl Apr 13, 2026
bdccfdd
Merge pull request #1214 from NCAR/main
grantfirl Apr 21, 2026
1ff31da
First round of updates and bug fixes for capgen-ng
climbfuji May 14, 2026
cf1664d
Update submodule pointer for physics/MP/TEMPO/TEMPO
climbfuji May 14, 2026
71740fd
Minor bugfixes for building with capgen-ng in SCM
climbfuji May 14, 2026
6379ed4
Metadata corrections from ccpp_validator.py
climbfuji May 20, 2026
724bcb3
Correct dimensions for air_pressure_at_interface in physics/MP/Ferrie…
climbfuji May 21, 2026
354b18d
physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.neptune.meta…
climbfuji May 21, 2026
123f779
Merge branch 'scm/dev' of https://github.com/NCAR/ccpp-physics into f…
climbfuji May 29, 2026
ce80522
Merge branch 'scm/dev' of https://github.com/NCAR/ccpp-physics into f…
climbfuji Jun 8, 2026
783f20c
Fix metadata vs Fortran inconsistencies in GFS_PBL_generic_post.meta …
climbfuji Jun 8, 2026
198bdd7
Fix inconsistencies Fortran vs Metadata physics/Interstitials/UFS_SCM…
climbfuji Jun 8, 2026
bc76b77
number_of_openmp_threads --> number_of_physics_threads in all schemes
climbfuji Jun 10, 2026
61a42c2
Merge branch 'scm/dev' of https://github.com/NCAR/ccpp-physics into f…
climbfuji Jun 23, 2026
1ed0230
Update submodule pointer for C3
climbfuji Jun 23, 2026
6904e2a
Add optional attribute for tke vars in cires_ugwp
dustinswales Jun 23, 2026
3de6efa
Bug fix in physics/GWD/cires_ugwp.meta
climbfuji Jun 23, 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
10 changes: 6 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
branch = main
[submodule "physics/MP/TEMPO/TEMPO"]
path = physics/MP/TEMPO/TEMPO
url = https://github.com/NCAR/TEMPO
branch = main
#url = https://github.com/NCAR/TEMPO
#branch = main
url = https://github.com/climbfuji/TEMPO
branch = feature/capgen-ng
[submodule "physics/SFC_Layer/MYNN/MYNN"]
path = physics/SFC_Layer/MYNN/MYNN
url = https://github.com/NCAR/MYNN-SFC
branch = ccpp/dev
[submodule "physics/CONV/C3"]
path = physics/CONV/C3
url = https://github.com/ufs-community/c3
branch = main

#branch = main
branch = feature/capgen-ng
2 changes: 1 addition & 1 deletion physics/CONV/C3
Open in desktop
Submodule C3 updated 1 files
+2 −2 CCPP/cu_c3_driver_post.meta
18 changes: 9 additions & 9 deletions physics/GWD/cires_ugwp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module cires_ugwp

use machine, only: kind_phys

use cires_ugwpv0_module, only: knob_ugwp_version, cires_ugwpv0_mod_init, cires_ugwpv0_mod_finalize
use cires_ugwpv0_module, only: knob_ugwp_version, cires_ugwpv0_mod_init, cires_ugwpv0_mod_final
use ugwp_driver_v0
use gwdps, only: gwdps_run
use cires_ugwp_triggers
Expand All @@ -25,7 +25,7 @@ module cires_ugwp

private

public cires_ugwp_init, cires_ugwp_run, cires_ugwp_finalize
public cires_ugwp_init, cires_ugwp_run, cires_ugwp_final

logical :: is_initialized = .False.

Expand Down Expand Up @@ -103,16 +103,16 @@ subroutine cires_ugwp_init (me, master, nlunit, input_nml_file, logunit, &
end subroutine cires_ugwp_init

! -----------------------------------------------------------------------
! finalize of cires_ugwp (_finalize)
! finalize of cires_ugwp (_final)
! -----------------------------------------------------------------------

!> The subroutine finalizes the CIRES UGWP
#if 0
!> \section arg_table_cires_ugwp_finalize Argument Table
!! \htmlinclude cires_ugwp_finalize.html
!> \section arg_table_cires_ugwp_final Argument Table
!! \htmlinclude cires_ugwp_final.html
!!
#endif
subroutine cires_ugwp_finalize(errmsg, errflg)
subroutine cires_ugwp_final(errmsg, errflg)

implicit none
!
Expand All @@ -125,11 +125,11 @@ subroutine cires_ugwp_finalize(errmsg, errflg)

if (.not.is_initialized) return

call cires_ugwpv0_mod_finalize()
call cires_ugwpv0_mod_final()

is_initialized = .false.

end subroutine cires_ugwp_finalize
end subroutine cires_ugwp_final

! -----------------------------------------------------------------------
! originally from ugwp_driver_v0.f
Expand Down Expand Up @@ -244,7 +244,7 @@ subroutine cires_ugwp_run(do_ugwp, me, master, im, levs, ntrac, dtp, kdt, lonr
real(kind=kind_phys), intent(in), dimension(:) :: rain

integer, intent(in) :: ntke
real(kind=kind_phys), intent(in), dimension(:,:) :: q_tke, dqdt_tke
real(kind=kind_phys), intent(in), dimension(:,:), optional :: q_tke, dqdt_tke

logical, intent(in) :: lprnt
integer, intent(in) :: ipr
Expand Down
4 changes: 3 additions & 1 deletion physics/GWD/cires_ugwp.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@

########################################################################
[ccpp-arg-table]
name = cires_ugwp_finalize
name = cires_ugwp_final
type = scheme
[errmsg]
standard_name = ccpp_error_message
Expand Down Expand Up @@ -791,6 +791,7 @@
type = real
kind = kind_phys
intent = in
optional = True
[dqdt_tke]
standard_name = process_split_cumulative_tendency_of_turbulent_kinetic_energy
long_name = turbulent kinetic energy tendency due to model physics
Expand All @@ -799,6 +800,7 @@
type = real
kind = kind_phys
intent = in
optional = True
[lprnt]
standard_name = flag_print
long_name = control flag for diagnostic print out
Expand Down
8 changes: 4 additions & 4 deletions physics/GWD/cires_ugwp_module.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module cires_ugwpv0_module
!/
!
! allocatable arrays, initilized during "cires_ugwp_init" &
! released during "cires_ugwp_finalize"
! released during "cires_ugwp_final"
!
real, allocatable :: kvg(:), ktg(:), krad(:), kion(:)
real, allocatable :: zkm(:), pmb(:)
Expand Down Expand Up @@ -227,11 +227,11 @@ subroutine cires_ugwpv0_mod_init (me, master, nlunit, input_nml_file, logunit, &
end subroutine cires_ugwpv0_mod_init
!
! -----------------------------------------------------------------------
! finalize of cires_ugwp (_finalize)
! finalize of cires_ugwp (_final)
! -----------------------------------------------------------------------

!> This subroutine deallocate sources/spectra and some diagnostics.
subroutine cires_ugwpv0_mod_finalize
subroutine cires_ugwpv0_mod_final
!
! deallocate sources/spectra & some diagnostics need to find where "deaalocate them"
! before "end" of the FV3GFS
Expand All @@ -245,5 +245,5 @@ subroutine cires_ugwpv0_mod_finalize
deallocate( zkm, pmb )
deallocate( rfdis, rfdist)

end subroutine cires_ugwpv0_mod_finalize
end subroutine cires_ugwpv0_mod_final
end module cires_ugwpv0_module
2 changes: 1 addition & 1 deletion physics/GWD/cires_ugwpv1_module.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ module cires_ugwpv1_module

!
! allocatable arrays, initilized during "cires_ugwp_init" &
! released during "cires_ugwp_finalize"
! released during "cires_ugwp_final"
!
real(kind=kind_phys), allocatable :: kvg(:), ktg(:), krad(:), kion(:)
real(kind=kind_phys), allocatable :: zkm(:), pmb(:)
Expand Down
12 changes: 6 additions & 6 deletions physics/GWD/ugwpv1_gsldrag.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module ugwpv1_gsldrag

private

public ugwpv1_gsldrag_init, ugwpv1_gsldrag_run, ugwpv1_gsldrag_finalize
public ugwpv1_gsldrag_init, ugwpv1_gsldrag_run, ugwpv1_gsldrag_final

logical :: is_initialized = .False.

Expand Down Expand Up @@ -249,15 +249,15 @@ subroutine ugwpv1_gsldrag_init ( &
end subroutine ugwpv1_gsldrag_init

! -----------------------------------------------------------------------
! finalize of ugwpv1_gsldrag (_finalize)
! finalize of ugwpv1_gsldrag (_final)
! -----------------------------------------------------------------------

!>@brief The subroutine finalizes the CIRES UGWP

!> \section arg_table_ugwpv1_gsldrag_finalize Argument Table
!! \htmlinclude ugwpv1_gsldrag_finalize.html
!> \section arg_table_ugwpv1_gsldrag_final Argument Table
!! \htmlinclude ugwpv1_gsldrag_final.html
!!
subroutine ugwpv1_gsldrag_finalize(errmsg, errflg)
subroutine ugwpv1_gsldrag_final(errmsg, errflg)

implicit none

Expand All @@ -274,7 +274,7 @@ subroutine ugwpv1_gsldrag_finalize(errmsg, errflg)

is_initialized = .false.

end subroutine ugwpv1_gsldrag_finalize
end subroutine ugwpv1_gsldrag_final

! -----------------------------------------------------------------------
! originally from ugwp_driver_v0.f
Expand Down
2 changes: 1 addition & 1 deletion physics/GWD/ugwpv1_gsldrag.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@

########################################################################
[ccpp-arg-table]
name = ugwpv1_gsldrag_finalize
name = ugwpv1_gsldrag_final
type = scheme
[errmsg]
standard_name = ccpp_error_message
Expand Down
18 changes: 9 additions & 9 deletions physics/GWD/unified_ugwp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ module unified_ugwp

use machine, only: kind_phys

! use cires_ugwp_module, only: knob_ugwp_version, cires_ugwp_mod_init, cires_ugwp_mod_finalize
use cires_ugwpv0_module, only: knob_ugwp_version, cires_ugwpv0_mod_init, cires_ugwpv0_mod_finalize
! use cires_ugwp_module, only: knob_ugwp_version, cires_ugwp_mod_init, cires_ugwp_mod_final
use cires_ugwpv0_module, only: knob_ugwp_version, cires_ugwpv0_mod_init, cires_ugwpv0_mod_final
use gwdps, only: gwdps_run
use cires_ugwp_triggers
use ugwp_driver_v0
Expand All @@ -46,7 +46,7 @@ module unified_ugwp

private

public unified_ugwp_init, unified_ugwp_run, unified_ugwp_finalize
public unified_ugwp_init, unified_ugwp_run, unified_ugwp_final

logical :: is_initialized = .false.

Expand Down Expand Up @@ -146,15 +146,15 @@ subroutine unified_ugwp_init (me, master, nlunit, input_nml_file, logunit, &
end subroutine unified_ugwp_init

! -----------------------------------------------------------------------
! finalize of unified_ugwp (_finalize)
! finalize of unified_ugwp (_final)
! -----------------------------------------------------------------------

!>@brief The subroutine finalizes the GFS UGWP

!> \section arg_table_unified_ugwp_finalize Argument Table
!! \htmlinclude unified_ugwp_finalize.html
!> \section arg_table_unified_ugwp_final Argument Table
!! \htmlinclude unified_ugwp_final.html
!!
subroutine unified_ugwp_finalize(do_ugwp_v0,do_ugwp_v0_nst_only, &
subroutine unified_ugwp_final(do_ugwp_v0,do_ugwp_v0_nst_only, &
errmsg, errflg)

implicit none
Expand All @@ -169,11 +169,11 @@ subroutine unified_ugwp_finalize(do_ugwp_v0,do_ugwp_v0_nst_only, &

if (.not.is_initialized) return

if ( do_ugwp_v0 .or. do_ugwp_v0_nst_only ) call cires_ugwpv0_mod_finalize()
if ( do_ugwp_v0 .or. do_ugwp_v0_nst_only ) call cires_ugwpv0_mod_final()

is_initialized = .false.

end subroutine unified_ugwp_finalize
end subroutine unified_ugwp_final

! -----------------------------------------------------------------------
! originally from ugwp_driver_v0.f
Expand Down
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 @@ -229,7 +229,7 @@

########################################################################
[ccpp-arg-table]
name = unified_ugwp_finalize
name = unified_ugwp_final
type = scheme
[do_ugwp_v0]
standard_name = flag_for_ugwp_version_0
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers)
type = real
kind = kind_phys
intent = in
intent = out
[dusfc1]
standard_name = instantaneous_surface_x_momentum_flux
long_name = surface momentum flux in the x-direction valid for current call
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
[shcnvcw]
standard_name = flag_for_saving_shallow_convective_cloud_area_fraction
long_name = flag for shallow convective cloud
units =
units = flag
dimensions = ()
type = logical
intent = in
Expand Down
Loading
Loading