diff --git a/src/core_atmosphere/dynamics/mpas_atm_time_integration.F b/src/core_atmosphere/dynamics/mpas_atm_time_integration.F
index 227fbde862..ef66faf3c5 100644
--- a/src/core_atmosphere/dynamics/mpas_atm_time_integration.F
+++ b/src/core_atmosphere/dynamics/mpas_atm_time_integration.F
@@ -7399,7 +7399,7 @@ subroutine atm_compute_solve_diagnostics_work(nCells, nEdges, nVertices, &
 
 
 !$OMP BARRIER
-
+         call mpas_timer_start('atm_compute_solve_diag_7418')
          !
          ! Modify PV edge with upstream bias. 
          !
@@ -7416,20 +7416,19 @@ subroutine atm_compute_solve_diagnostics_work(nCells, nEdges, nVertices, &
          !
          r = config_apvm_upwinding * dt
          !$acc parallel default(present)
-         !$acc loop gang
+         !$acc loop gang worker vector collapse(2)
          do iEdge = edgeStart,edgeEnd
-            r1 = 1.0_RKIND * invDvEdge(iEdge)
-            r2 = 1.0_RKIND * invDcEdge(iEdge)
 !DIR$ IVDEP
-            !$acc loop vector
             do k = 1,nVertLevels
+               r1 = 1.0_RKIND * invDvEdge(iEdge)
+               r2 = 1.0_RKIND * invDcEdge(iEdge)
                gradPVt(k,iEdge) = (pv_vertex(k,verticesOnEdge(2,iEdge)) - pv_vertex(k,verticesOnEdge(1,iEdge))) * r1
                gradPVn(k,iEdge) = (pv_cell(k,cellsOnEdge(2,iEdge)) - pv_cell(k,cellsOnEdge(1,iEdge))) * r2
                pv_edge(k,iEdge) = pv_edge(k,iEdge) - r * (v(k,iEdge) * gradPVt(k,iEdge) + u(k,iEdge) * gradPVn(k,iEdge))
             end do
          end do
          !$acc end parallel
-
+         call mpas_timer_stop('atm_compute_solve_diag_7418')
 
       end if  ! apvm upwinding