Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90

Timestamp:

2017-12-19T09:26:25+01:00 (6 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/TRA/trabbl.F90 (modified) (9 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90

@@ -42 +42 @@
 
    PUBLIC   tra_bbl       !  routine called by step.F90
-   PUBLIC   tra_bbl_init  !  routine called by opa.F90
+   PUBLIC   tra_bbl_init  !  routine called by nemogcm.F90
    PUBLIC   tra_bbl_dif   !  routine called by trcbbl.F90
-   PUBLIC   tra_bbl_adv   !  -          -          -              -
+   PUBLIC   tra_bbl_adv   !     -      -          -
    PUBLIC   bbl           !  routine called by trcbbl.F90 and dtadyn.F90
 
@@ -185 +185 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zptb   ! workspace
       !!----------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start('tra_bbl_dif')
       !
       DO jn = 1, kjpt                                     ! tracer loop
@@ -211 +209 @@
       END DO                                                ! end tracer
       !                                                     ! ===========
-      !
-      IF( ln_timing )   CALL timing_stop('tra_bbl_dif')
-      !
    END SUBROUTINE tra_bbl_dif
 
@@ -243 +238 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_timing )   CALL timing_start( 'tra_bbl_adv')
       !                                                          ! ===========
       DO jn = 1, kjpt                                            ! tracer loop
@@ -298 +292 @@
       END DO                                                ! end tracer
       !                                                     ! ===========
-      !
-      IF( ln_timing )   CALL timing_stop( 'tra_bbl_adv')
-      !
    END SUBROUTINE tra_bbl_adv
 
@@ -343 +334 @@
       REAL(wp), DIMENSION(jpi,jpj)        :: zub, zvb, zdep   ! 2D workspace
       !!----------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start( 'bbl')
       !
       IF( kt == kit000 )  THEN
@@ -475 +464 @@
       ENDIF
       !
-      IF( ln_timing )   CALL timing_stop( 'bbl')
-      !
    END SUBROUTINE bbl
 
@@ -495 +482 @@
       NAMELIST/nambbl/ ln_trabbl, nn_bbl_ldf, nn_bbl_adv, rn_ahtbbl, rn_gambbl
       !!----------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start( 'tra_bbl_init')
       !
       REWIND( numnam_ref )              ! Namelist nambbl in reference namelist : Bottom boundary layer scheme
@@ -569 +554 @@
       ahv_bbl_0(:,:) = rn_ahtbbl * e1_e2v(:,:) * e3v_bbl_0(:,:) * vmask(:,:,1)
       !
-      IF( ln_timing )   CALL timing_stop( 'tra_bbl_init')
-      !
    END SUBROUTINE tra_bbl_init