Changeset 2030 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcsbc.F90

Timestamp:

2010-07-29T14:19:46+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/TRP/trcsbc.F90 (modified) (6 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/TRP/trcsbc.F90

@@ -4 +4 @@
    !! Ocean passive tracers:  surface boundary condition
    !!======================================================================
-   !! History :  8.2  !  98-10  (G. Madec, G. Roullet, M. Imbard)  Original code
-   !!            8.2  !  01-02  (D. Ludicone)  sea ice and free surface
-   !!            8.5  !  02-06  (G. Madec)  F90: Free form and module
-   !!            9.0  !  04-03  (C. Ethe)  adapted for passive tracers
-   !!                 !  06-08  (C. Deltel) Diagnose ML trends for passive tracers
+   !! History :  8.2  !  1998-10  (G. Madec, G. Roullet, M. Imbard)  Original code
+   !!            8.2  !  2001-02  (D. Ludicone)  sea ice and free surface
+   !!            8.5  !  2002-06  (G. Madec)  F90: Free form and module
+   !!            9.0  !  2004-03  (C. Ethe)  adapted for passive tracers
+   !!                 !  2006-08  (C. Deltel) Diagnose ML trends for passive tracers
    !!==============================================================================
 #if defined key_top
@@ -18 +18 @@
    !! * Modules used
    USE oce_trc             ! ocean dynamics and active tracers variables
-   USE trp_trc                 ! ocean  passive tracers variables
+   USE trc                 ! ocean  passive tracers variables
    USE prtctl_trc          ! Print control for debbuging
-   USE trdmld_trc
-   USE trdmld_trc_oce
+   USE trdmod_oce
+   USE trdtra
 
    IMPLICIT NONE
@@ -80 +80 @@
       ! 0. initialization
       zsrau = 1. / rau0
-      IF( .NOT. ln_sco )  zse3t = 1. / fse3t(1,1,1)
+#if defined key_zco
+      zse3t = 1. / e3t_0(1)
+#endif
 
       DO jn = 1, jptra
@@ -88 +90 @@
          DO jj = 2, jpj
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               IF( ln_sco ) zse3t = 1. / fse3t(ji,jj,1)
-               ! concent./dilut. effect
-               ztra = emps(ji,jj) * zsrau * trn(ji,jj,1,jn) * zse3t * tmask(ji,jj,1)
-               ! add the trend to the general tracer trend
+#if ! defined key_zco
+               zse3t = 1. / fse3t(ji,jj,1)
+#endif
+               IF( lk_vvl ) THEN   ;   ztra = 0.e0                         ! No concent./dilut. effect
+               ELSE                ;   ztra = emps(ji,jj) * zsrau * trn(ji,jj,1,jn) * zse3t * tmask(ji,jj,1) 
+               ENDIF
                tra(ji,jj,1,jn) = tra(ji,jj,1,jn) + ztra
-#if defined key_trc_diatrd
-               IF( luttrd(jn) ) &
-               &    trtrd(ji,jj,1,ikeep(jn),jpdiatrc) = trtrd(ji,jj,1,ikeep(jn),jpdiatrc) + ztra
-#endif
-
             END DO
          END DO
@@ -103 +102 @@
          IF( l_trdtrc ) THEN
             ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:)
-            IF (luttrd(jn)) CALL trd_mod_trc(ztrtrd, jn, jptrc_trd_sbc, kt)
+            CALL trd_tra( kt, 'TRC', jn, jptra_trd_nsr, ztrtrd )
          END IF
-
          !                                                       ! ===========
       END DO                                                     ! tracer loop
@@ -111 +109 @@
 
       IF( l_trdtrc ) DEALLOCATE( ztrtrd )
-
-
-      IF(ln_ctl)   THEN  ! print mean trends (used for debugging)
-         WRITE(charout, FMT="('sbc')")
-         CALL prt_ctl_trc_info(charout)
-         CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm,clinfo2='trd')
+      IF( ln_ctl )   THEN
+         WRITE(charout, FMT="('sbc ')") ;  CALL prt_ctl_trc_info(charout)
+                                           CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
       ENDIF