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

GitHub CCPP update to VLab master 2019/04/29 #239

Merged
merged 3 commits into from
May 3, 2019
Merged

GitHub CCPP update to VLab master 2019/04/29 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
348d572
physics/GFS_MP_generic.F90: update calculation of srflag according to…
climbfuji Apr 29, 2019
52b847d
physics/iccninterp.F90: update regression test name in comment
climbfuji Apr 29, 2019
77beadc
physics/gfdl_cloud_microphys.F90: introduce second volatile variable …
climbfuji May 2, 2019
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 physics/GFS_MP_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, nt
! endif
! compute fractional srflag
total_precip = snow0(i)+ice0(i)+graupel0(i)+rain0(i)+rainc(i)
if (total_precip*tem > rainmin) then
if (total_precip > rainmin) then
srflag(i) = (snow0(i)+ice0(i)+graupel0(i)+csnow)/total_precip
endif
enddo
Expand Down
11 changes: 6 additions & 5 deletions physics/gfdl_cloud_microphys.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ subroutine gfdl_cloud_microphys_run( &
real(kind=kind_phys) :: onebg
real(kind=kind_phys) :: tem
#ifdef TRANSITION
real(kind=kind_phys), volatile :: volatile_var
real(kind=kind_phys), volatile :: volatile_var1, volatile_var2
#endif


Expand Down Expand Up @@ -322,10 +322,11 @@ subroutine gfdl_cloud_microphys_run( &
! values of rain0, ice0, snow0, graupel0 (for bit-for-bit)
do i=1,im
#ifdef TRANSITION
volatile_var = rain0(i)+snow0(i)+ice0(i)+graupel0(i)
prcp0(i) = volatile_var * tem
if ( volatile_var * tem > rainmin ) then
sr(i) = (snow0(i) + ice0(i) + graupel0(i)) / volatile_var
volatile_var1 = rain0(i)+snow0(i)+ice0(i)+graupel0(i)
volatile_var2 = snow0(i)+ice0(i)+graupel0(i)
prcp0(i) = volatile_var1 * tem
if ( volatile_var1 * tem > rainmin ) then
sr(i) = volatile_var2 / volatile_var1
#else
prcp0(i) = (rain0(i)+snow0(i)+ice0(i)+graupel0(i)) * tem
if ( prcp0(i) > rainmin ) then
Expand Down
4 changes: 2 additions & 2 deletions physics/iccninterp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ SUBROUTINE ciinterpol(me,npts,IDATE,FHOUR,jindx1,jindx2,ddy, &
! i.e. i1 and i2 will have values determined by the
! previous code (line 178) - this leads to crashes in
! debug mode (out of bounds), for example for regression
! test fv3_stretched_nest_debug_moninq. For the time
! being, this is 'solved' by simply switching off ICCN
! test fv3_stretched_nest_debug. For the time being,
! this is 'solved' by simply switching off ICCN
! if MG2/3 are not used (these are the only microphysics
! schemes that use the ICCN data); however, this doesn't
! mean that the code is correct for MG2/3, it just doesn't
Expand Down