Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions dyn_em/start_em.F
Original file line number Diff line number Diff line change
Expand Up @@ -2001,6 +2001,7 @@ SUBROUTINE start_domain_em ( grid, allowed_to_read &
#endif

DEALLOCATE(z_at_q)
DEALLOCATE(dz8w)

IF (config_flags%p_lev_diags == PRESS_DIAGS ) THEN
CALL wrf_debug ( 200 , ' PLD: pressure level diags' )
Expand Down
47 changes: 27 additions & 20 deletions phys/module_bl_ysu.F
Original file line number Diff line number Diff line change
Expand Up @@ -353,27 +353,34 @@ subroutine ysu(u3d,v3d,t3d,qv3d,qc3d,qi3d,p3d,p3di,pi3d, &
present(b_v_bep) .and. present(b_t_bep) .and. present(b_q_bep) .and. &
present(b_e_bep) .and. present(dlg_bep) .and. present(dl_u_bep) .and. &
present(sf_bep) .and. present(vl_bep) .and. present(frc_urb2d)) then
do k = kts, kte
do i = its,ite
a_u_hv(i,k) = a_u_bep(i,k,j)
a_v_hv(i,k) = a_v_bep(i,k,j)
a_t_hv(i,k) = a_t_bep(i,k,j)
a_q_hv(i,k) = a_q_bep(i,k,j)
a_e_hv(i,k) = a_e_bep(i,k,j)
b_u_hv(i,k) = b_u_bep(i,k,j)
b_v_hv(i,k) = b_v_bep(i,k,j)
b_t_hv(i,k) = b_t_bep(i,k,j)
b_q_hv(i,k) = b_q_bep(i,k,j)
b_e_hv(i,k) = b_e_bep(i,k,j)
dlg_hv(i,k) = dlg_bep(i,k,j)
dl_u_hv(i,k) = dl_u_bep(i,k,j)
vlk_hv(i,k) = vl_bep(i,k,j)
sfk_hv(i,k) = sf_bep(i,k,j)

! following v4.5 logic to fix access violation
if(flag_bep) then

do k = kts, kte
do i = its,ite
a_u_hv(i,k) = a_u_bep(i,k,j)
a_v_hv(i,k) = a_v_bep(i,k,j)
a_t_hv(i,k) = a_t_bep(i,k,j)
a_q_hv(i,k) = a_q_bep(i,k,j)
a_e_hv(i,k) = a_e_bep(i,k,j)
b_u_hv(i,k) = b_u_bep(i,k,j)
b_v_hv(i,k) = b_v_bep(i,k,j)
b_t_hv(i,k) = b_t_bep(i,k,j)
b_q_hv(i,k) = b_q_bep(i,k,j)
b_e_hv(i,k) = b_e_bep(i,k,j)
dlg_hv(i,k) = dlg_bep(i,k,j)
dl_u_hv(i,k) = dl_u_bep(i,k,j)
vlk_hv(i,k) = vl_bep(i,k,j)
sfk_hv(i,k) = sf_bep(i,k,j)
enddo
enddo
enddo
do i = its, ite
frcurb_hv(i) = frc_urb2d(i,j)
enddo
do i = its, ite
frcurb_hv(i) = frc_urb2d(i,j)
enddo

endif

endif

do i = its, ite
Expand Down
17 changes: 11 additions & 6 deletions share/wrf_timeseries.F
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,20 @@ SUBROUTINE calc_ts( grid )
! FALSE to output T and Q at 2-m and wind at 10-m diagnostic levels:
LOGICAL, PARAMETER :: ts_model_level = .FALSE.

!Allocate the arrays for wind components
#if ( EM_CORE == 1 )
ALLOCATE ( earth_u_profile(grid%max_ts_level), earth_v_profile(grid%max_ts_level) )
#endif

IF ( grid%ntsloc_domain .LE. 0 ) RETURN
IF ( grid%ntsloc_domain .LE. 0 ) THEN
RETURN
END IF

#if ((EM_CORE == 1) && (DA_CORE != 1))
IF ( grid%dfi_opt /= DFI_NODFI .AND. grid%dfi_stage /= DFI_FST ) RETURN
IF ( grid%dfi_opt /= DFI_NODFI .AND. grid%dfi_stage /= DFI_FST ) THEN
RETURN
END IF
#endif

!Allocate the arrays for wind components
#if ( EM_CORE == 1 )
ALLOCATE ( earth_u_profile(grid%max_ts_level), earth_v_profile(grid%max_ts_level) )
Copy link
Collaborator

Choose a reason for hiding this comment

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

@likeuclinux Are the changes made in the PR for wrf_timeseries.F completely the same as in PR-2139?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@likeuclinux It looks like there is an extra empty line in the version of wrf_timeseries.F in this PR.

#endif

n = grid%next_ts_time
Expand Down