use MTHREADS=1 when OPENACC is activated

ecmwf-ifs · Feb 12, 2024 · c122a58 · c122a58
1 parent 323b97c
commit c122a58
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/ecwam/ctuwdrv.F90 b/src/ecwam/ctuwdrv.F90
@@ -78,9 +78,9 @@ SUBROUTINE CTUWDRV (DELPRO, MSTART, MEND,                  &
 IF (LHOOK) CALL DR_HOOK('CTUWDRV',0,ZHOOK_HANDLE)
 
 !! NPROMA=NPROMA_WAM
-   MTHREADS=1
-#ifdef _OPENACC
    MTHREADS=OMP_GET_MAX_THREADS()
+#ifdef _OPENACC
+   MTHREADS=1
 #endif /*_OPENACC*/
    NPROMA=(IJL-IJS+1)/MTHREADS + 1
 

diff --git a/src/ecwam/ctuwupdt.F90 b/src/ecwam/ctuwupdt.F90
@@ -190,9 +190,9 @@ SUBROUTINE CTUWUPDT (IJS, IJL, NINF, NSUP,                  &
 
 ! SOME INITIALISATION FOR *CTUW*
 !! NPROMA=NPROMA_WAM
-   MTHREADS=1
-#ifdef _OPENACC
    MTHREADS=OMP_GET_MAX_THREADS()
+#ifdef _OPENACC
+   MTHREADS=1
 #endif /*_OPENACC*/
    NPROMA=(IJL-IJS+1)/MTHREADS + 1
 

diff --git a/src/ecwam/propag_wam.F90 b/src/ecwam/propag_wam.F90
@@ -105,9 +105,9 @@ SUBROUTINE PROPAG_WAM (BLK2GLO, WAVNUM, CGROUP, OMOSNH2KD, FL1, &
         IJSG = IJFROMCHNK(1,1)
         IJLG = IJSG + SUM(KIJL4CHNK) - 1
 
-        MTHREADS=1
-#ifdef _OPENACC
         MTHREADS=OMP_GET_MAX_THREADS()
+#ifdef _OPENACC
+        MTHREADS=1
 #endif /*_OPENACC*/
         NPROMA=(IJLG-IJSG+1)/MTHREADS + 1