Ignore:
Timestamp:
2017-12-19T09:26:25+01:00 (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90

    r8533 r9124  
    4242   REAL(wp), PUBLIC ::  epsher      !: half sturation constant for grazing 1  
    4343 
    44  
    4544   !!---------------------------------------------------------------------- 
    4645   !! NEMO/TOP 3.3 , NEMO Consortium (2010) 
     
    4847   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    4948   !!---------------------------------------------------------------------- 
    50  
    5149CONTAINS 
    5250 
     
    7573      !!--------------------------------------------------------------------- 
    7674      ! 
    77       IF( nn_timing == 1 )  CALL timing_start('p4z_micro') 
     75      IF( ln_timing )   CALL timing_start('p4z_micro') 
    7876      ! 
    7977      CALL wrk_alloc( jpi, jpj, jpk, zgrazing ) 
     
    196194      CALL wrk_dealloc( jpi, jpj, jpk, zgrazing ) 
    197195      ! 
    198       IF( nn_timing == 1 )  CALL timing_stop('p4z_micro') 
     196      IF( ln_timing )   CALL timing_stop('p4z_micro') 
    199197      ! 
    200198   END SUBROUTINE p4z_micro 
     
    202200 
    203201   SUBROUTINE p4z_micro_init 
    204  
    205202      !!---------------------------------------------------------------------- 
    206203      !!                  ***  ROUTINE p4z_micro_init  *** 
     
    214211      !! 
    215212      !!---------------------------------------------------------------------- 
    216  
     213      INTEGER ::   ios   ! Local integer 
     214      ! 
    217215      NAMELIST/namp4zzoo/ part, grazrat, resrat, mzrat, xpref2c, xpref2p, & 
    218216         &                xpref2d,  xthreshdia,  xthreshphy,  xthreshpoc, & 
    219217         &                xthresh, xkgraz, epsher, sigma1, unass 
    220       INTEGER :: ios                 ! Local integer output status for namelist read 
    221  
     218      !!---------------------------------------------------------------------- 
     219      ! 
    222220      REWIND( numnatp_ref )              ! Namelist nampiszoo in reference namelist : Pisces microzooplankton 
    223221      READ  ( numnatp_ref, namp4zzoo, IOSTAT = ios, ERR = 901) 
    224222901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp4zzoo in reference namelist', lwp ) 
    225  
     223      ! 
    226224      REWIND( numnatp_cfg )              ! Namelist nampiszoo in configuration namelist : Pisces microzooplankton 
    227225      READ  ( numnatp_cfg, namp4zzoo, IOSTAT = ios, ERR = 902 ) 
    228 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp4zzoo in configuration namelist', lwp ) 
     226902   IF( ios > 0 ) CALL ctl_nam ( ios , 'namp4zzoo in configuration namelist', lwp ) 
    229227      IF(lwm) WRITE ( numonp, namp4zzoo ) 
    230  
     228      ! 
    231229      IF(lwp) THEN                         ! control print 
    232230         WRITE(numout,*) ' ' 
     
    249247         WRITE(numout,*) '    half sturation constant for grazing 1           xkgraz      =', xkgraz 
    250248      ENDIF 
    251  
     249      ! 
    252250   END SUBROUTINE p4z_micro_init 
    253251 
Note: See TracChangeset for help on using the changeset viewer.