Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcice.F90

Timestamp:

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

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcice.F90

@@ -12 +12 @@
    !!   trc_ice   :  Call the appropriate sea ice tracer subroutine
    !!----------------------------------------------------------------------
-
    USE oce_trc         ! shared variables between ocean and passive tracers
    USE trc             ! passive tracers common variables
@@ -24 +23 @@
    PRIVATE
    
-   PUBLIC   trc_ice_ini ! called by trc_nam
+   PUBLIC   trc_ice_ini   ! called by trc_nam
 
+   !!----------------------------------------------------------------------
+   !! NEMO/TOP 4.0 , NEMO Consortium (2011)
+   !! $Id: trcini.F90 9019 2017-12-13 14:58:53Z timgraham $ 
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
    
@@ -37 +41 @@
       !!            
       !!---------------------------------------------------------------------
-      ! --- Variable declarations --- !
-
+      !
       IF(lwp) THEN
          WRITE(numout,*)
@@ -44 +47 @@
          WRITE(numout,*) '~~~~~~~~~~~~~'
       ENDIF
-
-      IF( nn_timing == 1 )  CALL timing_start('trc_ice_ini')
       !
       CALL trc_nam_ice
       !
-      trc_i(:,:,:) = 0.0d0 ! by default
-      trc_o(:,:,:) = 0.0d0 ! by default
-
+      trc_i(:,:,:) = 0._wp   ! by default
+      trc_o(:,:,:) = 0._wp   ! by default
+      !
       IF ( nn_ice_tr == 1 ) THEN
          IF( ln_pisces  )    CALL trc_ice_ini_pisces       ! PISCES  bio-model
@@ -59 +60 @@
          IF( ln_my_trc  )    CALL trc_ice_ini_my_trc       ! MY_TRC  tracers
       ENDIF
-
-      IF( nn_timing == 1 )   CALL timing_stop('trc_ice_ini')
       !
    END SUBROUTINE trc_ice_ini
+
 
    SUBROUTINE trc_nam_ice
@@ -86 +86 @@
          WRITE(numout,*) '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
       ENDIF
-
-      IF( nn_timing == 1 )  CALL timing_start('trc_nam_ice')
-
       !
       REWIND( numnat_ref )              ! Namelist namtrc_ice in reference namelist : Passive tracer input data
@@ -110 +107 @@
          cn_trc_o      (jn) = sn_tri_tracer(jn)%ctrc_o
       END DO
-
-      IF( nn_timing == 1 )   CALL timing_stop('trc_nam_ice')
       !
    END SUBROUTINE trc_nam_ice
@@ -122 +117 @@
    SUBROUTINE trc_ice_ini                   ! Dummy routine   
    END SUBROUTINE trc_ice_ini
-
    SUBROUTINE trc_nam_ice
    END SUBROUTINE trc_nam_ice
-
 #endif