Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions GFS_layer/GFS_physics_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,6 @@ subroutine GFS_physics_driver &
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
Expand Down Expand Up @@ -1520,7 +1519,7 @@ 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
fm10_neutral, Diag%u10n, Diag%v10n, Sfcprop%rhoa) ! Added by Sofar: 10/19/23
!endif

Tbd%phy_f2d(:,Model%num_p2d) = 0.0
Expand Down Expand Up @@ -3875,7 +3874,7 @@ 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
fm10_neutral, Diag%u10n, Diag%v10n, Sfcprop%rhoa) ! Added by Sofar: 10/19/23

if (Model%lssav) then
Diag%tmpmax (:) = max(Diag%tmpmax (:),Sfcprop%t2m(:))
Expand Down
10 changes: 7 additions & 3 deletions gsmphys/sfc_diag.f
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
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
& fm10_neutral,u10n,v10n, rhoa) ! Sofar added: 10/19/23
!
use machine , only : kind_phys
use funcphys, only : fpvs
use physcons, grav => con_g, cp => con_cp,
& eps => con_eps, epsm1 => con_epsm1
& eps => con_eps, epsm1 => con_epsm1,
& rvrdm1 => con_fvirt, rd => con_rd

implicit none
!
integer im
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, rhoa ! Added by Sofar: 10/19/23
!
! locals
!
Expand Down Expand Up @@ -60,6 +62,8 @@ subroutine sfc_diag(im,ps,u1,v1,t1,q1,
qss = fpvs(t2m(i))
qss = eps * qss / (ps(i) + epsm1 * qss)
q2m(i) = min(q2m(i),qss)
rhoa(i) =
& ps(i) / (rd * t2m(i) * (1.0 + rvrdm1 * max(q2m(i),1.e-8)))
enddo

return
Expand Down
6 changes: 1 addition & 5 deletions gsmphys/sfc_diff_gfdl.f
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ subroutine sfc_diff_gfdl(im,ps,u1,v1,t1,q1,z1,
& 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
Expand Down Expand Up @@ -43,7 +42,7 @@ 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
&, u10n, v10n ! Sofar added 9/22/23
&, u10m_array, v10m_array ! Sofar added 11/17/23
&, ustar, wind
&, ddvel
Expand All @@ -66,7 +65,6 @@ subroutine sfc_diff_gfdl(im,ps,u1,v1,t1,q1,z1,
& hl1, hl12, pm, ph, pm10, ph2, rat,
& thv1, tvs, z1i, z0, zt, z0max, ztmax,
& fms, fhs, hl0, hl0inf, hlinf,
& tv1, ! Sofar added 9/22/23
& hl110, hlt, hltinf, olinf,
& restar, czilc, tem1, tem2,
& u10m, v10m, ws10m, ws10m_moon, !kgao
Expand Down Expand Up @@ -96,8 +94,6 @@ subroutine sfc_diff_gfdl(im,ps,u1,v1,t1,q1,z1,
& + max(0.0, min(ddvel(i), 30.0)), 1.0)
tem1 = 1.0 + rvrdm1 * max(q1(i),1.e-8)
thv1 = t1(i) * prslki(i) * tem1
tv1 = t1(i) * tem1 ! Sofar added 9/22/23
rhoa(i) = prsl1(i) / (rd*tv1) ! Sofar added 9/22/23
tvs = 0.5 * (tsurf(i)+tskin(i)) * tem1
qs1 = fpvs(t1(i))
qs1 = max(1.0e-8, eps * qs1 / (prsl1(i) + epsm1 * qs1))
Expand Down