Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z

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

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z

Files:

• p2zbio.F90 (modified) (2 diffs)
• p2zexp.F90 (modified) (3 diffs)
• p2zopt.F90 (modified) (6 diffs)
• p2zsed.F90 (modified) (4 diffs)
• p2zsms.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90

@@ -101 +101 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p2z_bio')
+      IF( ln_timing )   CALL timing_start('p2z_bio')
       !
       IF( lk_iomput ) THEN
@@ -382 +382 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p2z_bio')
+      IF( ln_timing )  CALL timing_stop('p2z_bio')
       !
    END SUBROUTINE p2z_bio
+
 
    SUBROUTINE p2z_bio_init

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90

@@ -68 +68 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p2z_exp')
+      IF( ln_timing )   CALL timing_start('p2z_exp')
       !
       IF( kt == nittrc000 )   CALL p2z_exp_init
@@ -155 +155 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p2z_exp')
+      IF( ln_timing )  CALL timing_stop('p2z_exp')
       !
    END SUBROUTINE p2z_exp
+
 
    SUBROUTINE p2z_exp_init
@@ -166 +167 @@
       INTEGER  ::   ji, jj, jk
       REAL(wp) ::   zmaskt, zfluo, zfluu
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zrro
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zdm0
-      !!---------------------------------------------------------------------
-
+      REAL(wp), POINTER, DIMENSION(:,:  ) ::   zrro
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zdm0
+      !!---------------------------------------------------------------------
+      !
       IF(lwp) THEN
          WRITE(numout,*)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90

@@ -11 +11 @@
    !!             3.2  !  2009-04  (C. Ethe, G. Madec)  minor optimisation + style
    !!----------------------------------------------------------------------
+
+   !!----------------------------------------------------------------------
    !!   p2z_opt        :   Compute the light availability in the water column
    !!----------------------------------------------------------------------
@@ -69 +71 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p2z_opt')
+      IF( ln_timing )   CALL timing_start('p2z_opt')
       !
       ! Allocate temporary workspace
@@ -143 +145 @@
       CALL wrk_dealloc( jpi, jpj, jpk, zparr, zparg    )
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p2z_opt')
+      IF( ln_timing )   CALL timing_stop('p2z_opt')
       !
    END SUBROUTINE p2z_opt
@@ -157 +159 @@
       !!
       !!----------------------------------------------------------------------
+      INTEGER ::   ios   ! Local integer
+      !!
       NAMELIST/namlobopt/ xkg0, xkr0, xkgp, xkrp, xlg, xlr, rpig
       NAMELIST/namlobrat/ rcchl, redf, reddom
-      INTEGER :: ios                 ! Local integer output status for namelist read
       !!----------------------------------------------------------------------
 
@@ -168 +171 @@
       REWIND( numnatp_cfg )              ! Namelist namlobopt in configuration namelist : Lobster options
       READ  ( numnatp_cfg, namlobopt, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlobopt in configuration namelist', lwp )
+902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namlobopt in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namlobopt )
 
@@ -190 +193 @@
       REWIND( numnatp_cfg )              ! Namelist namlobrat in configuration namelist : Lobster ratios
       READ  ( numnatp_cfg, namlobrat, IOSTAT = ios, ERR = 904 )
-904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlobrat in configuration namelist', lwp )
+904   IF( ios >  0 ) CALL ctl_nam ( ios , 'namlobrat in configuration namelist', lwp )
       IF(lwm) WRITE ( numonp, namlobrat )
 

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90

@@ -35 +35 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -56 +55 @@
       !!              trend of passive tracers is saved for futher diagnostics.
       !!---------------------------------------------------------------------
-      !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
-      !!
+      !
       INTEGER  ::   ji, jj, jk, jl, ierr
       CHARACTER (len=25) :: charout
@@ -65 +63 @@
       !!---------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p2z_sed')
+      IF( ln_timing )   CALL timing_start('p2z_sed')
       !
       IF( kt == nittrc000 ) THEN
@@ -119 +117 @@
       ENDIF
       !
-      IF( nn_timing == 1 )  CALL timing_stop('p2z_sed')
+      IF( ln_timing )   CALL timing_stop('p2z_sed')
       !
    END SUBROUTINE p2z_sed
+
 
    SUBROUTINE p2z_sed_init

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90

@@ -6 +6 @@
    !! History :   1.0  !            M. Levy
    !!             2.0  !  2007-12  (C. Ethe, G. Madec)  revised architecture
+   !!----------------------------------------------------------------------
+
    !!----------------------------------------------------------------------
    !!   p2zsms        :  Time loop of passive tracers sms
@@ -42 +44 @@
       !! ** Method  : - ???
       !! --------------------------------------------------------------------
-      !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !
-      INTEGER :: jn
+      INTEGER ::   jn   ! dummy loop index
       !! --------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('p2z_sms')
+      IF( ln_timing )   CALL timing_start('p2z_sms')
       !
       CALL p2z_opt( kt )      ! optical model
@@ -54 +55 @@
       CALL p2z_sed( kt )      ! sedimentation model
       CALL p2z_exp( kt )      ! export
-
+      !
       IF( l_trdtrc ) THEN
          DO jn = jp_pcs0, jp_pcs1
@@ -60 +61 @@
          END DO
       END IF
-
       !
       IF ( lwm .AND. kt == nittrc000 ) CALL FLUSH    ( numonp )     ! flush output namelist PISCES
-      IF( nn_timing == 1 )  CALL timing_stop('p2z_sms')
+      IF( ln_timing )   CALL timing_stop('p2z_sms')
       !
    END SUBROUTINE p2z_sms