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

ufs_public_release: update version number for CCPP, bugfix for samfdeepcnv.f #33

Merged
merged 6 commits into from
Jan 12, 2020
Merged

ufs_public_release: update version number for CCPP, bugfix for samfdeepcnv.f #33

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
a194628
Update version number for CCPP
climbfuji Dec 26, 2019
7458cc0
Update submodule pointers and .gitmodules for code review
climbfuji Dec 26, 2019
842fd54
gfsphysics/physics/samfdeepcnv.f: bugfix to prevent using uninitializ…
climbfuji Jan 7, 2020
5451fd4
Update submodule pointer for ccpp-physics after pulling in scientific…
climbfuji Jan 9, 2020
8f60a29
Merge branch 'ufs_public_release' of https://github.com/NOAA-EMC/fv3a…
climbfuji Jan 9, 2020
6b67b83
Revert change to .gitmodules, update submodule pointers for ccpp/fram…
climbfuji Jan 10, 2020
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 ccpp/framework
Open in desktop
Submodule framework updated 1 files
+4 −4 CMakeLists.txt
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 37 files
+4 −4 CMakeLists.txt
+1 −1 physics/GFS_GWD_generic.F90
+1 −1 physics/GFS_rad_time_vary.fv3.F90
+1 −1 physics/GFS_rrtmg_pre.F90
+2 −4 physics/GFS_rrtmg_setup.F90
+1 −1 physics/GFS_time_vary_pre.fv3.F90
+61 −17 physics/cires_ugwp.F90
+5 −0 physics/cires_ugwp_module.F90
+26 −5 physics/cires_ugwp_triggers.F90
+5 −1 physics/cires_ugwp_utils.F90
+5 −0 physics/cires_vert_lsatdis.F90
+7 −0 physics/cires_vert_orodis.F90
+5 −0 physics/cires_vert_wmsdis.F90
+1 −11 physics/docs/ccpp_dox_layout.xml
+46 −22 physics/docs/pdftxt/CPT_adv_suite.txt
+1 −1 physics/docs/pdftxt/GFS_OZPHYS.txt
+1 −1 physics/docs/pdftxt/GFS_SAMFdeep.txt
+1 −1 physics/docs/pdftxt/GFS_SAMFshal.txt
+35 −0 physics/docs/pdftxt/GFS_SATMEDMFVDIFQ.txt
+117 −0 physics/docs/pdftxt/GFS_UGWPv0.txt
+227 −0 physics/docs/pdftxt/GFSv15p2_suite.txt
+271 −0 physics/docs/pdftxt/GFSv16beta_suite.txt
+150 −81 physics/docs/pdftxt/GSD_adv_suite.txt
+0 −21 physics/docs/pdftxt/UGWPv0.txt
+26 −30 physics/docs/pdftxt/all_shemes_list.txt
+11 −11 physics/docs/pdftxt/mainpage.txt
+101 −15 physics/docs/pdftxt/suite_input.nml.txt
+459 −0 physics/docs/ufs_doxyfile
+1 −1 physics/mfpbltq.f
+1 −1 physics/module_gfdl_cloud_microphys.F90
+1 −1 physics/ozphys_2015.f
+4 −4 physics/radlw_param.f
+6 −6 physics/radsw_param.f
+14 −14 physics/samfdeepcnv.f
+163 −70 physics/satmedmfvdifq.F
+3 −0 physics/tridi.f
+57 −39 physics/ugwp_driver_v0.F
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15p2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15p2" lib="ccppphys" ver="3">
<suite name="FV3_GFS_v15p2" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16beta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v16beta" lib="ccppphys" ver="3">
<suite name="FV3_GFS_v16beta" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
28 changes: 14 additions & 14 deletions gfsphysics/physics/samfdeepcnv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1547,22 +1547,22 @@ subroutine samfdeepcnv(im,ix,km,delt,itc,ntc,ntk,ntr,delp,
enddo
enddo
do i = 1, im
betamn = betas
if(islimsk(i) == 1) betamn = betal
if(ntk > 0) then
betamx = betamn + dbeta
if(tkemean(i) > tkemx) then
beta = betamn
else if(tkemean(i) < tkemn) then
beta = betamx
if(cnvflg(i)) then
betamn = betas
if(islimsk(i) == 1) betamn = betal
if(ntk > 0) then
betamx = betamn + dbeta
if(tkemean(i) > tkemx) then
beta = betamn
else if(tkemean(i) < tkemn) then
beta = betamx
else
tem = (betamx - betamn) * (tkemean(i) - tkemn)
beta = betamx - tem / dtke
endif
else
tem = (betamx - betamn) * (tkemean(i) - tkemn)
beta = betamx - tem / dtke
beta = betamn
endif
else
beta = betamn
endif
if(cnvflg(i)) then
dz = (sumx(i)+zi(i,1))/float(kbcon(i))
tem = 1./float(kbcon(i))
xlamd(i) = (1.-beta**tem)/dz
Expand Down