Skip to content

ufs_public_release: update version number and authors, bugfix for samfdeepcnv.f, update of scientific documentation #374

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

Merged
climbfuji merged 13 commits into from
Jan 10, 2020
Merged

ufs_public_release: update version number and authors, bugfix for samfdeepcnv.f, update of scientific documentation #374

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bc3f3de
doc for ufs_public_release
mzhangw Dec 17, 2019
e22ebf5
integrate Grant documentation
mzhangw Dec 18, 2019
2a89352
doc updates
mzhangw Dec 26, 2019
2308ad8
Update version number to 4.0.0 and update list of authors
climbfuji Dec 26, 2019
c2235b2
doc updates
mzhangw Dec 28, 2019
83ce6b5
doc updates
mzhangw Jan 2, 2020
bca3068
doc updates
mzhangw Jan 2, 2020
df915cc
doc updates
mzhangw Jan 3, 2020
9c9f413
doc update
mzhangw Jan 6, 2020
bc12130
Merge branch 'doc4ufs_public_release' of https://github.com/mzhangw/c…
mzhangw Jan 6, 2020
9a529d7
code changed to pass RTs
mzhangw Jan 7, 2020
2d0a0aa
physics/samfdeepcnv.f: bugfix to prevent using uninitialized variable…
climbfuji Jan 7, 2020
20b27b3
Merge branch 'doc4ufs_public_release' of https://github.com/mzhangw/c…
climbfuji Jan 9, 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
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ set(CMAKE_MACOSX_RPATH 1)

if(POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
project(ccppphys VERSION 3.0.0)
project(ccppphys VERSION 4.0.0)
else(POLICY CMP0048)
project(ccppphys)
set(PROJECT_VERSION 3.0.0)
set(PROJECT_VERSION_MAJOR 3)
set(PROJECT_VERSION 4.0.0)
set(PROJECT_VERSION_MAJOR 4)
set(PROJECT_VERSION_MINOR 0)
set(PROJECT_VERSION_PATCH 0)
endif(POLICY CMP0048)
Expand All @@ -27,7 +27,7 @@ endif(POLICY CMP0042)

#------------------------------------------------------------------------------
set(PACKAGE "ccpp-physics")
set(AUTHORS "Grant J. Firl" "Dom Heinzeller")
set(AUTHORS "Grant J. Firl" "Dom Heinzeller" "Laurie Carson" "Ligia Bernardet" "Man Zhang")

#------------------------------------------------------------------------------
# Enable Fortran
Expand Down
28 changes: 14 additions & 14 deletions physics/samfdeepcnv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,22 +1554,22 @@ subroutine samfdeepcnv_run (im,ix,km,itc,ntc,cliq,cp,cvap, &
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