Skip to content

Conditionally allocate Morrison-Gettelman arrays #291

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 2 commits into from
Aug 17, 2019
Merged

Conditionally allocate Morrison-Gettelman arrays #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b60ec
use assumed-shape arrays for MG-specific arrays in convection schemes…
grantfirl Jul 31, 2019
0256ad4
Merge branch 'gmtb/develop' into MG_array_allocation
grantfirl Jul 31, 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
6 changes: 5 additions & 1 deletion physics/cs_conv.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,13 @@ subroutine cs_conv_run(IM , IJSDIM , KMAX , ntracp1 , NN, &
real(r8), intent(inout), dimension(IJSDIM,KMAX) :: ud_mf, dd_mf, dt_mf

real(r8), intent(out) :: rain1(IJSDIM) ! lwe thickness of deep convective precipitation amount (m)
real(r8), intent(out), dimension(ijsdim,kmax) :: qlcn, qicn, w_upi,cnv_mfd, &
! GJF* These variables are conditionally allocated depending on whether the
! Morrison-Gettelman microphysics is used, so they must be declared
! using assumed shape.
real(r8), intent(out), dimension(:,:) :: qlcn, qicn, w_upi,cnv_mfd, &
cnv_dqldt, clcn, cnv_fice, &
cnv_ndrop, cnv_nice, cf_upi
! *GJF
integer, intent(inout) :: kcnv(im) ! zero if no deep convection and 1 otherwise
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg
Expand Down
16 changes: 13 additions & 3 deletions physics/m_micro.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,16 @@ subroutine m_micro_run( im, ix, lm, flipv, dt_i &
& lwheat_i,swheat_i
Copy link
Copy Markdown
Collaborator Author

@grantfirl grantfirl Jul 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may not be necessary to use assumed-shape arrays in the MG scheme itself since it presumably won't be called unless imp_physics == imp_physics_mg, but I did this to be consistent across all schemes.

real (kind=kind_phys), dimension(ix,0:lm),intent(in):: prsi_i, &
& phii
real (kind=kind_phys), dimension(im,lm),intent(in) :: &
! GJF* These variables are conditionally allocated depending on whether the
! Morrison-Gettelman microphysics is used, so they must be declared
! using assumed shape.
real (kind=kind_phys), dimension(:,:), intent(in) :: &
& CNV_DQLDT_i, CLCN_i, QLCN_i, QICN_i, &
& CNV_MFD_i, cf_upi, CNV_FICE_i, CNV_NDROP_i, &
& CNV_NICE_i, w_upi, rhc_i, naai_i, npccn_i
& CNV_NICE_i, w_upi
! *GJF
real (kind=kind_phys), dimension(im,lm),intent(in) :: &
& rhc_i, naai_i, npccn_i
real (kind=kind_phys), dimension(im,lm,ntrcaer),intent(in) :: &
& aerfld_i
real (kind=kind_phys),dimension(im),intent(in):: TAUGWX, &
Expand All @@ -320,9 +326,13 @@ subroutine m_micro_run( im, ix, lm, flipv, dt_i &
integer, dimension(IM), intent(inout):: KCBL
real (kind=kind_phys),dimension(ix,lm),intent(inout):: q_io, t_io, &
& ncpl_io,ncpi_io,CLLS_io
real (kind=kind_phys),dimension(im,lm),intent(inout):: rnw_io,snw_io,&
! GJF* These variables are conditionally allocated depending on whether the
! Morrison-Gettelman microphysics is used, so they must be declared
! using assumed shape.
real (kind=kind_phys),dimension(:,:),intent(inout):: rnw_io,snw_io,&
& ncpr_io, ncps_io, &
& qgl_io, ncgl_io
! *GJF
!Moo real (kind=kind_phys),dimension(im,lm),intent(inout):: CLLS_io


Expand Down
8 changes: 6 additions & 2 deletions physics/samfdeepcnv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,14 @@ subroutine samfdeepcnv_run (im,ix,km,cliq,cp,cvap, &
real(kind=kind_phys), intent(out) :: cldwrk(im), &
& rn(im), &
& ud_mf(im,km),dd_mf(im,km), dt_mf(im,km)

real(kind=kind_phys), dimension(im,km), intent(inout) :: &

! GJF* These variables are conditionally allocated depending on whether the
! Morrison-Gettelman microphysics is used, so they must be declared
! using assumed shape.
real(kind=kind_phys), dimension(:,:), intent(inout) :: &
& qlcn, qicn, w_upi, cnv_mfd, cnv_dqldt, clcn &
&, cnv_fice, cnv_ndrop, cnv_nice, cf_upi
! *GJF
integer :: mp_phys, mp_phys_mg

real(kind=kind_phys), intent(in) :: clam, c0s, c1, &
Expand Down