Skip to content
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

Jump to bottom

STY: Use capital W and lowercase m for watts per square meter #859

Merged
merged 6 commits into from
Nov 4, 2024
Merged

STY: Use capital W and lowercase m for watts per square meter #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e1ab90
STY: Use capital W for watts.
DWesl Jul 9, 2024
00ae596
STY: Use lowercase m for meters
DWesl Jul 12, 2024
71b6c80
Merge branch 'develop' of NOAA-EMC/fv3atm into sty-unit-consistency
DWesl Oct 11, 2024
5ca99e7
ENH: Include units fixes in atmos_cubed_sphere.
DWesl Oct 11, 2024
44bb447
Merge remote-tracking branch 'upstream' into sty-unit-consistency
DWesl Oct 24, 2024
02a5cde
acs hash update
jkbk2004 Nov 4, 2024
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 atmos_cubed_sphere
Open in desktop
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
Open in desktop
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 @@ -4543,7 +4543,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
Loading