fix longstanding bug in OpenMP handling for concurrent ocean

NOAA-GFDL · Mar 31, 2022 · 46b92ae · 46b92ae
1 parent 9ba466d
commit 46b92ae
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/full/coupler_main.F90 b/full/coupler_main.F90
@@ -1368,10 +1368,11 @@ subroutine coupler_init
       !--- setting affinity
       if (do_concurrent_radiation) then
 !$      call fms_affinity_set('ATMOS', use_hyper_thread, atmos_nthreads + radiation_nthreads)
+!$      call omp_set_num_threads(atmos_nthreads+radiation_nthreads)
       else
 !$      call fms_affinity_set('ATMOS', use_hyper_thread, atmos_nthreads)
+!$      call omp_set_num_threads(atmos_nthreads)
       endif
-!$    call omp_set_num_threads(atmos_nthreads)
     endif
 
    !--- initialization clock
@@ -1732,8 +1733,10 @@ subroutine coupler_init
       if (concurrent) then
         call mpp_set_current_pelist( Ocean%pelist )
 !$      call fms_affinity_set('OCEAN', use_hyper_thread, ocean_nthreads)
+!$      call omp_set_num_threads(ocean_nthreads)
       else
         ocean_nthreads = atmos_nthreads
+        !--- omp_num_threads has already been set by the Atmos-pes, but set again to ensure
 !$      call omp_set_num_threads(ocean_nthreads)
       endif