Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.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/TOP_SRC/PISCES/P4Z/p4zche.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90

@@ -155 +155 @@
       REAL(wp) ::   zst  , zft  , zcks  , zckf  , zaksp1
       REAL(wp) ::   total2free, free2SWS, total2SWS, SWS2total
-
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_che')
+      IF( ln_timing )   CALL timing_start('p4z_che')
       !
       ! Computation of chemical constants require practical salinity
@@ -447 +446 @@
       END DO
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_che')
+      IF( ln_timing )  CALL timing_stop('p4z_che')
       !
    END SUBROUTINE p4z_che
+
 
    SUBROUTINE ahini_for_at(p_hini)
@@ -470 +470 @@
       REAL(wp)  ::  za2, za1, za0
       REAL(wp)  ::  p_dictot, p_bortot, p_alkcb 
-
-      IF( nn_timing == 1 )  CALL timing_start('ahini_for_at')
+      !!---------------------------------------------------------------------
+
+      IF( ln_timing )  CALL timing_start('ahini_for_at')
       !
       DO jk = 1, jpk
@@ -512 +513 @@
       END DO
       !
-      IF( nn_timing == 1 )  CALL timing_stop('ahini_for_at')
+      IF( ln_timing )  CALL timing_stop('ahini_for_at')
       !
    END SUBROUTINE ahini_for_at
 
    !===============================================================================
+
    SUBROUTINE anw_infsup( p_alknw_inf, p_alknw_sup )
 
@@ -564 +566 @@
    REAL(wp), POINTER, DIMENSION(:,:,:) :: zalknw_inf, zalknw_sup, rmask, zh_min, zh_max, zeqn_absmin
 
-   IF( nn_timing == 1 )  CALL timing_start('solve_at_general')
+   IF( ln_timing )  CALL timing_start('solve_at_general')
       !  Allocate temporary workspace
    CALL wrk_alloc( jpi, jpj, jpk, zalknw_inf, zalknw_sup, rmask )
@@ -801 +803 @@
 
 
-   IF( nn_timing == 1 )  CALL timing_stop('solve_at_general')
-
-
+      IF( ln_timing )   CALL timing_stop('solve_at_general')
+      !
    END SUBROUTINE solve_at_general
+
 
    INTEGER FUNCTION p4z_che_alloc()