diff --git a/src/parameterizations/lateral/MOM_MEKE.F90 b/src/parameterizations/lateral/MOM_MEKE.F90 index 184b38bcb3..68c7d5b0c8 100644 --- a/src/parameterizations/lateral/MOM_MEKE.F90 +++ b/src/parameterizations/lateral/MOM_MEKE.F90 @@ -129,7 +129,7 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS) !$OMP parallel default(none) shared(MEKE,CS,is,ie,js,je,nz,src,mass,G,h,I_mass, & !$OMP sdt,drag_vel_u,visc,drag_vel_v,drag_rate_visc, & -!$OMP drag_rate,Rho0,MEKE_decay,sdt_damp,cdrag2, * +!$OMP drag_rate,Rho0,MEKE_decay,sdt_damp,cdrag2, & !$OMP bottomFac2) & !$OMP private(ldamping) @@ -152,7 +152,7 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS) enddo if (associated(MEKE%mom_src)) then -!$OMP do + !!$OMP do ! do j=js,je ; do i=is,ie ! MEKE%MEKE(i,j) = MEKE%MEKE(i,j) - I_mass(i,j) * & ! (sdt*CS%MEKE_FrCoeff)*MEKE%mom_src(i,j) @@ -164,7 +164,7 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS) endif if (associated(MEKE%GM_src)) then -!$OMP do + !!$OMP do ! do j=js,je ; do i=is,ie ! MEKE%MEKE(i,j) = MEKE%MEKE(i,j) - I_mass(i,j) * & ! (sdt*CS%MEKE_GMcoeff)*MEKE%GM_src(i,j) @@ -175,10 +175,11 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS) enddo ; enddo endif -!$OMP do + !!$OMP do !do j=js,je ; do i=is,ie ! MEKE%MEKE(i,j) = max(0.0,MEKE%MEKE(i,j) + (sdt*CS%MEKE_BGsrc)*G%mask2dT(i,j)) !enddo ; enddo +!$OMP do do j=js,je ; do i=is,ie MEKE%MEKE(i,j) = max(0.0, MEKE%MEKE(i,j) + sdt*src(i,j) )*G%mask2dT(i,j) enddo ; enddo diff --git a/src/parameterizations/vertical/MOM_diabatic_driver.F90 b/src/parameterizations/vertical/MOM_diabatic_driver.F90 index 43cee2a162..3f42518881 100644 --- a/src/parameterizations/vertical/MOM_diabatic_driver.F90 +++ b/src/parameterizations/vertical/MOM_diabatic_driver.F90 @@ -1231,8 +1231,8 @@ subroutine make_frazil(h, tv, G, CS, p_surf) if (.not.CS%pressure_dependent_frazil) then do k=1,nz ; do i=is,ie ; pressure(i,k) = 0.0 ; enddo ; enddo endif -!$OMP parallel do default(none) shared(is,ie,js,je,CS,G,h,nz,tv) & -!$OMP private(fraz_col,T_fr_set,T_freeze,hc) & +!$OMP parallel do default(none) shared(is,ie,js,je,CS,G,h,nz,tv,p_surf) & +!$OMP private(fraz_col,T_fr_set,T_freeze,hc,ps) & !$OMP firstprivate(pressure) do j=js,je ps(:) = 0.0