Merge branch 'dev/master' of https://github.com/NOAA-GFDL/MOM6 into d…

…ev/master
NOAA-GFDL · Jun 16, 2016 · be8e34d · be8e34d
2 parents ae0a293 + e254d9b
commit be8e34d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/ALE/MOM_ALE.F90 b/src/ALE/MOM_ALE.F90
@@ -705,7 +705,7 @@ subroutine ALE_remap_scalar(CS, G, GV, nk_src, h_src, s_src, h_dst, s_dst, all_c
   if (present(old_remap)) use_remapping_core_w = old_remap
   n_points = nk_src
 
-!$OMP parallel default(none) shared(CS,G,h_src,s_src,h_dst,s_dst &
+!$OMP parallel default(none) shared(CS,G,GV,h_src,s_src,h_dst,s_dst &
 !$OMP                               ,ignore_vanished_layers, use_remapping_core_w, nk_src,dx ) &
 !$OMP                        firstprivate(n_points)
 !$OMP do

diff --git a/src/ALE/MOM_regridding.F90 b/src/ALE/MOM_regridding.F90
@@ -337,7 +337,7 @@ subroutine calc_h_new_by_dz(G, GV, h, dzInterface, h_new)
   ! Local variables
   integer :: i, j, k
 
-!$OMP parallel do default(none) shared(G,h,dzInterface,h_new)
+!$OMP parallel do default(none) shared(G,GV,h,dzInterface,h_new)
   do j = G%jsc-1,G%jec+1
     do i = G%isc-1,G%iec+1
       if (G%mask2dT(i,j)>0.) then
@@ -362,7 +362,7 @@ subroutine check_remapping_grid( G, GV, h, dzInterface, msg )
   ! Local variables
   integer :: i, j
 
-!$OMP parallel do default(none) shared(G,h,dzInterface,msg)
+!$OMP parallel do default(none) shared(G,GV,h,dzInterface,msg)
   do j = G%jsc-1,G%jec+1
     do i = G%isc-1,G%iec+1
       if (G%mask2dT(i,j)>0.) call check_grid_column( GV%ke, G%bathyT(i,j), h(i,j,:), dzInterface(i,j,:), msg )

diff --git a/src/core/MOM_barotropic.F90 b/src/core/MOM_barotropic.F90
@@ -3541,6 +3541,7 @@ subroutine find_face_areas(Datu, Datv, G, GV, CS, MS, eta, halo, add_max)
   else
 !$OMP do
     do j=js-hs,je+hs ; do I=is-1-hs,ie+hs
+      Datu(I, j) = 0.0
       !Would be "if (G%mask2dCu(I,j)>0.) &" is G was valid on BT domain
       if (CS%bathyT(i+1,j)+CS%bathyT(i,j)>0.) &
         Datu(I,j) = 2.0*CS%dy_Cu(I,j) * GV%m_to_H * &
@@ -3549,6 +3550,7 @@ subroutine find_face_areas(Datu, Datv, G, GV, CS, MS, eta, halo, add_max)
     enddo ; enddo
 !$OMP do
     do J=js-1-hs,je+hs ; do i=is-hs,ie+hs
+      Datv(i, J) = 0.0
       !Would be "if (G%mask2dCv(i,J)>0.) &" is G was valid on BT domain
       if (CS%bathyT(i,j+1)+CS%bathyT(i,j)>0.) &
         Datv(i,J) = 2.0*CS%dx_Cv(i,J) * GV%m_to_H * &