Changeset 14229 for NEMO/trunk/src/OCE/timing.F90

Timestamp:

2020-12-20T13:45:55+01:00 (3 years ago)

Author:

smasson

Message:

trunk: replace key_mpp_mpi by the opposite key key_mpi_off

File:

• NEMO/trunk/src/OCE/timing.F90 (modified) (11 diffs)

NEMO/trunk/src/OCE/timing.F90

@@ -31 +31 @@
    PUBLIC   timing_start, timing_stop      ! called in each routine to time
 
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
    INCLUDE 'mpif.h'
 #endif
@@ -116 +116 @@
       CALL CPU_TIME( s_timer%t_cpu  )
       ! clock time collection
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       s_timer%t_clock= MPI_Wtime()
 #else
@@ -142 +142 @@
 
       ! clock time collection
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       zmpitime = MPI_Wtime()
 #else
@@ -166 +166 @@
 
       ! clock time correction
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       zclock_raw = zmpitime - s_timer%t_clock - t_overclock ! total time including child
       s_timer%t_clock = zclock_raw - t_overclock - s_timer%tsub_clock
@@ -249 +249 @@
 
       ! Compute clock function overhead
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       t_overclock = MPI_WTIME()
       t_overclock = MPI_WTIME() - t_overclock
@@ -274 +274 @@
 
       CALL CPU_TIME(t_cpu(1))
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       ! Start elapsed and CPU time counters
       t_elaps(1) = MPI_WTIME()
@@ -305 +305 @@
       CALL CPU_TIME(t_cpu(2))
       t_cpu(2)   = t_cpu(2)    - t_cpu(1)   - t_overcpu
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       t_elaps(2) = MPI_WTIME() - t_elaps(1) - t_overclock
 #else
@@ -336 +336 @@
       ENDIF
 
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       ! in MPI gather some info
       ALLOCATE( all_etime(jpnij), all_ctime(jpnij) )
@@ -360 +360 @@
       IF( lwriter ) WRITE(numtime,'(5x,f12.3,1x,f12.3)')  tot_etime, tot_ctime
       IF( lwriter ) WRITE(numtime,*)
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       IF( ll_averep ) CALL waver_info
       CALL wmpi_info
@@ -377 +377 @@
       &       czone(1:3),    czone(4:5)
 
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
       ALLOCATE(timing_glob(4*jpnij), stat=icode)
       CALL MPI_GATHER( (/compute_time, waiting_time(1), waiting_time(2), elapsed_time/),   &
@@ -458 +458 @@
    END SUBROUTINE wcurrent_info
 
-#if defined key_mpp_mpi
+#if ! defined key_mpi_off
    SUBROUTINE waver_info
       !!----------------------------------------------------------------------