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

Fix uninitialized min_rand variable in Thompson MP when using SPP #892

Merged
merged 11 commits into from
Apr 20, 2022
Merged

Fix uninitialized min_rand variable in Thompson MP when using SPP #892

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
313d78f
Fix to original min_rand variable.
JeffBeck-NOAA Apr 2, 2022
6342e52
Pass SPP namelist entries into Thompson MP
JeffBeck-NOAA Apr 5, 2022
16993b9
Add intent to SPP variables in meta file.
JeffBeck-NOAA Apr 6, 2022
084551f
Fix dimensions in the Thompson meta file
JeffBeck-NOAA Apr 6, 2022
a2fefa7
Fixes to application of rand_pert_max in Thompson MP.
JeffBeck-NOAA Apr 6, 2022
044c900
Fix metadata descriptions.
JeffBeck-NOAA Apr 7, 2022
fdc9b2e
Fix last metadata entry.
JeffBeck-NOAA Apr 7, 2022
2e8f340
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into bugf…
JeffBeck-NOAA Apr 7, 2022
0aab555
Reorder declarations.
JeffBeck-NOAA Apr 8, 2022
dc48d39
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into bugf…
JeffBeck-NOAA Apr 8, 2022
32b78e4
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into bugf…
JeffBeck-NOAA Apr 12, 2022
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
6 changes: 4 additions & 2 deletions physics/module_mp_thompson.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ SUBROUTINE mp_gt_driver(qv, qc, qr, qi, qs, qg, ni, nr, nc, &
REAL, DIMENSION(its:ite, jts:jte):: pcp_ra, pcp_sn, pcp_gr, pcp_ic
REAL:: dt, pptrain, pptsnow, pptgraul, pptice
REAL:: qc_max, qr_max, qs_max, qi_max, qg_max, ni_max, nr_max
REAL:: rand1, rand2, rand3, min_rand
REAL:: rand1, rand2, rand3, abs_min_rand
INTEGER:: i, j, k, m
INTEGER:: imax_qc,imax_qr,imax_qi,imax_qs,imax_qg,imax_ni,imax_nr
INTEGER:: jmax_qc,jmax_qr,jmax_qi,jmax_qs,jmax_qg,jmax_ni,jmax_nr
Expand Down Expand Up @@ -1268,6 +1268,8 @@ SUBROUTINE mp_gt_driver(qv, qc, qr, qi, qs, qg, ni, nr, nc, &
kmax_ni = 0
kmax_nr = 0

abs_min_rand = ABS(MINVAL(rand_pert(:,1)))
SamuelTrahanNOAA marked this conversation as resolved.
Show resolved Hide resolved

j_loop: do j = j_start, j_end
i_loop: do i = i_start, i_end

Expand All @@ -1292,7 +1294,7 @@ SUBROUTINE mp_gt_driver(qv, qc, qr, qi, qs, qg, ni, nr, nc, &
m = RSHIFT(ABS(rand_perturb_on),1)
if (MOD(m,2) .ne. 0) rand2 = rand_pert(i,1)*2.
m = RSHIFT(ABS(rand_perturb_on),2)
if (MOD(m,2) .ne. 0) rand3 = 0.25*(rand_pert(i,1)+ABS(min_rand))
if (MOD(m,2) .ne. 0) rand3 = 0.25*(rand_pert(i,1)+abs_min_rand)
m = RSHIFT(ABS(rand_perturb_on),3)
endif
!+---+-----------------------------------------------------------------+
Expand Down