Skip to content

Move diagnostics from sfc_diff to sfc_diag #2

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
wlanghans wants to merge 2 commits into
base: wolfgang/rebase_sofar-071124_on_main
Choose a base branch
from
Open

Move diagnostics from sfc_diff to sfc_diag #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab43646
Diagnose 10-m actual wind and neutral wind in sfc_diag for both diagn…
May 12, 2025
a1e43df
Reverted what I though was a bug fix but everything is just fine
May 12, 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
16 changes: 9 additions & 7 deletions GFS_layer/GFS_physics_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,11 +1214,9 @@ subroutine GFS_physics_driver &
Sfcprop%tsfc, Sfcprop%zorl, Sfcprop%ztrl, cd, &
cdq, rb, Statein%prsl(1,1), work3, islmsk, stress, &
Sfcprop%ffmm, Sfcprop%ffhh, &
Sfcprop%charnock, & ! Sofar added Spring 2023
Sfcprop%rhoa, & ! Sofar added 9/22/23
Sfcprop%u10m, Sfcprop%v10m, & ! Sofar added 11/17/23
Sfcprop%u10n, Sfcprop%v10n, & ! Sofar added 9/22/23
fm10_neutral, & ! Sofar added 10/19/23
Sfcprop%charnock, &
Sfcprop%rhoa, &
fm10_neutral, &
Sfcprop%uustar, &
wind, Tbd%phy_f2d(1,Model%num_p2d), fm10, fh2, &
sigmaf, vegtype, Sfcprop%shdmax, Model%ivegsrc, &
Expand Down Expand Up @@ -1520,7 +1518,9 @@ subroutine GFS_physics_driver &
Sfcprop%f10m, Diag%u10m, Diag%v10m, &
Sfcprop%t2m, Sfcprop%q2m, work3, evap, &
Sfcprop%ffmm, Sfcprop%ffhh, fm10, fh2, &
fm10_neutral, Diag%u10n, Diag%v10n) ! Added by Sofar: 10/19/23
Sfcprop%u10m, Sfcprop%v10m,&
fm10_neutral, Diag%u10n, Diag%v10n, &
Sfcprop%u10n, Sfcprop%v10n)
!endif

Tbd%phy_f2d(:,Model%num_p2d) = 0.0
Expand Down Expand Up @@ -3875,7 +3875,9 @@ subroutine GFS_physics_driver &
Sfcprop%f10m, Diag%u10m, Diag%v10m, Sfcprop%t2m, &
Sfcprop%q2m, work3, evap, Sfcprop%ffmm, &
Sfcprop%ffhh, fm10, fh2, &
fm10_neutral, Diag%u10n, Diag%v10n) ! Added by Sofar: 10/19/23
Sfcprop%u10m, Sfcprop%v10m,&
fm10_neutral, Diag%u10n, Diag%v10n, &
Sfcprop%u10n, Sfcprop%v10n)

if (Model%lssav) then
Diag%tmpmax (:) = max(Diag%tmpmax (:),Sfcprop%t2m(:))
Expand Down
13 changes: 9 additions & 4 deletions gsmphys/sfc_diag.f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
subroutine sfc_diag(im,ps,u1,v1,t1,q1,
& tskin,qsurf,f10m,u10m,v10m,t2m,q2m,
& prslki,evap,fm,fh,fm10,fh2,
& fm10_neutral,u10n,v10n) ! Sofar added: 10/19/23
& sfc_u10m,sfc_v10m,
& fm10_neutral u10n,v10n,
& sfc_u10n, sfc_v10n)
!
use machine , only : kind_phys
use funcphys, only : fpvs
Expand All @@ -13,7 +15,8 @@ subroutine sfc_diag(im,ps,u1,v1,t1,q1,
real, dimension(im) :: ps, u1, v1, t1, q1, tskin, qsurf,
& f10m, u10m, v10m, t2m, q2m, prslki, evap,
& fm, fh, fm10, fh2,
& fm10_neutral, u10n, v10n ! Added by Sofar: 10/19/23
& fm10_neutral, u10n, v10n,
& sfc_u10n, sfc_v10n, sfc_u10m, sfc_v10m
!
! locals
!
Expand All @@ -38,10 +41,12 @@ subroutine sfc_diag(im,ps,u1,v1,t1,q1,
! f10m(i) = min(f10m(i),1.)
u10m(i) = f10m(i) * u1(i)
v10m(i) = f10m(i) * v1(i)
! Sofar - start
sfc_u10m(i) = u10m(i)
sfc_v10m(i) = v10m(i)
u10n(i) = u1(i) * fm10_neutral(i) / fm(i)
v10n(i) = v1(i) * fm10_neutral(i) / fm(i)
! Sofar - end
sfc_u10n(i) = u10n(i)
sfc_v10n(i) = v10n(i)
fhi = fh2(i) / fh(i)
! t2m(i) = tskin(i)*(1. - fhi) + t1(i) * prslki(i) * fhi
! sig2k = 1. - (grav+grav) / (cp * t2m(i))
Expand Down
21 changes: 5 additions & 16 deletions gsmphys/sfc_diff_gfdl.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ subroutine sfc_diff_gfdl(im,ps,u1,v1,t1,q1,z1,
& snwdph,tskin,z0rl,ztrl,cm,ch,rb,
& prsl1,prslki,islimsk,
& stress,fm,fh,
& charnock, ! Sofar added Spring 2023
& rhoa, ! Sofar added 9/22/23
& u10m_array,v10m_array, ! Sofar added 11/17/23
& u10n,v10n, ! Sofar added 9/22/23
& fm10_neutral, ! Sofar added 10/19/23
& charnock,
& rhoa,
& fm10_neutral,
& ustar,wind,ddvel,fm10,fh2,
& sigmaf,vegtype,shdmax,ivegsrc,
& tsurf,flag_iter,redrag,
Expand All @@ -43,13 +41,12 @@ subroutine sfc_diff_gfdl(im,ps,u1,v1,t1,q1,z1,
&, prsl1, prslki, stress
&, fm, fh
&, charnock ! Sofar added Spring 2023
&, rhoa, u10n, v10n ! Sofar added 9/22/23
&, u10m_array, v10m_array ! Sofar added 11/17/23
&, rhoa
&, ustar, wind
&, ddvel
&, fm10, fh2, sigmaf, shdmax
&, tsurf, snwdph
&, fm_neutral, fm10_neutral ! Sofar added Spring 2023
&, fm_neutral, fm10_neutral
real(kind=kind_phys) :: ws1, ws10n ! Sofar added 10/19/23
integer, dimension(im) ::vegtype, islimsk

Expand Down Expand Up @@ -257,14 +254,6 @@ subroutine sfc_diff_gfdl(im,ps,u1,v1,t1,q1,z1,
! u10n = (u1(i) / ws1) * ws10n
! v10n = (v1(i) / ws1) * ws10n

! Compute neutral winds for output to Sfcprop
u10n(i) = u1(i) * fm10_neutral(i) / fm(i)
v10n(i) = v1(i) * fm10_neutral(i) / fm(i)

! Compute standard 10m winds for output to Sfcprop
u10m_array(i) = u1(i) * fm10(i) / fm(i)
v10m_array(i) = v1(i) * fm10(i) / fm(i)

! ---------------------------------------------- - Sofar (end)

u10m = u1(i) * fm10(i) / fm(i)
Expand Down