Merge branch 'philipwjones/ocean/thread_consistency_reconstruct' into…

… ocean/develop With the addition of a new threaded reconstruction routine in #1237, openMP directives surrounding calls to this routine in the ocean core needed to be removed for consistency.
MPAS-Dev · Apr 6, 2017 · ae0024d · ae0024d
2 parents 0be0b5b + 8c92b31
commit ae0024d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 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
@@ -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
@@ -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
@@ -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,15 +1912,13 @@ subroutine ocn_reconstruct_gm_vectors(diagnosticsPool, meshPool) !{{{
                       relativeSlopeTopOfCellMeridional    &
                      )
 
-      !$omp section
       call mpas_reconstruct(meshPool, gmStreamFuncTopOfEdge,          &
                       GMStreamFuncX,            &
                       GMStreamFuncY,            &
                       GMStreamFuncZ,            &
                       GMStreamFuncZonal,        &
                       GMStreamFuncMeridional    &
                      )
-      !$omp end sections
 
       call mpas_timer_stop('reconstruct gm vecs')