Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into rrfsv1-to-ufs/dev2
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkbk2004
jkbk2004 committed Nov 6, 2024
2 parents f689f5e + bd785e5 commit 1947bad
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Submodule atmos_cubed_sphere updated 7 files
+10 −10 driver/UFS/fv_nggps_diag.F90
+1 −1 tools/external_ic.F90
+2 −2 tools/fv_diag_column.F90
+16 −16 tools/fv_diagnostics.F90
+8 −8 tools/fv_eta.F90
+7 −7 tools/fv_nudge.F90
+2 −2 tools/test_cases.F90
32 changes: 16 additions & 16 deletions ccpp/driver/GFS_diagnostics.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'sw_upfxc'
ExtDiag(idx)%desc = 'total sky upward sw flux at toa - GFS radiation'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -1010,7 +1010,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'sw_dnfxc'
ExtDiag(idx)%desc = 'total sky downward sw flux at toa - GFS radiation'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -1022,7 +1022,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'sw_upfx0'
ExtDiag(idx)%desc = 'clear sky upward sw flux at toa - GFS radiation'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -1034,7 +1034,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'lw_upfxc'
ExtDiag(idx)%desc = 'total sky upward lw flux at toa - GFS radiation'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -1046,7 +1046,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'lw_upfx0'
ExtDiag(idx)%desc = 'clear sky upward lw flux at toa - GFS radiation'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand Down Expand Up @@ -1234,7 +1234,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'shtfl_ave'
ExtDiag(idx)%desc = 'surface sensible heat flux'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%cnvfac = cn_one
ExtDiag(idx)%time_avg = .TRUE.
Expand All @@ -1248,7 +1248,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'lhtfl_ave'
ExtDiag(idx)%desc = 'surface latent heat flux'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%cnvfac = cn_one
ExtDiag(idx)%time_avg = .TRUE.
Expand Down Expand Up @@ -1306,7 +1306,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'dlwsfc'
ExtDiag(idx)%desc = 'time accumulated downward lw flux at surface'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -1318,7 +1318,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ulwsfc'
ExtDiag(idx)%desc = 'time accumulated upward lw flux at surface'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand Down Expand Up @@ -1399,7 +1399,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'pevpr_ave'
ExtDiag(idx)%desc = 'averaged potential evaporation rate'
ExtDiag(idx)%unit = 'W/M**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%time_avg = .TRUE.
allocate (ExtDiag(idx)%data(nblks))
Expand Down Expand Up @@ -2073,7 +2073,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'dlwsfci'
ExtDiag(idx)%desc = 'instantaneous sfc downward lw flux'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -2085,7 +2085,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ulwsfci'
ExtDiag(idx)%desc = 'instantaneous sfc upward lw flux'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -2097,7 +2097,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'dswsfci'
ExtDiag(idx)%desc = 'instantaneous sfc downward sw flux'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand All @@ -2109,7 +2109,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'uswsfci'
ExtDiag(idx)%desc = 'instantaneous sfc upward sw flux'
ExtDiag(idx)%unit = 'w/m**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
ExtDiag(idx)%intpl_method = 'bilinear'
allocate (ExtDiag(idx)%data(nblks))
Expand Down Expand Up @@ -2213,7 +2213,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'pevpr'
ExtDiag(idx)%desc = 'instantaneous surface potential evaporation'
ExtDiag(idx)%unit = 'W/M**2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
Expand Down Expand Up @@ -4457,7 +4457,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'qrain'
ExtDiag(idx)%desc = 'nsst sensible heat flux due to rainfall'
ExtDiag(idx)%unit = 'w/m2'
ExtDiag(idx)%unit = 'W/m**2'
ExtDiag(idx)%mod_name = 'gfs_sfc'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
Expand Down

0 comments on commit 1947bad

Please sign in to comment.