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

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

@@ -18 +18 @@
    USE prtctl_trc      !  print control for debugging
 
-
    IMPLICIT NONE
    PRIVATE
@@ -59 +58 @@
       !! ** Method  : - ???
       !!---------------------------------------------------------------------
-      !
       INTEGER, INTENT(in) ::   kt, knt   ! ocean time step
       !
@@ -72 +70 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_opt')
+      IF( ln_timing )  CALL timing_start('p4z_opt')
       !
       ! Allocate temporary workspace
@@ -250 +248 @@
                    CALL wrk_dealloc( jpi, jpj, jpk, zpar   ,  ze0, ze1, ze2, ze3, zchl3d )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_opt')
+      IF( ln_timing )  CALL timing_stop('p4z_opt')
       !
    END SUBROUTINE p4z_opt
+
 
    SUBROUTINE p4z_opt_par( kt, pqsr, pe1, pe2, pe3, pe0, pqsr100 ) 
@@ -334 +333 @@
       !!
       !!----------------------------------------------------------------------
-      !! * arguments
       INTEGER ,                INTENT(in) ::   kt     ! ocean time step
-
-      !! * local declarations
+      !
       INTEGER  :: ji,jj
       REAL(wp) :: zcoef
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p4z_optsbc')
+      IF( ln_timing )  CALL timing_start('p4z_optsbc')
       !
       ! Compute par_varsw at nit000 or only if there is more than 1 time record in par coefficient file
@@ -352 +349 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_optsbc')
+      IF( ln_timing )  CALL timing_stop('p4z_optsbc')
       !
    END SUBROUTINE p4z_opt_sbc
+
 
    SUBROUTINE p4z_opt_init
@@ -365 +363 @@
       !! ** Input   :   external ascii and netcdf files
       !!----------------------------------------------------------------------
-      !
       INTEGER :: numpar
       INTEGER :: ierr
@@ -375 +372 @@
       !
       NAMELIST/nampisopt/cn_dir, sn_par, ln_varpar, parlux
-
-      !!----------------------------------------------------------------------
-
-      IF( nn_timing == 1 )  CALL timing_start('p4z_opt_init')
+      !!----------------------------------------------------------------------
 
       REWIND( numnatp_ref )              ! Namelist nampisopt in reference namelist : Pisces attenuation coef. and PAR
@@ -434 +428 @@
       IF( ln_qsr_bio )   etot3    (:,:,:) = 0._wp
       ! 
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_opt_init')
-      !
    END SUBROUTINE p4z_opt_init