Skip to content

Commit

Permalink
Merge pull request NCAR#6 from climbfuji/dtc_develop_udpate_from_emc_…
Browse files Browse the repository at this point in the history
…20191127

dtc/develop: update from EMC 2019/11/27
  • Loading branch information
climbfuji committed Dec 17, 2019
2 parents 0c9ab9e + 68576a6 commit 2d15565
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
14 changes: 0 additions & 14 deletions CODEOWNERS

This file was deleted.

10 changes: 4 additions & 6 deletions model/fv_dynamics.F90
Original file line number Diff line number Diff line change
Expand Up @@ -621,9 +621,7 @@ subroutine fv_dynamics(npx, npy, npz, nq_tot, ng, bdt, consv_te, fill,
mdt = bdt / real(k_split)

#ifndef CCPP
! Routine Lagrangian_to_Eulerian expects dtdt_m to be allocated:
! (fv_mapz.F90, 201): line real, intent(inout):: dtdt(is:ie,js:je,km)
!if ( idiag%id_mdt > 0 .and. (.not. do_adiabatic_init) ) then
if ( idiag%id_mdt > 0 .and. (.not. do_adiabatic_init) ) then
allocate ( dtdt_m(is:ie,js:je,npz) )
!$OMP parallel do default(none) shared(is,ie,js,je,npz,dtdt_m)
do k=1,npz
Expand All @@ -633,7 +631,7 @@ subroutine fv_dynamics(npx, npy, npz, nq_tot, ng, bdt, consv_te, fill,
enddo
enddo
enddo
!endif
endif
#endif

call timing_on('FV_DYN_LOOP')
Expand Down Expand Up @@ -836,10 +834,10 @@ subroutine fv_dynamics(npx, npy, npz, nq_tot, ng, bdt, consv_te, fill,
enddo
! call prt_mxm('Fast DTDT (deg/Day)', dtdt_m, is, ie, js, je, 0, npz, 1., gridstruct%area_64, domain)
used = send_data(idiag%id_mdt, dtdt_m, fv_time)
endif
#ifndef CCPP
deallocate ( dtdt_m )
deallocate ( dtdt_m )
#endif
endif

if( nwat == 6 ) then
if (cld_amt > 0) then
Expand Down
6 changes: 6 additions & 0 deletions model/fv_regional_bc.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,12 @@ subroutine start_regional_restart(Atm &
endif
!
!-----------------------------------------------------------------------
!*** Get the source of the input data.
!-----------------------------------------------------------------------
!
call get_data_source(data_source,Atm%flagstruct%regional)
!
!-----------------------------------------------------------------------
!*** Preliminary setup for the forecast.
!-----------------------------------------------------------------------
!
Expand Down

0 comments on commit 2d15565

Please sign in to comment.