Skip to content

Commit e5ceda5

Browse files
issue "nucleate_ice_cam sets ice cloud frac to combined ice+liquid cloud frac ESCOMP#1212"
1 parent b0e64f1 commit e5ceda5

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

src/physics/cam/nucleate_ice_cam.F90

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ module nucleate_ice_cam
6969
naai_hom_idx = -1
7070

7171
integer :: &
72-
ast_idx = -1
72+
!+++arh
73+
!ast_idx = -1
74+
aist_idx = -1
7375

7476
integer :: &
7577
qsatfac_idx = -1
@@ -360,7 +362,9 @@ subroutine nucleate_ice_cam_init(mincld_in, bulk_scale_in, pbuf2d, aero_props)
360362
mincld)
361363

362364
! get indices for fields in the physics buffer
363-
ast_idx = pbuf_get_index('AST')
365+
!+++arh
366+
!ast_idx = pbuf_get_index('AST')
367+
aist_idx = pbuf_get_index('AIST')
364368

365369
end subroutine nucleate_ice_cam_init
366370

@@ -400,8 +404,9 @@ subroutine nucleate_ice_cam_calc( &
400404
real(r8), pointer :: pmid(:,:) ! pressure at layer midpoints (pa)
401405

402406
real(r8), pointer :: aer_mmr(:,:) ! aerosol mass mixing ratio
403-
404-
real(r8), pointer :: ast(:,:)
407+
!+++arh
408+
!real(r8), pointer :: ast(:,:)
409+
real(r8), pointer :: aist(:,:)
405410
real(r8) :: icecldf(pcols,pver) ! ice cloud fraction
406411
real(r8), pointer :: qsatfac(:,:) ! Subgrid cloud water saturation scaling factor.
407412

@@ -509,9 +514,13 @@ subroutine nucleate_ice_cam_calc( &
509514
end if
510515

511516
itim_old = pbuf_old_tim_idx()
512-
call pbuf_get_field(pbuf, ast_idx, ast, start=(/1,1,itim_old/), kount=(/pcols,pver,1/))
517+
!+++arh
518+
!call pbuf_get_field(pbuf, ast_idx, ast, start=(/1,1,itim_old/), kount=(/pcols,pver,1/))
519+
call pbuf_get_field(pbuf, aist_idx, aist, start=(/1,1,itim_old/), kount=(/pcols,pver,1/))
513520

514-
icecldf(:ncol,:pver) = ast(:ncol,:pver)
521+
!+++arh
522+
!icecldf(:ncol,:pver) = ast(:ncol,:pver)
523+
icecldf(:ncol,:pver) = aist(:ncol,:pver)
515524

516525
! naai and naai_hom are the outputs from this parameterization
517526
call pbuf_get_field(pbuf, naai_idx, naai)

0 commit comments

Comments
 (0)