Merge remote-tracking branch 'gfdl/dev/master' into dev/master

NOAA-GFDL · May 6, 2016 · 18579f8 · 18579f8
2 parents 57e37eb + 8af054b
commit 18579f8
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 277 deletions.
diff --git a/src/core/MOM_continuity_PPM.F90 b/src/core/MOM_continuity_PPM.F90
@@ -245,7 +245,7 @@ subroutine continuity_PPM(u, v, hin, h, uh, vh, dt, G, GV, CS, uhbt, vhbt, OBC,
                               v_cor, vhbt_aux, v_cor_aux, BT_cont)
 
     call cpu_clock_begin(id_clock_update)
-!$OMP parallel do default(none) private(h_min) shared(nz,LB,h,dt,G,vh)
+!$OMP parallel do default(none) shared(h_min,nz,LB,h,dt,G,vh)
     do k=1,nz ; do j=LB%jsh,LB%jeh ; do i=LB%ish,LB%ieh
       h(i,j,k) = h(i,j,k) - dt*G%IareaT(i,j) * (vh(i,J,k) - vh(i,J-1,k))
   !   This line prevents underflow.
@@ -300,7 +300,7 @@ subroutine continuity_PPM(u, v, hin, h, uh, vh, dt, G, GV, CS, uhbt, vhbt, OBC,
                          u_cor, uhbt_aux, u_cor_aux, BT_cont)
 
     call cpu_clock_begin(id_clock_update)
-!$OMP parallel do default(none) private(h_min) shared(nz,LB,h,dt,G,uh)
+!$OMP parallel do default(none) shared(h_min,nz,LB,h,dt,G,uh)
     do k=1,nz ; do j=LB%jsh,LB%jeh ; do i=LB%ish,LB%ieh
       h(i,j,k) = h(i,j,k) - dt* G%IareaT(i,j) * (uh(I,j,k) - uh(I-1,j,k))
   !   This line prevents underflow.

diff --git a/src/diagnostics/MOM_wave_speed.F90 b/src/diagnostics/MOM_wave_speed.F90
@@ -523,7 +523,7 @@ subroutine wave_speeds(h, tv, G, GV, nmodes, cn, CS, full_halos)
 
   min_h_frac = tol1 / real(nz)
 !$OMP parallel do default(none) shared(is,ie,js,je,nz,h,G,GV,min_h_frac,use_EOS,T,S,   &
-!$OMP                                  H_to_pres,H_to_m,tv,cn,g_Rho0)                  &
+!$OMP                                  H_to_pres,H_to_m,tv,cn,g_Rho0,nmodes)           &
 !$OMP                          private(htot,hmin,kf,H_here,HxT_here,HxS_here,HxR_here, &
 !$OMP                                  Hf,Tf,Sf,Rf,pres,T_int,S_int,drho_dT,           &
 !$OMP                                  drho_dS,drxh_sum,kc,Hc,Tc,Sc,I_Hnew,gprime,     &
@@ -533,7 +533,7 @@ subroutine wave_speeds(h, tv, G, GV, nmodes, cn, CS, full_halos)
 !$OMP                                  ddet_l,xr,xl,det_r,xbl,xbr,ddet_r,xl_sub,       &
 !$OMP                                  ig_need_sub,jg_need_sub,sub_rootfound,nsub,     &
 !$OMP                                  det_sub,ddet_sub,lam_n,                         &
-!$OMP                                  a_diag,b_diag,c_diag,nrootsfound,nmodes)
+!$OMP                                  a_diag,b_diag,c_diag,nrootsfound)
   do j=js,je
     !   First merge very thin layers with the one above (or below if they are
     ! at the top).  This also transposes the row order so that columns can