Changeset 3432 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

Timestamp:

2012-07-11T13:22:58+02:00 (12 years ago)

Author:

trackstand2

Message:

Merge branch 'ksection_partition'

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (14 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -71 +71 @@
       !!             - save the trends 
       !!----------------------------------------------------------------------
+      USE timing,   ONLY: timing_start, timing_stop
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zwx => ua        , zwy => va          ! (ua,va) used as workspace
@@ -108 +109 @@
       !!----------------------------------------------------------------------
 
+      CALL timing_start('tra_adv_tvd')
+
       IF( wrk_in_use(3, 12,13) ) THEN
          CALL ctl_stop('tra_adv_tvd: requested workspace arrays unavailable')   ;   RETURN
@@ -140 +143 @@
          ! --------------------------------------------------------------------
          ! upstream tracer flux in the i and j direction
+         CALL timing_start('tvd_upstream')
 #if defined key_z_first
          DO jj = 1, jpjm1
@@ -159 +163 @@
             END DO
          END DO
+         CALL timing_stop('tvd_upstream','section')
 
          ! upstream tracer flux in the k direction
          ! Surface value
+         CALL timing_start('tvd_upstreamk')
          IF( lk_vvl ) THEN   ;   zwz(:,:, 1 ) = 0.e0                         ! volume variable
          ELSE                ;   zwz(:,:, 1 ) = pwn(:,:,1) * ptb(:,:,1,jn)   ! linear free surface 
@@ -181 +187 @@
             END DO
          END DO
+         CALL timing_stop('tvd_upstreamk','section')
 
          ! total advective trend
+         CALL timing_start('tvd_tot')
 #if defined key_z_first
          DO jj = 2, jpjm1
@@ -205 +213 @@
             END DO
          END DO
+         CALL timing_stop('tvd_tot','section')
+
          !                             ! Lateral boundary conditions on zwi  (unchanged sign)
+         CALL timing_start('tvd_lbc')
          CALL lbc_lnk( zwi, 'T', 1. )  
+         CALL timing_stop('tvd_lbc','section')
 
          !                                 ! trend diagnostics (contribution of upstream fluxes)
@@ -222 +234 @@
          ! --------------------------------------------------
          ! antidiffusive flux on i and j
+         CALL timing_start('tvd_antidiff')
 #if defined key_z_first
          DO jj = 1, jpjm1
@@ -236 +249 @@
             END DO
          END DO
+         CALL timing_stop('tvd_antidiff','section')
       
          ! antidiffusive flux on k
+         CALL timing_start('tvd_antidiffk')
 #if defined key_z_first
          DO jj = 1, jpj
@@ -254 +269 @@
             END DO
          END DO
+         CALL timing_stop('tvd_antidiffk','section')
+
+         CALL timing_start('tvd_lbc')
          CALL lbc_lnk( zwx, 'U', -1. )   ;   CALL lbc_lnk( zwy, 'V', -1. )         ! Lateral bondary conditions
          CALL lbc_lnk( zwz, 'W',  1. )
+         CALL timing_stop('tvd_lbc','section')
 
          ! 4. monotonicity algorithm
          ! -------------------------
+         CALL timing_start('tvd_nonosc')
          CALL nonosc( ptb(:,:,:,jn), zwx, zwy, zwz, zwi, p2dt )
+         CALL timing_stop('tvd_nonosc','section')
 
 
          ! 5. final trend with corrected fluxes
          ! ------------------------------------
+         CALL timing_start('tvd_finaltr')
 #if defined key_z_first
          DO jj = 2, jpjm1
@@ -300 +322 @@
          ENDIF
          !
+         CALL timing_stop('tvd_finaltr','section')
+
       END DO
       !
@@ -308 +332 @@
       IF( wrk_not_released(3, 12,13) )   CALL ctl_stop('tra_adv_tvd: failed to release workspace arrays')
       !
+      CALL timing_stop('tra_adv_tvd','section')
 
       !! * Reset control of array index permutation
@@ -334 +359 @@
       USE wrk_nemo, ONLY:   zbetup => wrk_3d_8  , zbetdo => wrk_3d_9    ! 3D workspace
       USE wrk_nemo, ONLY:   zbup   => wrk_3d_10 , zbdo   => wrk_3d_11   !  -     -
+      USE timing,   ONLY:   timing_start, timing_stop
 
       !! DCSE_NEMO: need additional directives for renamed module variables
@@ -418 +444 @@
          END DO
       END DO
+      CALL timing_start('tvd_lbc')
       CALL lbc_lnk( zbetup, 'T', 1. )   ;   CALL lbc_lnk( zbetdo, 'T', 1. )   ! lateral boundary cond. (unchanged sign)
+      CALL timing_stop('tvd_lbc','section')
 
 
@@ -452 +480 @@
          END DO
       END DO
+      CALL timing_start('tvd_lbc')
       CALL lbc_lnk( paa, 'U', -1. )   ;   CALL lbc_lnk( pbb, 'V', -1. )   ! lateral boundary condition (changed sign)
+      CALL timing_stop('tvd_lbc','section')
+
       !
       IF( wrk_not_released(3, 8,9,10,11) )   CALL ctl_stop('nonosc: failed to release workspace arrays')