Skip to content

DRAFT FOR DOM: Feature/capgen_for_fuji #1192

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

Draft
dustinswales wants to merge 8 commits into
base: main
Choose a base branch
from
+275 −313
Draft

DRAFT FOR DOM: Feature/capgen_for_fuji #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5eb8312
Clean set of physics changes for Capgen transition
dustinswales Sep 22, 2025
d47eb27
Changes from fortran-to-metadata comparision
dustinswales Sep 22, 2025
c805cf8
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into feat…
dustinswales Sep 23, 2025
385e0fc
One more small change
dustinswales Nov 26, 2025
b049e63
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into feat…
dustinswales Nov 26, 2025
ca813d5
Resolve some merge conflicts
dustinswales Nov 26, 2025
c63f534
A few more merge conflicts resolved
dustinswales Nov 26, 2025
a92c54b
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into feat…
Feb 2, 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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
[submodule "physics/MP/TEMPO/TEMPO"]
path = physics/MP/TEMPO/TEMPO
url = https://github.com/NCAR/TEMPO
branch = main
branch = feature/capgen
2 changes: 1 addition & 1 deletion physics/CONV/Grell_Freitas/cu_gf_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_co
integer, dimension (:), intent(out) :: hbot,htop,kcnv
integer, dimension (:), intent(in) :: xland
real(kind=kind_phys), dimension (:), intent(in) :: pbl
real(kind=kind_phys), dimension (:), intent(in) :: maxMF
real(kind=kind_phys), dimension (:), intent(in), optional :: maxMF
!$acc declare copyout(hbot,htop,kcnv)
!$acc declare copyin(xland,pbl)
integer, dimension (im) :: tropics
Expand Down
1 change: 1 addition & 0 deletions physics/CONV/Grell_Freitas/cu_gf_driver.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@
type = real
kind = kind_phys
intent = inout
optional = True
[cliw]
standard_name = ice_water_mixing_ratio_convective_transport_tracer
long_name = ratio of mass of ice water to mass of dry air plus vapor (without condensates) in the convectively transported tracer array
Expand Down
4 changes: 3 additions & 1 deletion physics/CONV/SAMF/samfdeepcnv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ module samfdeepcnv
use progomega, only : progomega_calc

contains

!! \section arg_table_samfdeepcnv_init Argument Table
!! \htmlinclude samfdeepcnv_init.html
!!
subroutine samfdeepcnv_init(imfdeepcnv,imfdeepcnv_samf, &
& errmsg, errflg)

Expand Down
3 changes: 3 additions & 0 deletions physics/CONV/SAMF/samfshalcnv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ module samfshalcnv
use progomega, only : progomega_calc
contains

!! \section arg_table_samfshalcnv_init Argument Table
!! \htmlinclude samfshalcnv_init.html
!!
subroutine samfshalcnv_init(imfshalcnv, imfshalcnv_samf, &
& errmsg, errflg)

Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
intent = in
intent = inout
[gq0]
standard_name = tracer_concentration_of_new_state
long_name = tracer concentration updated by physics
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_tracers)
type = real
kind = kind_phys
intent = in
intent = inout
[ntqv]
standard_name = index_of_specific_humidity_in_tracer_concentration_array
long_name = tracer index for water vapor (specific humidity)
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
standard_name = total_cloud_fraction
long_name = layer total cloud fraction
units = frac
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = in
Expand Down
39 changes: 26 additions & 13 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 @@ -528,7 +528,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%qrain ', Sfcprop%qrain)
end if
! CCPP/RUC only
if (Model%lsm == Model%lsm_ruc) then
if (Model%lsm == Model%ilsm_ruc) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%sh2o', Sfcprop%sh2o)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%smois', Sfcprop%smois)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%tslb', Sfcprop%tslb)
Expand All @@ -548,14 +548,14 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%emis_ice', Sfcprop%emis_ice)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%emis_wat', Sfcprop%emis_wat)
! NoahMP and RUC
if (Model%lsm == Model%lsm_ruc .or. Model%lsm == Model%lsm_noahmp) then
if (Model%lsm == Model%ilsm_ruc .or. Model%lsm == Model%ilsm_noahmp) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirvis_lnd', Sfcprop%albdirvis_lnd)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirnir_lnd', Sfcprop%albdirnir_lnd)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdifvis_lnd', Sfcprop%albdifvis_lnd)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdifnir_lnd', Sfcprop%albdifnir_lnd)
end if
! RUC only
if (Model%lsm == Model%lsm_ruc) then
if (Model%lsm == Model%ilsm_ruc) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirvis_ice', Sfcprop%albdirvis_ice)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdifvis_ice', Sfcprop%albdifvis_ice)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%albdirnir_ice', Sfcprop%albdirnir_ice)
Expand Down Expand Up @@ -703,7 +703,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%tdoms ', Diag%tdoms)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%trans ', Diag%trans)
! CCPP/RUC only
if (Model%lsm == Model%lsm_ruc) then
if (Model%lsm == Model%ilsm_ruc) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%wetness ', Sfcprop%wetness)
else
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%wet1 ', Diag%wet1)
Expand Down Expand Up @@ -909,7 +909,7 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
end if
if (Model%do_RRTMGP) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Coupling%fluxlwUP_jac', Coupling%fluxlwUP_jac)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Coupling%htrlw', Coupling%htrlw)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Coupling%hrlw', Coupling%hrlw)
end if
!
! Grid
Expand Down Expand Up @@ -1036,12 +1036,24 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
do iomp=0,ompsize-1
if (mpirank==impi .and. omprank==iomp) then
! Print static variables
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%itc ', Interstitial%itc )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nsamftrac ', Interstitial%nsamftrac )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nscav ', Interstitial%nscav )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ntiwx ', Interstitial%ntiwx )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%nvdiff ', Interstitial%nvdiff )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%trans_aero ', Interstitial%trans_aero )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ipr ', Interstitial%ipr )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%itc ', Model%itc )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%latidxprnt ', Interstitial%latidxprnt )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%levi ', Interstitial%levi )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%lmk ', Model%lmk )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%lmp ', Model%lmp )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nbdlw ', Model%nbdlw )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nbdsw ', Model%nbdsw )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nf_aelw ', Model%nf_aelw )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nf_aesw ', Model%nf_aesw )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nsamftrac ', Model%nsamftrac )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nscav ', Model%nscav )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nspc1 ', Model%nspc1 )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%ntiwx ', Model%ntiwx )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%nvdiff ', Model%nvdiff )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%phys_hydrostatic ', Interstitial%phys_hydrostatic )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%skip_macro ', Interstitial%skip_macro )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%trans_aero ', Model%trans_aero )
! Print all other variables
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%adjsfculw_land ', Interstitial%adjsfculw_land )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%adjsfculw_ice ', Interstitial%adjsfculw_ice )
Expand Down Expand Up @@ -1080,6 +1092,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cmm_land ', Interstitial%cmm_land )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cmm_water ', Interstitial%cmm_water )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cnvc ', Interstitial%cnvc )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cnvw ', Cldprop%cnvw )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ctei_r ', Interstitial%ctei_r )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%ctei_rml ', Interstitial%ctei_rml )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%cumabs ', Interstitial%cumabs )
Expand Down Expand Up @@ -1318,7 +1331,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%qgl ', Interstitial%qgl )
end if
! Noah MP
if (Model%lsm == Model%lsm_noahmp) then
if (Model%lsm == Model%ilsm_noahmp) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%t2mmp ', Interstitial%t2mmp )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%q2mp ', Interstitial%q2mp )
end if
Expand Down Expand Up @@ -1392,7 +1405,7 @@ subroutine GFS_abort_run (Model, blkno, errmsg, errflg)
errmsg = ''
errflg = 0

if (Model%kdt==1 .and. blkno==size(Model%blksz)) then
if (Model%kdt==1 .and. blkno==size(Model%chunks)) then
if (Model%me==Model%master) write(0,*) "GFS_abort_run: ABORTING MODEL"
call sleep(10)
stop
Expand Down
26 changes: 16 additions & 10 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 @@ -2,6 +2,8 @@
name = GFS_diagtoscreen
type = scheme
dependencies = ../../hooks/machine.F
dependencies = ../../../../../scm/src/GFS_typedefs.F90,../../../../../scm/src/CCPP_typedefs.F90
module_name = GFS_diagtoscreen

########################################################################
[ccpp-arg-table]
Expand Down Expand Up @@ -286,8 +288,8 @@
type = integer
intent = in
[blkno]
standard_name = ccpp_block_number
long_name = number of block for explicit data blocking in CCPP
standard_name = ccpp_chunk_number
long_name = number of chunk for using array chunks in CCPP
units = index
dimensions = ()
type = integer
Expand All @@ -313,6 +315,7 @@
name = GFS_interstitialtoscreen
type = scheme
dependencies = ../../hooks/machine.F
module_name = GFS_interstitialtoscreen

########################################################################
[ccpp-arg-table]
Expand Down Expand Up @@ -403,8 +406,8 @@
type = integer
intent = in
[blkno]
standard_name = ccpp_block_number
long_name = number of block for explicit data blocking in CCPP
standard_name = ccpp_chunk_number
long_name = number of chunk for using array chunks in CCPP
units = index
dimensions = ()
type = integer
Expand All @@ -430,6 +433,7 @@
name = GFS_abort
type = scheme
dependencies = ../../hooks/machine.F
module_name = GFS_abort

########################################################################
[ccpp-arg-table]
Expand All @@ -443,8 +447,8 @@
type = GFS_control_type
intent = in
[blkno]
standard_name = ccpp_block_number
long_name = number of block for explicit data blocking in CCPP
standard_name = ccpp_chunk_number
long_name = number of chunk for using array chunks in CCPP
units = index
dimensions = ()
type = integer
Expand All @@ -470,6 +474,7 @@
name = GFS_checkland
type = scheme
dependencies = ../../hooks/machine.F
module_name = GFS_checkland

########################################################################
[ccpp-arg-table]
Expand All @@ -490,8 +495,8 @@
type = integer
intent = in
[blkno]
standard_name = ccpp_block_number
long_name = number of block for explicit data blocking in CCPP
standard_name = ccpp_chunk_number
long_name = number of chunk for using array chunks in CCPP
units = index
dimensions = ()
type = integer
Expand Down Expand Up @@ -729,6 +734,7 @@
name = GFS_checktracers
type = scheme
dependencies = ../../hooks/machine.F
module_name = GFS_checktracers

########################################################################
[ccpp-arg-table]
Expand Down Expand Up @@ -905,8 +911,8 @@
type = integer
intent = in
[blkno]
standard_name = ccpp_block_number
long_name = number of block for explicit data blocking in CCPP
standard_name = ccpp_chunk_number
long_name = number of chunk for using array chunks in CCPP
units = index
dimensions = ()
type = integer
Expand Down
16 changes: 8 additions & 8 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ subroutine GFS_rad_time_vary_timestep_init (lrseeds, rseeds,

! Interface variables
logical, intent(in) :: lrseeds
integer, intent(in) :: rseeds(:,:)
integer, intent(in), optional :: rseeds(:,:)
integer, intent(in) :: isubc_lw, isubc_sw, cnx, cny, isc, jsc, kdt
integer, intent(in) :: imp_physics, imp_physics_zhao_carr, ipsd0, ipsdlim
logical, intent(in) :: lslwr, lsswr
integer, intent(inout) :: icsdsw(:), icsdlw(:)
integer, intent(inout), optional :: icsdsw(:), icsdlw(:)
integer, intent(in) :: imap(:), jmap(:)
real(kind_phys), intent(in) :: sec
real(kind_phys), intent(inout) :: ps_2delt(:)
real(kind_phys), intent(inout) :: ps_1delt(:)
real(kind_phys), intent(inout) :: t_2delt(:,:)
real(kind_phys), intent(inout) :: t_1delt(:,:)
real(kind_phys), intent(inout) :: qv_2delt(:,:)
real(kind_phys), intent(inout) :: qv_1delt(:,:)
real(kind_phys), intent(inout), optional :: ps_2delt(:)
real(kind_phys), intent(inout), optional :: ps_1delt(:)
real(kind_phys), intent(inout), optional :: t_2delt(:,:)
real(kind_phys), intent(inout), optional :: t_1delt(:,:)
real(kind_phys), intent(inout), optional :: qv_2delt(:,:)
real(kind_phys), intent(inout), optional :: qv_1delt(:,:)
real(kind_phys), intent(in) :: t(:,:), qv(:,:), ps(:)
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg
Expand Down
2 changes: 1 addition & 1 deletion physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
standard_name = tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep
long_name = longwave clear sky heating rate
units = K s-1
dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation)
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
intent = inout
Expand Down
6 changes: 3 additions & 3 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
units = flag
dimensions = (horizontal_loop_extent)
type = integer
intent = inout
intent = in
[alvsf]
standard_name = vis_albedo_strong_cosz
long_name = mean vis albedo with strong cosz dependency
Expand Down Expand Up @@ -376,15 +376,15 @@
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
intent = inout
[semis_ice]
standard_name = surface_longwave_emissivity_over_ice
long_name = surface lw emissivity in fraction over ice
units = frac
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
intent = inout
[semis_wat]
standard_name = surface_longwave_emissivity_over_water
long_name = surface lw emissivity in fraction over water
Expand Down
Loading
Loading