Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90

Timestamp:

2017-12-19T09:26:25+01:00 (7 years ago)

Author:

gm

Message:

dev_merge_2017: ln_timing instead of nn_timing + restricted timing to nemo_init and routine called by step in OPA_SRC

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 (modified) (14 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90

@@ -80 +80 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 ) CALL timing_start('bdy_dyn3d_spe')
-      !
       igrd = 2                      ! Relaxation of zonal velocity
       DO jb = 1, idx%nblenrim(igrd)
@@ -104 +102 @@
       IF( kt == nit000 )   CLOSE( unit = 102 )
       !
-      IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn3d_spe')
-      !
    END SUBROUTINE bdy_dyn3d_spe
+
 
    SUBROUTINE bdy_dyn3d_zgrad( idx, dta, kt , ib_bdy )
@@ -126 +123 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 ) CALL timing_start('bdy_dyn3d_zgrad')
-      !
       igrd = 2                      ! Copying tangential velocity into bdy points
       DO jb = 1, idx%nblenrim(igrd)
@@ -152 +147 @@
       CALL lbc_bdy_lnk( va, 'V', -1., ib_bdy )   
       !
-      IF( kt .eq. nit000 ) CLOSE( unit = 102 )
-
-      IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn3d_zgrad')
-
+      IF( kt == nit000 )   CLOSE( unit = 102 )
+      !
    END SUBROUTINE bdy_dyn3d_zgrad
+
 
    SUBROUTINE bdy_dyn3d_zro( idx, dta, kt, ib_bdy )
@@ -174 +168 @@
       REAL(wp) ::   zwgt           ! boundary weight
       !!----------------------------------------------------------------------
-      !
-      IF( nn_timing == 1 ) CALL timing_start('bdy_dyn3d_zro')
       !
       igrd = 2                       ! Everything is at T-points here
@@ -199 +191 @@
       IF( kt == nit000 )   CLOSE( unit = 102 )
       !
-      IF( nn_timing == 1 )   CALL timing_stop('bdy_dyn3d_zro')
-      !
    END SUBROUTINE bdy_dyn3d_zro
 
@@ -225 +215 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 ) CALL timing_start('bdy_dyn3d_frs')
-      !
       igrd = 2                      ! Relaxation of zonal velocity
       DO jb = 1, idx%nblen(igrd)
@@ -250 +238 @@
       !
       IF( kt == nit000 )   CLOSE( unit = 102 )
-      !
-      IF( nn_timing == 1 )   CALL timing_stop('bdy_dyn3d_frs')
       !
    END SUBROUTINE bdy_dyn3d_frs
@@ -273 +259 @@
       INTEGER  ::   jb, igrd                               ! dummy loop indices
       !!----------------------------------------------------------------------
-
-      IF( nn_timing == 1 ) CALL timing_start('bdy_dyn3d_orlanski')
       !
       !! Note that at this stage the ub and ua arrays contain the baroclinic velocities. 
@@ -289 +273 @@
       CALL lbc_bdy_lnk( va, 'V', -1., ib_bdy )   
       !
-      IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn3d_orlanski')
-      !
    END SUBROUTINE bdy_dyn3d_orlanski
 
@@ -309 +291 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('bdy_dyn3d_dmp')
+      IF( ln_timing )   CALL timing_start('bdy_dyn3d_dmp')
       !
       DO ib_bdy=1, nb_bdy
@@ -339 +321 @@
       CALL lbc_lnk_multi( ua, 'U', -1.,  va, 'V', -1. )   ! Boundary points should be updated
       !
-      IF( nn_timing == 1 )   CALL timing_stop('bdy_dyn3d_dmp')
+      IF( ln_timing )   CALL timing_stop('bdy_dyn3d_dmp')
       !
    END SUBROUTINE bdy_dyn3d_dmp
+
 
    SUBROUTINE bdy_dyn3d_nmn( idx, ib_bdy )
@@ -357 +340 @@
       INTEGER  ::   jb, igrd                               ! dummy loop indices
       !!----------------------------------------------------------------------
-
-      IF( nn_timing == 1 ) CALL timing_start('bdy_dyn3d_nmn')
       !
       !! Note that at this stage the ub and ua arrays contain the baroclinic velocities. 
@@ -373 +354 @@
       CALL lbc_bdy_lnk( va, 'V', -1., ib_bdy )
       !
-      IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn3d_nmn')
-      !
    END SUBROUTINE bdy_dyn3d_nmn