From 8c92b31e33d708791c27f6ebd1d549b67ce1a5cc Mon Sep 17 00:00:00 2001
From: philipwjones <pwjones@lanl.gov>
Date: Tue, 4 Apr 2017 12:34:02 -0600
Subject: [PATCH] changes needed for consistency with new threaded vector
 reconstruction routine

---
 src/core_ocean/mode_forward/mpas_ocn_time_integration_rk4.F | 2 --
 .../mode_forward/mpas_ocn_time_integration_split.F          | 4 ++--
 src/core_ocean/shared/mpas_ocn_diagnostics.F                | 6 ------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/core_ocean/mode_forward/mpas_ocn_time_integration_rk4.F b/src/core_ocean/mode_forward/mpas_ocn_time_integration_rk4.F
index 329ad4d058..0d53fdf01e 100644
--- a/src/core_ocean/mode_forward/mpas_ocn_time_integration_rk4.F
+++ b/src/core_ocean/mode_forward/mpas_ocn_time_integration_rk4.F
@@ -650,7 +650,6 @@ subroutine ocn_time_integrator_rk4(domain, dt)!{{{
          ! End: Accumulating various parameterizations of the transport velocity
          ! ------------------------------------------------------------------
 
-         !$omp master
          call mpas_reconstruct(meshPool,  normalVelocityNew, &
                           velocityX, velocityY, velocityZ,   &
                           velocityZonal, velocityMeridional, &
@@ -660,7 +659,6 @@ subroutine ocn_time_integrator_rk4(domain, dt)!{{{
                           gradSSHX, gradSSHY, gradSSHZ,    &
                           gradSSHZonal, gradSSHMeridional, &
                           includeHalos = .true.)
-         !$omp end master
          call mpas_threading_barrier()
 
          !$omp do schedule(runtime)
diff --git a/src/core_ocean/mode_forward/mpas_ocn_time_integration_split.F b/src/core_ocean/mode_forward/mpas_ocn_time_integration_split.F
index 18188b7eea..debde0a769 100644
--- a/src/core_ocean/mode_forward/mpas_ocn_time_integration_split.F
+++ b/src/core_ocean/mode_forward/mpas_ocn_time_integration_split.F
@@ -1805,7 +1805,7 @@ subroutine ocn_time_integrator_split(domain, dt)!{{{
 
          call mpas_timer_start('se final mpas reconstruct', .false.)
          call mpas_threading_barrier()
-         !$omp master
+
          call mpas_reconstruct(meshPool, normalVelocityNew,  &
                           velocityX, velocityY, velocityZ,   &
                           velocityZonal, velocityMeridional, &
@@ -1815,7 +1815,7 @@ subroutine ocn_time_integrator_split(domain, dt)!{{{
                           gradSSHX, gradSSHY, gradSSHZ,    &
                           gradSSHZonal, gradSSHMeridional, &
                           includeHalos = .true.)
-         !$omp end master
+
          call mpas_threading_barrier()
          call mpas_timer_stop('se final mpas reconstruct')
 
diff --git a/src/core_ocean/shared/mpas_ocn_diagnostics.F b/src/core_ocean/shared/mpas_ocn_diagnostics.F
index 3d0cf54a64..5eb6735ec8 100644
--- a/src/core_ocean/shared/mpas_ocn_diagnostics.F
+++ b/src/core_ocean/shared/mpas_ocn_diagnostics.F
@@ -1888,8 +1888,6 @@ subroutine ocn_reconstruct_gm_vectors(diagnosticsPool, meshPool) !{{{
       call mpas_pool_get_array(diagnosticsPool, 'GMStreamFuncZonal', GMStreamFuncZonal)
       call mpas_pool_get_array(diagnosticsPool, 'GMStreamFuncMeridional', GMStreamFuncMeridional)
 
-      !$omp sections
-      !$omp section
       call mpas_reconstruct(meshPool, normalTransportVelocity,          &
                        transportVelocityX,            &
                        transportVelocityY,            &
@@ -1898,7 +1896,6 @@ subroutine ocn_reconstruct_gm_vectors(diagnosticsPool, meshPool) !{{{
                        transportVelocityMeridional    &
                       )
 
-      !$omp section
       call mpas_reconstruct(meshPool, normalGMBolusVelocity,          &
                        GMBolusVelocityX,            &
                        GMBolusVelocityY,            &
@@ -1907,7 +1904,6 @@ subroutine ocn_reconstruct_gm_vectors(diagnosticsPool, meshPool) !{{{
                        GMBolusVelocityMeridional    &
                       )
 
-      !$omp section
       call mpas_reconstruct(meshPool, relativeSlopeTopOfEdge,          &
                       relativeSlopeTopOfCellX,            &
                       relativeSlopeTopOfCellY,            &
@@ -1916,7 +1912,6 @@ subroutine ocn_reconstruct_gm_vectors(diagnosticsPool, meshPool) !{{{
                       relativeSlopeTopOfCellMeridional    &
                      )
 
-      !$omp section
       call mpas_reconstruct(meshPool, gmStreamFuncTopOfEdge,          &
                       GMStreamFuncX,            &
                       GMStreamFuncY,            &
@@ -1924,7 +1919,6 @@ subroutine ocn_reconstruct_gm_vectors(diagnosticsPool, meshPool) !{{{
                       GMStreamFuncZonal,        &
                       GMStreamFuncMeridional    &
                      )
-      !$omp end sections
 
       call mpas_timer_stop('reconstruct gm vecs')