Changeset 8887 for branches/UKMO

Timestamp:

2017-12-04T10:52:38+01:00 (6 years ago)

Author:

andmirek

Message:

#1978 coupling timers

Location:

branches/UKMO/dev_r7750_GO6_package_oasis_timers/NEMOGCM/NEMO/OPA_SRC

Files:

• SBC/sbccpl.F90 (modified) (10 diffs)
• nemogcm.F90 (modified) (2 diffs)

branches/UKMO/dev_r7750_GO6_package_oasis_timers/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -252 +252 @@
 
       !
-      IF( nn_timing == 1 )  CALL timing_start('sbc_cpl_init')
+      IF( nn_timing == 1 .OR. nn_timing == 2)  CALL timing_start('sbc_cpl_init')
       !
       CALL wrk_alloc( jpi,jpj, zacs, zaos )
@@ -975 +975 @@
       CALL wrk_dealloc( jpi,jpj, zacs, zaos )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('sbc_cpl_init')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_stop('sbc_cpl_init')
       !
    END SUBROUTINE sbc_cpl_init
@@ -1050 +1050 @@
 
       !
-      IF( nn_timing == 1 )  CALL timing_start('sbc_cpl_rcv')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_start('sbc_cpl_rcv')
       !
       CALL wrk_alloc( jpi,jpj, ztx, zty, zmsk, zemp, zqns, zqsr )
@@ -1415 +1415 @@
       CALL wrk_dealloc( jpi,jpj, ztx, zty, zmsk, zemp, zqns, zqsr )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('sbc_cpl_rcv')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_stop('sbc_cpl_rcv')
       !
    END SUBROUTINE sbc_cpl_rcv
@@ -1461 +1461 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('sbc_cpl_ice_tau')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_start('sbc_cpl_ice_tau')
       !
       CALL wrk_alloc( jpi,jpj, ztx, zty )
@@ -1626 +1626 @@
       CALL wrk_dealloc( jpi,jpj, ztx, zty )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('sbc_cpl_ice_tau')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_stop('sbc_cpl_ice_tau')
       !
    END SUBROUTINE sbc_cpl_ice_tau
@@ -1693 +1693 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('sbc_cpl_ice_flx')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_start('sbc_cpl_ice_flx')
       !
       CALL wrk_alloc( jpi,jpj,     zcptn, ztmp, zicefr, zmsk, zsnw )
@@ -2078 +2078 @@
       CALL wrk_dealloc( jpi,jpj,jpl, zqns_ice, zqsr_ice, zdqns_ice, zqevap_ice )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('sbc_cpl_ice_flx')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_stop('sbc_cpl_ice_flx')
       !
    END SUBROUTINE sbc_cpl_ice_flx
@@ -2101 +2101 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('sbc_cpl_snd')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_start('sbc_cpl_snd')
       !
       CALL wrk_alloc( jpi,jpj, zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1 )
@@ -2533 +2533 @@
       CALL wrk_dealloc( jpi,jpj,jpl, ztmp3, ztmp4 )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('sbc_cpl_snd')
+      IF( nn_timing == 1 .OR. nn_timing == 2 )  CALL timing_stop('sbc_cpl_snd')
       !
    END SUBROUTINE sbc_cpl_snd

branches/UKMO/dev_r7750_GO6_package_oasis_timers/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -194 +194 @@
          CALL Agrif_ParentGrid_To_ChildGrid()
          IF( lk_diaobs ) CALL dia_obs_wri
-         IF( nn_timing == 1 )   CALL timing_finalize
+         IF( nn_timing > 0 )   CALL timing_finalize
          CALL Agrif_ChildGrid_To_ParentGrid()
       ENDIF
 #endif
-      IF( nn_timing == 1 )   CALL timing_finalize
+      IF( nn_timing > 0 )   CALL timing_finalize
       !
       CALL nemo_closefile
@@ -388 +388 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_init
+      IF( nn_timing > 0 )  CALL timing_init
       !
       !                                      ! General initialization