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.

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

Physics Separator Merge Step2 #23

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
db84649
Initial addition of CCPP layer.
t-brown Jun 22, 2017
0ae6220
scheme definition file for gfs physics integration
llpcarson Aug 9, 2017
89c4acf
library makefile updates (#1)
llpcarson Aug 16, 2017
2f9fe37
Add -fPIC and LDFLAGS to the library build
llpcarson Aug 17, 2017
53e5d22
adding README file for workflow testing purposes
grantfirl Aug 24, 2017
2c55fce
Merge pull request #2 from grantfirl/features/ccpp
grantfirl Aug 24, 2017
2336c4a
Some small changes, in route to split apart SASAS
davegill Aug 28, 2017
bdd679a
comments for each entry var, rename subrs, enclose in module
davegill Aug 29, 2017
aebb1a4
few more table entries added
davegill Aug 30, 2017
781b445
separate ql into ql1 and ql2
davegill Aug 30, 2017
f5bc3e2
fill in table from Jongil Han information
davegill Aug 31, 2017
7fca15c
split out cloud ice and water, pass in qv only
davegill Aug 31, 2017
ecb8737
swap name from mfdeepcnv to sasasdeep_run
davegill Aug 31, 2017
3a62e3d
add the optional column
davegill Sep 1, 2017
7638477
Index errors, found by Julie
davegill Sep 5, 2017
91b4f17
... and commas are important, too!
davegill Sep 5, 2017
4a910af
Bugfix. (#6)
t-brown Sep 6, 2017
530288f
bringing in Tim +Laurie mods to GFSPHYSICS
davegill Sep 6, 2017
4c9b73a
column 7 for module name, turn "=" to "-" in variable table
davegill Sep 7, 2017
4b5618d
better names for u and v
davegill Sep 7, 2017
59a0626
maybe some of the doxygen things
davegill Sep 12, 2017
e774c11
Enclose contents of sfc_nst.f in a module.
christopherwharrop-noaa Sep 18, 2017
6636caf
Correct !!! by replacing with !!|
christopherwharrop-noaa Sep 19, 2017
4392e4e
Update some table entries.
christopherwharrop-noaa Sep 19, 2017
dae06e8
Table longname for time step is time_step_for_physics
davegill Sep 21, 2017
05d8559
Add subroutine sasasdeep_finalize (just a stub right now).
davegill Sep 21, 2017
ab8c931
Not just convection, DEEP convection in top description
davegill Sep 21, 2017
716760a
Update table
christopherwharrop-noaa Sep 29, 2017
61b455e
Move argument table.
christopherwharrop-noaa Sep 29, 2017
a4a6a0f
added doxygen formatting to mfdeepcnv.f
grantfirl Oct 9, 2017
edf3e72
Update long names in table.
christopherwharrop-noaa Oct 10, 2017
9ca704c
Merge branch 'master' into gfs_separator_SASS
grantfirl Oct 10, 2017
ec3ebcf
added doxygen-formatted comments
grantfirl Oct 10, 2017
dd4d60b
Merge branch 'harrop_gfs' of https://github.com/christopherwharrop/gm…
grantfirl Oct 10, 2017
0bf81e8
fixed kinematic heat fluxes in table (units too); fixed merging typo
grantfirl Oct 10, 2017
85582ff
Add NSST interstitials: nst_sfc_pre and nst_sfc_post.
christopherwharrop-noaa Oct 19, 2017
1d3ffc4
Update argument tables for NSST pre/post interstitials.
christopherwharrop-noaa Oct 25, 2017
9a352bc
Update some Doxygen content.
christopherwharrop-noaa Oct 26, 2017
23eca7c
Update long name in nst_sfc_run.
christopherwharrop-noaa Nov 6, 2017
82a1ca4
changed some longnames in the table for sasasdeep_run
grantfirl Nov 7, 2017
a948ddb
Fix long name errors.
christopherwharrop-noaa Nov 13, 2017
8585383
Fix xcosz longname.
christopherwharrop-noaa Nov 15, 2017
73fc8d6
Adding an image for NSST documentation.
Nov 15, 2017
ba7c00b
Modified files to add NSST documentation and correspondig bibliography.
Nov 15, 2017
cca0dd8
Merge branch 'harrop_gfs' of https://github.com/christopherwharrop/gm…
Nov 15, 2017
a9e084f
fixed argument table names to ionclude pre/post in order for longname…
grantfirl Nov 17, 2017
ac31c2c
Merge branch 'harrop_gfs' of https://github.com/christopherwharrop/gm…
grantfirl Nov 17, 2017
09c2ce5
longname updates
grantfirl Nov 18, 2017
40ef1e0
fixed cnvc units from flag to frac in mfdeepcnv.f
grantfirl Dec 7, 2017
3271356
Merge branch 'harrop_gfs' of https://github.com/christopherwharrop/gm…
llpcarson Dec 8, 2017
52c06f6
Merge branch 'gfs_separator_SASS' of https://github.com/davegill/gmtb…
llpcarson Dec 11, 2017
331ed44
Remove some CCPP-related code from this branch
llpcarson Dec 12, 2017
fc456fb
A couple of bug-fixes to get this to compile
llpcarson Dec 12, 2017
58c7e26
Merge branch 'master' into step2
llpcarson Dec 13, 2017
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
90 changes: 38 additions & 52 deletions GFS_layer/GFS_physics_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ module module_physics_driver
use ozne_def, only: levozp, oz_coeff, oz_pres
use h2o_def, only: levh2o, h2o_coeff, h2o_pres
use gfs_fv3_needs, only: get_prs_fv3, get_phi_fv3
use module_nst_water_prop, only: get_dtzm_2d
use sasas_deep, only: sasasdeep_run
use sfc_nst, only: sfc_nst_run
use sfc_nst_pre, only: sfc_nst_pre_run
use sfc_nst_post, only: sfc_nst_post_run
use GFS_typedefs, only: GFS_statein_type, GFS_stateout_type, &
GFS_sfcprop_type, GFS_coupling_type, &
GFS_control_type, GFS_grid_type, &
Expand Down Expand Up @@ -885,59 +888,41 @@ subroutine GFS_physics_driver &

if (Model%nstf_name(1) > 0) then

do i = 1, im
if ( islmsk(i) == 0 ) then
tem = (Sfcprop%oro(i)-Sfcprop%oro_uf(i)) * rlapse
tseal(i) = Sfcprop%tsfc(i) + tem
tsurf(i) = tsurf(i) + tem
endif
enddo

call sfc_nst (im, Model%lsoil, Statein%pgr, Statein%ugrs, &
Statein%vgrs, Statein%tgrs, Statein%qgrs, &
Sfcprop%tref, cd, cdq, Statein%prsl(1,1), work3, &
islmsk, Grid%xlon, Grid%sinlat, stress, &
Radtend%semis, gabsbdlw, adjsfcnsw, Sfcprop%tprcp, &
dtf, kdt, Model%solhr, xcosz, &
Tbd%phy_f2d(1,Model%num_p2d), flag_iter, &
flag_guess, Model%nstf_name, lprnt, ipr, &
call sfc_nst_pre_run(im, islmsk, Sfcprop%oro, Sfcprop%oro_uf, &
Sfcprop%tsfc, &
! --- Input/output
tseal, tsurf, Sfcprop%xt, Sfcprop%xs, Sfcprop%xu, &
Sfcprop%xv, Sfcprop%xz, Sfcprop%zm, Sfcprop%xtts, &
Sfcprop%xzts, Sfcprop%dt_cool, Sfcprop%z_c, &
Sfcprop%c_0, Sfcprop%c_d, Sfcprop%w_0, Sfcprop%w_d,&
Sfcprop%d_conv, Sfcprop%ifd, Sfcprop%qrain, &
tsurf, &
! --- outputs:
qss, gflx, Diag%cmm, Diag%chh, evap, hflx, ep1d)

! if (lprnt) print *,' tseaz2=',tseal(ipr),' tref=',tref(ipr),
! & ' dt_cool=',dt_cool(ipr),' dt_warm=',2.0*xt(ipr)/xz(ipr),
! & ' kdt=',kdt

do i = 1, im
if ( islmsk(i) == 0 ) then
tsurf(i) = tsurf(i) - (Sfcprop%oro(i)-Sfcprop%oro_uf(i)) * rlapse
endif
enddo
tseal)

call sfc_nst_run (im, Model%lsoil, Statein%pgr, Statein%ugrs(:,1), &
Statein%vgrs(:,1), Statein%tgrs(:,1), &
Statein%qgrs(:,1,1), Sfcprop%tref, cd, cdq, &
Statein%prsl(:,1), work3, islmsk, Grid%xlon, &
Grid%sinlat, stress, Radtend%semis, gabsbdlw, &
adjsfcnsw, Sfcprop%tprcp, dtf, kdt, Model%solhr, &
xcosz, Tbd%phy_f2d(:,Model%num_p2d), flag_iter, &
flag_guess, Model%nstf_name(1), Model%nstf_name(4),&
Model%nstf_name(5), lprnt, ipr, &
! --- Input/output
tseal, tsurf, Sfcprop%xt, Sfcprop%xs, Sfcprop%xu, &
Sfcprop%xv, Sfcprop%xz, Sfcprop%zm, Sfcprop%xtts, &
Sfcprop%xzts, Sfcprop%dt_cool, Sfcprop%z_c, &
Sfcprop%c_0, Sfcprop%c_d, Sfcprop%w_0, Sfcprop%w_d,&
Sfcprop%d_conv, Sfcprop%ifd, Sfcprop%qrain, &
! --- outputs:
qss, gflx, Diag%cmm, Diag%chh, evap, hflx, ep1d)

! --- ... run nsst model ... ---

if (Model%nstf_name(1) > 1) then
zsea1 = 0.001*real(Model%nstf_name(4))
zsea2 = 0.001*real(Model%nstf_name(5))
call get_dtzm_2d (Sfcprop%xt, Sfcprop%xz, Sfcprop%dt_cool, &
Sfcprop%z_c, Sfcprop%slmsk, zsea1, zsea2, &
im, 1, dtzm)
do i = 1, im
if ( islmsk(i) == 0 ) then
Sfcprop%tsfc(i) = max(271.2,Sfcprop%tref(i) + dtzm(i)) - &
(Sfcprop%oro(i)-Sfcprop%oro_uf(i))*rlapse
endif
enddo
endif

! if (lprnt) print *,' tseaz2=',tsea(ipr),' tref=',tref(ipr), &
! & ' dt_cool=',dt_cool(ipr),' dt_warm=',dt_warm(ipr),' kdt=',kdt
call sfc_nst_post_run(im, islmsk, Sfcprop%oro, Sfcprop%oro_uf, &
Model%nstf_name(1), Model%nstf_name(4), &
Model%nstf_name(5), Sfcprop%xt, Sfcprop%xz, &
Sfcprop%dt_cool, Sfcprop%z_c, Sfcprop%slmsk, &
Sfcprop%tref, Grid%xlon, &
! --- Input/output
tsurf, &
! --- outputs:
dtzm, Sfcprop%tsfc)

else

Expand Down Expand Up @@ -1680,8 +1665,9 @@ subroutine GFS_physics_driver &
islmsk, Statein%vvl, Model%ncld, ud_mf, dd_mf, &
dt_mf, cnvw, cnvc)
elseif (Model%imfdeepcnv == 2) then
call mfdeepcnv (im, ix, levs, dtp, del, Statein%prsl, &
Statein%pgr, Statein%phil, clw(:,:,1:2), Stateout%gq0, &
call sasasdeep_run (im, ix, levs, dtp, del, Statein%prsl, &
Statein%pgr, Statein%phil, clw(:,:,1), &
clw(:,:,2), Stateout%gq0(:,:,1), &
Stateout%gt0, Stateout%gu0, Stateout%gv0, &
cld1d, rain1, kbot, ktop, kcnv, islmsk, &
garea, Statein%vvl, Model%ncld, ud_mf, dd_mf, &
Expand Down
1 change: 1 addition & 0 deletions physics/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is a test readme file for workflow testing purposes.
Binary file added physics/docs/img/NSST.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions physics/docs/library.bib
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,24 @@ @article{king_and_harshvardhan_1986
Volume = {43},
Year = {1986}}

@url{Li_2015,
Author = {Xu Li},
Title = {The development of the NSST within the NCEP GFS/CFS},
Url = {http://cpo.noaa.gov/sites/cpo/MAPP/workshops/rtf_technical_ws/presentations/21_Xu_Li.pdf}}

@url{Li_Derber_2009,
Author = {Xu Li and John Derber},
Title = {Near Sea Surface Temperatures (NSST) Analysis in NCEP GFS},
Url = {https://www.jcsda.noaa.gov/documents/meetings/wkshp2008/4/JCSDA_2008_Li.pdf}}

@article{Fairall_all_1996,
Author = {C. W. Fairall and E. F. Bradley and J. S. Godfrey and G. A. Wick and J. B. Edson and G. S. Young},
Journal = {J. Geophys. Res.},
Pages = {1295-1308},
Title = {Cool-skin and warm-layer effects on sea surface temperature},
Volume = {101(C1)},
Year = {1996}}

@url{key_2002,
Address = {Madison, Wisconsin},
Author = {J.R. Key},
Expand Down
Loading