More cleaning and minor fixing. OMP_GET_MAX_THREADS

ecmwf-ifs · Feb 1, 2024 · bc479f7 · bc479f7
1 parent 092c739
commit bc479f7
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/src/ecwam/ctuw.F90 b/src/ecwam/ctuw.F90
@@ -316,7 +316,7 @@ SUBROUTINE CTUW (DELPRO, MSTART, MEND,                    &
                     WRITE (IU06,*) '********************************'
                     LCFLFAIL(IJ)=.TRUE.
                   ENDIF
-#ENDIF
+#endif
 
 
 !                 BASIC CFL CHECKS (IN EACH DIRECTION)
@@ -354,7 +354,7 @@ SUBROUTINE CTUW (DELPRO, MSTART, MEND,                    &
                     WRITE (IU06,*) '********************************'
                     LCFLFAIL(IJ)=.TRUE.
                   ENDIF
-#ENDIF
+#endif
 
 
               ENDDO  ! END LOOP OVER GRID POINTS

diff --git a/src/ecwam/ctuwdrv.F90 b/src/ecwam/ctuwdrv.F90
@@ -61,11 +61,12 @@ SUBROUTINE CTUWDRV (DELPRO, MSTART, MEND,                  &
 REAL(KIND=JWRB), DIMENSION(NINF:NSUP+1), INTENT(IN) :: DEPTH_EXT ! WATER DEPTH
 REAL(KIND=JWRB), DIMENSION(NINF:NSUP+1), INTENT(IN) :: U_EXT ! U-COMPONENT OF SURFACE CURRENT
 REAL(KIND=JWRB), DIMENSION(NINF:NSUP+1), INTENT(IN) :: V_EXT ! V-COMPONENT OF SURFACE CURRENT
+INTEGER,EXTERNAL :: OMP_GET_MAX_THREADS
 
 
 INTEGER(KIND=JWIM) :: IJ, ICALL
 INTEGER(KIND=JWIM) :: JKGLO, KIJS, KIJL, NPROMA, MTHREADS
-!$    INTEGER,EXTERNAL :: OMP_GET_MAX_THREADS
+INTEGER,EXTERNAL :: OMP_GET_MAX_THREAD
 
 REAL(KIND=JPHOOK) :: ZHOOK_HANDLE
 

diff --git a/src/ecwam/ctuwupdt.F90 b/src/ecwam/ctuwupdt.F90
@@ -45,7 +45,9 @@ SUBROUTINE CTUWUPDT (IJS, IJL, NINF, NSUP,                  &
 
 
 USE YOMHOOK  , ONLY : LHOOK,   DR_HOOK, JPHOOK
+#ifdef _OPENACC
 USE OPENACC
+#endif /*_OPENACC*/
 
 ! ----------------------------------------------------------------------
       IMPLICIT NONE
@@ -70,7 +72,7 @@ SUBROUTINE CTUWUPDT (IJS, IJL, NINF, NSUP,                  &
 INTEGER(KIND=JWIM) :: IC, ICL, ICR
 INTEGER(KIND=JWIM) :: MSTART, MEND
 INTEGER(KIND=JWIM) :: JKGLO, KIJS, KIJL, NPROMA, MTHREADS
-!$    INTEGER,EXTERNAL :: OMP_GET_MAX_THREADS
+INTEGER,EXTERNAL :: OMP_GET_MAX_THREADS
 
 REAL(KIND=JPHOOK) :: ZHOOK_HANDLE
 REAL(KIND=JWRB) :: DELPRO
@@ -166,6 +168,7 @@ SUBROUTINE CTUWUPDT (IJS, IJL, NINF, NSUP,                  &
 
 ENDIF
 
+
 ! THE CTU IS USED, COMPUTE THE WEIGHTS
 
 IF (.NOT. ALLOCATED(SUMWN)) ALLOCATE(SUMWN(IJS:IJL,NANG,NFRE_RED))
@@ -186,6 +189,8 @@ SUBROUTINE CTUWUPDT (IJS, IJL, NINF, NSUP,                  &
   IF (.NOT. ALLOCATED(LLWMPMN)) ALLOCATE(LLWMPMN(NANG,NFRE_RED,-1:1))
 ENDIF
 
+
+
 ! SOME INITIALISATION FOR *CTUW*
 !! NPROMA=NPROMA_WAM
    MTHREADS=1

diff --git a/src/ecwam/mpexchng.F90 b/src/ecwam/mpexchng.F90
@@ -155,6 +155,7 @@ SUBROUTINE MPEXCHNG(FLD, NDIM2, ND3S, ND3E)
 
       IR=0
       CALL GSTATS(676,0)
+
       DO INGB=1,NGBFROMPE
         IR=IR+1
         IPROC=NFROMPELST(INGB)
@@ -192,6 +193,7 @@ SUBROUTINE MPEXCHNG(FLD, NDIM2, ND3S, ND3E)
 !     NOW WAIT FOR ALL TO COMPLETE
 
       CALL MPL_WAIT(KREQUEST=IREQ(1:IR),CDSTRING='MPEXCHNG:')
+
       CALL GSTATS(676,1)
 
 !     DECODE THE RECEIVED BUFFERS
@@ -230,7 +232,6 @@ SUBROUTINE MPEXCHNG(FLD, NDIM2, ND3S, ND3E)
       ENDDO
 !$OMP END PARALLEL DO
       #endif /*_OPENACC*/
-
       CALL GSTATS(1893,1)
 
       KTAG=KTAG+1
@@ -241,7 +242,6 @@ SUBROUTINE MPEXCHNG(FLD, NDIM2, ND3S, ND3E)
       DEALLOCATE(ZCOMBUFS)
       DEALLOCATE(ZCOMBUFR)
 
-
       IF (LHOOK) CALL DR_HOOK('MPEXCHNG',1,ZHOOK_HANDLE)
 
       END SUBROUTINE MPEXCHNG
diff --git a/src/ecwam/propag_wam.F90 b/src/ecwam/propag_wam.F90
@@ -78,7 +78,7 @@ SUBROUTINE PROPAG_WAM (BLK2GLO, WVENVI, WVPRPT, FL1)
       INTEGER(KIND=JWIM) :: IJ, K, M, J, II
       INTEGER(KIND=JWIM) :: JKGLO, NPROMA, MTHREADS
       INTEGER(KIND=JWIM) :: NSTEP_LF, ISUBST
-!$    INTEGER,EXTERNAL :: OMP_GET_MAX_THREADS
+      INTEGER,EXTERNAL :: OMP_GET_MAX_THREADS
       INTEGER(KIND=JWIM) :: IJSG, IJLG, ICHNK, KIJS, KIJL, IJSB, IJLB
 
       REAL(KIND=JPHOOK) :: ZHOOK_HANDLE
@@ -274,7 +274,6 @@ SUBROUTINE PROPAG_WAM (BLK2GLO, WVENVI, WVPRPT, FL1)
 
                    CALL PROPAGS2(FL1_EXT(:,:,1:IFRELFMAX), FL3_EXT(:,:,1:IFRELFMAX), NINF, NSUP, KIJS, KIJL, NANG, 1, IFRELFMAX)
                  ENDDO
-!            !$ACC END DATA
 #ifndef _OPENACC
 !$OMP            END PARALLEL DO
 #endif /*_OPENACC*/

diff --git a/src/ecwam/wamintgr_loki_gpu.F90 b/src/ecwam/wamintgr_loki_gpu.F90
@@ -166,6 +166,7 @@ SUBROUTINE WAMINTGR_LOKI_GPU(CDTPRA, CDATE, CDATEWH, CDTIMP, CDTIMPNEXT,  &
 ENDIF
 !$acc end data
 
+
 !* RETRIEVING NEW FORCING FIELDS IF NEEDED.
 !  ----------------------------------------
 CALL NEWWIND(CDTIMP, CDATEWH, LLNEWFILE,      &

diff --git a/src/ecwam/yowubuf.F90 b/src/ecwam/yowubuf.F90
@@ -154,7 +154,6 @@ MODULE YOWUBUF
 !      *LLWMPMN*   LOGICAL ARRAY, TRUE IF WMPMN > 0. AT ALL GRID POINTS.
 
 ! ----------------------------------------------------------------------
-
 !$acc declare create(WLAT)
 !$acc declare create(KLAT)
 !$acc declare create(KLON)
@@ -169,5 +168,4 @@ MODULE YOWUBUF
 !$acc declare create(WKPMN)
 !$acc declare create(SUMWN)
 !$acc declare create(LLWKPMN)
-
         END MODULE YOWUBUF