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

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/C14/trcsms_c14.F90

@@ -28 +28 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $                                                                    $ 
+   !! $Id:$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -60 +60 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )  CALL timing_start('trc_sms_c14')
+      IF( ln_timing )   CALL timing_start('trc_sms_c14')
       !
       IF( kt ==  nittrc000 ) THEN
@@ -68 +68 @@
       ENDIF
       !
- 
       ! Get co2sbc & c14sbc(ji,jj): at 1st iter for all, at each time step for transient
       IF( kc14typ >= 1 .OR.  kt ==  nittrc000 )   CALL trc_atm_c14( kt, co2sbc, c14sbc ) 
@@ -80 +79 @@
       DO jj = 1, jpj
          DO ji = 1, jpi  
-            IF( tmask(ji,jj,1) >  0.) THEN
-
-               zt   = MIN( 40., tsn(ji,jj,1,jp_tem))
-
+            IF( tmask(ji,jj,1) >  0. ) THEN
+               !
+               zt   = MIN( 40. , tsn(ji,jj,1,jp_tem) )
+               !
                !  Computation of solubility zsol in [mol/(L * atm)]
                !   after Wanninkhof (2014) referencing Weiss (1974)
@@ -143 +142 @@
          END DO
       END DO
-
       !
       IF( lrst_trc ) THEN
@@ -149 +147 @@
          IF(lwp) WRITE(numout,*) ' trc_rst_wri_c14 : Write specific variables from c14 model '
          IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~'
-      !
+         !
          CALL iom_rstput( kt, nitrst, numrtw, 'co2sbc', co2sbc )       ! These five need      &
          CALL iom_rstput( kt, nitrst, numrtw, 'c14sbc', c14sbc )     ! &    to be written   &
@@ -156 +154 @@
          CALL iom_rstput( kt, nitrst, numrtw, 'qtr_c14', qtr_c14 )   ! &    to be coherent.
          CALL iom_rstput( kt, nitrst, numrtw, 'qint_c14', qint_c14 ) ! Cumulative
-      !
+         !
       ENDIF
 
       IF( l_trdtrc )  CALL trd_trc( tra(:,:,:,jp_c14), 1, jptra_sms, kt )   ! save trends
       !
-      IF( nn_timing == 1 )  CALL timing_stop('trc_sms_c14')
+      IF( ln_timing )   CALL timing_stop('trc_sms_c14')
       !
    END SUBROUTINE trc_sms_c14
 
-
   !!======================================================================
 END MODULE trcsms_c14