Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcwri.F90

Timestamp:

2010-08-02T12:57:40+02:00 (14 years ago)

Author:

cetlod

Message:

Apply the merge to passive tracers, see ticket:693

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcwri.F90 (modified) (6 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trcwri.F90

@@ -5 +5 @@
    !!====================================================================================
    !! History :   1.0  !  2009-05 (C. Ethe)  Original code
-   !!                  !  2010-03 (C. Ethe, R. Seferian ) Add the tracer transport trends
    !!----------------------------------------------------------------------
 #if defined key_top &&  defined key_iomput
@@ -12 +11 @@
    !!----------------------------------------------------------------------
    !! trc_wri_trc   :  outputs of concentration fields
-   !! trc_wri_trd   :  outputs of transport trends
    !!----------------------------------------------------------------------
    USE dom_oce         ! ocean space and time domain variables
    USE oce_trc
-   USE trp_trc
    USE trc
-   USE trdmld_trc_oce, ONLY : luttrd
    USE iom
-#if defined key_off_tra
+#if defined key_offline
    USE oce_trc
    USE dianam
@@ -50 +46 @@
 
       !
-      CALL iom_setkt  ( kt + ndttrc - 1 )       ! set the passive tracer time step
+      CALL iom_setkt  ( kt + nn_dttrc - 1 )       ! set the passive tracer time step
       CALL trc_wri_trc( kt              )       ! outputs for tracer concentration
-      CALL trc_wri_trd( kt              )       ! outputs for dynamical trends
       CALL iom_setkt  ( kt              )       ! set the model time step
       !
@@ -65 +60 @@
       INTEGER, INTENT( in ) :: kt       ! ocean time-step
       INTEGER               :: jn
-      CHARACTER (len=20)    :: cltra, cltras
-#if defined key_off_tra
+      CHARACTER (len=20)    :: cltra
+#if defined key_offline
       CHARACTER (len=40) :: clhstnam
       INTEGER ::   inum = 11            ! temporary logical unit
@@ -72 +67 @@
       !!---------------------------------------------------------------------
  
-#if defined key_off_tra
+#if defined key_offline
       IF( kt == nittrc000 ) THEN
         ! WRITE root name in date.file for use by postpro
          IF(lwp) THEN
-            CALL dia_nam( clhstnam, nwritetrc,' ' )
+            CALL dia_nam( clhstnam, nn_writetrc,' ' )
             CALL ctl_opn( inum, 'date.file', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
             WRITE(inum,*) clhstnam
@@ -92 +87 @@
    END SUBROUTINE trc_wri_trc
 
-# if defined key_trc_diatrd
-
-   SUBROUTINE trc_wri_trd( kt )
-      !!----------------------------------------------------------------------
-      !!                     ***  ROUTINE trc_wri_trd  ***
-      !!
-      !! ** Purpose :   output of passive tracer : advection-diffusion trends
-      !!
-      !!----------------------------------------------------------------------
-      INTEGER, INTENT( in ) ::   kt          ! ocean time-step
-      !!
-      CHARACTER (len=3) ::   cltra
-      INTEGER  ::   jn, jl, ikn
-      !!----------------------------------------------------------------------
-
-      DO jn = 1, jptra
-         IF( luttrd(jn) ) THEN
-            ikn = ikeep(jn)
-            DO jl = 1, jpdiatrc
-               IF( jl == jptrc_xad ) WRITE (cltra,"(3a)") 'XAD' ! x advection for tracer
-               IF( jl == jptrc_yad ) WRITE (cltra,"(3a)") 'YAD'  ! y advection for tracer
-               IF( jl == jptrc_zad ) WRITE (cltra,"(3a)") 'ZAD'  ! z advection for tracer
-               IF( jl == jptrc_xdf ) WRITE (cltra,"(3a)") 'XDF'  ! x diffusion for tracer
-               IF( jl == jptrc_ydf ) WRITE (cltra,"(3a)") 'YDF'  ! y diffusion for tracer
-               IF( jl == jptrc_zdf ) WRITE (cltra,"(3a)") 'ZDF'  ! z diffusion for tracer
-# if defined key_trcldf_eiv
-               IF( jl == jptrc_xei ) WRITE (cltra,"(3a)") 'XGV'  ! x gent velocity for tracer
-               IF( jl == jptrc_yei ) WRITE (cltra,"(3a)") 'YGV'  ! y gent velocity for tracer
-               IF( jl == jptrc_zei ) WRITE (cltra,"(3a)") 'ZGV'  ! z gent velocity for tracer
-# endif
-# if defined key_trcdmp
-               IF( jl == jptrc_dmp ) WRITE (cltra,"(3a)") 'DMP'  ! damping
-# endif
-               IF( jl == jptrc_sbc ) WRITE (cltra,"(3a)") 'SBC'  ! surface boundary conditions
-               ! write the trends
-               CALL iom_put( cltra, trtrd(:,:,:,ikn,jl) )
-            END DO
-         END IF
-      END DO
-      !
-   END SUBROUTINE trc_wri_trd
-
-# else
-   SUBROUTINE trc_wri_trd( kt )                      ! Dummy routine
-      INTEGER, INTENT ( in ) ::   kt
-   END SUBROUTINE trc_wri_trd
-#endif
 #else
    !!----------------------------------------------------------------------