Skip to content
This repository has been archived by the owner on Oct 23, 2020. It is now read-only.

Rename get-tend in mpas_atmphys_todynamics #1188

Closed
wants to merge 1 commit into from
Closed

Rename get-tend in mpas_atmphys_todynamics #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions src/core_atmosphere/dynamics/mpas_atm_time_integration.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ subroutine atm_srk3(domain, dt, itimestep)
call mpas_timer_stop('atm_compute_moist_coefficients')

#ifdef DO_PHYSICS
call mpas_timer_start('physics_addtend')
call mpas_timer_start('physics_gettend')
block => domain % blocklist
do while (associated(block))
call mpas_pool_get_subpool(block % structs, 'mesh', mesh)
Expand All @@ -405,21 +405,21 @@ subroutine atm_srk3(domain, dt, itimestep)
call mpas_pool_get_subpool(block % structs, 'tend_physics', tend_physics)
rk_step = 1
dynamics_substep = 1
call physics_get_tend( block, &
mesh, &
state, &
diag, &
tend, &
tend_physics, &
block % configs, &
rk_step, &
dynamics_substep, &
tend_ru_physics, &
tend_rtheta_physics, &
tend_rho_physics )
call physics_gettend( block, &
mesh, &
state, &
diag, &
tend, &
tend_physics, &
block % configs, &
rk_step, &
dynamics_substep, &
tend_ru_physics, &
tend_rtheta_physics, &
tend_rho_physics )
block => block % next
end do
call mpas_timer_stop('physics_addtend')
call mpas_timer_stop('physics_gettend')
#endif

!
Expand Down
16 changes: 8 additions & 8 deletions src/core_atmosphere/physics/mpas_atmphys_todynamics.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module mpas_atmphys_todynamics
! Laura D. Fowler (laura@ucar.edu) / 2016-03-30.
! * added the option bl_mynn for the calculation of the tendency for the cloud ice number concentration.
! Laura D. Fowler (laura@ucar.edu) / 2016-04-11.
! * in subroutine physics_get_tend_work, added the option cu_ntiedtke in the calculation of rucuten_Edge.
! * in subroutine physics_gettend_work, added the option cu_ntiedtke in the calculation of rucuten_Edge.
! Laura D. Fowler (laura@ucar.edu) / 2016-10-28.


Expand Down Expand Up @@ -215,7 +215,7 @@ end subroutine physics_addtend


!=================================================================================================================
subroutine physics_get_tend( block, mesh, state, diag, tend, tend_physics, configs, rk_step, dynamics_substep, &
subroutine physics_gettend( block, mesh, state, diag, tend, tend_physics, configs, rk_step, dynamics_substep, &
tend_ru_physics, tend_rtheta_physics, tend_rho_physics )
!=================================================================================================================

Expand Down Expand Up @@ -344,7 +344,7 @@ subroutine physics_get_tend( block, mesh, state, diag, tend, tend_physics, confi
!
! In case some variables are not allocated due to their associated packages,
! we need to make their pointers associated here to avoid triggering run-time
! checks when calling physics_get_tend_work
! checks when calling physics_gettend_work
!
if (.not. associated(rucuten)) allocate(rucuten(0,0))
if (.not. associated(rvcuten)) allocate(rvcuten(0,0))
Expand All @@ -363,7 +363,7 @@ subroutine physics_get_tend( block, mesh, state, diag, tend, tend_physics, confi
if (.not. associated(rqccuten)) allocate(rqccuten(0,0))
if (.not. associated(rqicuten)) allocate(rqicuten(0,0))

call physics_get_tend_work(block, mesh, nCells, nEdges, nCellsSolve, nEdgesSolve, &
call physics_gettend_work(block, mesh, nCells, nEdges, nCellsSolve, nEdgesSolve, &
rk_step, dynamics_substep, &
config_pbl_scheme, config_convection_scheme, config_radt_lw_scheme, config_radt_sw_scheme, &
index_qv, index_qc, index_qr, index_qi, index_qs, index_ni, &
Expand All @@ -381,7 +381,7 @@ subroutine physics_get_tend( block, mesh, state, diag, tend, tend_physics, confi

!
! Clean up any pointers that were allocated with zero size before the call to
! physics_get_tend_work
! physics_gettend_work
!
if (size(rucuten) == 0) deallocate(rucuten)
if (size(rvcuten) == 0) deallocate(rvcuten)
Expand Down Expand Up @@ -422,7 +422,7 @@ subroutine physics_get_tend( block, mesh, state, diag, tend, tend_physics, confi
201 format(2i6,10(1x,e15.8))
202 format(3i6,10(1x,e15.8))

end subroutine physics_get_tend
end subroutine physics_gettend

!==================================================================================================
subroutine physics_addtend_work(block, mesh, nCells, nEdges, nCellsSolve, nEdgesSolve, &
Expand Down Expand Up @@ -627,7 +627,7 @@ subroutine physics_addtend_work(block, mesh, nCells, nEdges, nCellsSolve, nEdges
end subroutine physics_addtend_work

!==================================================================================================
subroutine physics_get_tend_work(block, mesh, nCells, nEdges, nCellsSolve, nEdgesSolve, &
subroutine physics_gettend_work(block, mesh, nCells, nEdges, nCellsSolve, nEdgesSolve, &
rk_step, dynamics_substep, &
config_pbl_scheme, config_convection_scheme, config_radt_lw_scheme, config_radt_sw_scheme, &
index_qv, index_qc, index_qr, index_qi, index_qs, index_ni, &
Expand Down Expand Up @@ -796,7 +796,7 @@ subroutine physics_get_tend_work(block, mesh, nCells, nEdges, nCellsSolve, nEdge
enddo
enddo

end subroutine physics_get_tend_work
end subroutine physics_gettend_work

!=================================================================================================================
subroutine tend_toEdges(block,mesh,Ux_tend,Uy_tend,U_tend)
Expand Down