Changeset 3294 for trunk/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

@@ -22 +22 @@
    USE iom
    USE in_out_manager
+   USE trcsub
 
    IMPLICIT NONE
@@ -27 +28 @@
 
    PUBLIC   trc_stp    ! called by step
-   
+
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
@@ -45 +48 @@
       !!              Update the passive tracers
       !!-------------------------------------------------------------------
-      INTEGER, INTENT( in ) ::  kt  ! ocean time-step index
+      INTEGER, INTENT( in ) ::  kt      ! ocean time-step index
+      INTEGER               ::  jk, jn  ! dummy loop indices
+      REAL(wp)              ::  ztrai
       CHARACTER (len=25)    ::  charout
       !!-------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )   CALL timing_start('trc_stp')
+      !
+      IF( kt == nittrc000 ) THEN
+                               CALL iom_close( numrtr )     ! close input  passive tracers restart file
+         IF( lk_trdmld_trc  )  CALL trd_mld_trc_init        ! trends: Mixed-layer
+      ENDIF
+      !
+      IF( lk_vvl ) THEN                              ! update ocean volume due to ssh temporal evolution
+         DO jk = 1, jpk
+            cvol(:,:,jk) = e1e2t(:,:) * fse3t(:,:,jk) * tmask(:,:,jk)
+         END DO
+         IF( lk_degrad )  cvol(:,:,:) = cvol(:,:,:) * facvol(:,:,:)      ! degrad option: reduction by facvol
+         areatot         = glob_sum( cvol(:,:,:) )
+      ENDIF
+      !    
+     IF( nn_dttrc /= 1 )   CALL trc_sub_stp( kt )  ! averaging physical variables for sub-stepping
 
-      IF( MOD( kt - 1 , nn_dttrc ) == 0 ) THEN      ! only every nn_dttrc time step
+     IF( MOD( kt , nn_dttrc ) == 0 ) THEN      ! only every nn_dttrc time step
          !
          IF(ln_ctl) THEN
@@ -58 +80 @@
          tra(:,:,:,:) = 0.e0
          !
-         IF( kt == nit000 .AND. lk_trdmld_trc  )  &
-            &                      CALL trd_mld_trc_init        ! trends: Mixed-layer
-                                   CALL trc_rst_opn( kt )       ! Open tracer restart file 
-         IF( lk_iomput ) THEN  ;   CALL trc_wri( kt )           ! output of passive tracers
-         ELSE                  ;   CALL trc_dia( kt )
+                                   CALL trc_rst_opn  ( kt )       ! Open tracer restart file 
+         IF( lk_iomput ) THEN  ;   CALL trc_wri      ( kt )       ! output of passive tracers with iom I/O manager
+         ELSE                  ;   CALL trc_dia      ( kt )       ! output of passive tracers with old I/O manager
          ENDIF
-                                   CALL trc_sms( kt )           ! tracers: sink and source
-                                   CALL trc_trp( kt )           ! transport of passive tracers
-         IF( kt == nit000 )     CALL iom_close( numrtr )     ! close input  passive tracers restart file
-         IF( lrst_trc )            CALL trc_rst_wri( kt )       ! write tracer restart file
-         IF( lk_trdmld_trc  )      CALL trd_mld_trc( kt )       ! trends: Mixed-layer
+                                   CALL trc_sms      ( kt )       ! tracers: sinks and sources
+                                   CALL trc_trp      ( kt )       ! transport of passive tracers
+         IF( lrst_trc )            CALL trc_rst_wri  ( kt )       ! write tracer restart file
+         IF( lk_trdmld_trc  )      CALL trd_mld_trc  ( kt )       ! trends: Mixed-layer
+         !
+         IF( nn_dttrc /= 1   )     CALL trc_sub_reset( kt )       ! resetting physical variables when sub-stepping
          !
       ENDIF
-
+      !
+      ztrai = 0._wp                                                   !  content of all tracers
+      DO jn = 1, jptra
+         ztrai = ztrai + glob_sum( trn(:,:,:,jn) * cvol(:,:,:)   )
+      END DO
+      IF( lwp ) WRITE(numstr,9300) kt,  ztrai / areatot
+9300  FORMAT(i10,e18.10)
+      !
+      IF( nn_timing == 1 )   CALL timing_stop('trc_stp')
+      !
    END SUBROUTINE trc_stp