Skip to content

Commit

Permalink
Merge branch 'restructure_diabatic_driver' of https://github.com/gust…
Browse files Browse the repository at this point in the history
…avo-marques/MOM6 into restructure_diabatic_driver
  • Loading branch information
gustavo-marques committed Jun 1, 2018
2 parents 1c15d0f + 139f6af commit c9c4545
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/parameterizations/vertical/MOM_diabatic_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -560,14 +560,15 @@ subroutine diabatic(u, v, h, tv, Hml, fluxes, visc, ADp, CDp, dt, Time_end, &
call cpu_clock_end(id_clock_set_diffusivity)
if (showCallTree) call callTree_waypoint("done with set_diffusivity (diabatic)")

! Set diffusivities for heat and salt
! Set diffusivities for heat and salt separately

!$OMP parallel default(none) shared(is,ie,js,je,nz,Kd_salt,Kd_int,visc,CS,Kd_heat)
!$OMP do
do k=1,nz+1 ; do j=js,je ; do i=is,ie
Kd_salt(i,j,k) = Kd_int(i,j,k)
Kd_heat(i,j,k) = Kd_int(i,j,k)
enddo ; enddo ; enddo
! Add contribution from double diffusion
if (associated(visc%Kd_extra_S)) then
!$OMP do
do k=1,nz+1 ; do j=js,je ; do i=is,ie
Expand Down

0 comments on commit c9c4545

Please sign in to comment.