Changeset 202 for trunk/NEMO/TOP_SRC/TRP/trcadv_tvd.F90

Timestamp:

2004-12-22T16:55:48+01:00 (19 years ago)

Author:

opalod

Message:

CT : UPDATE142 : Check the consistency between passive tracers transport modules (in TRP directory) and those used for the active tracers

File:

• trunk/NEMO/TOP_SRC/TRP/trcadv_tvd.F90 (modified) (4 diffs)

trunk/NEMO/TOP_SRC/TRP/trcadv_tvd.F90

@@ -12 +12 @@
    !!----------------------------------------------------------------------
    !! * Modules used
-   USE oce_trc             ! ocean dynamics and active tracers
-   USE trc
-   USE trcbbl             !  Advective term of BBL
-   USE lbclnk
+   USE oce_trc             ! ocean dynamics and active tracers variables
+   USE trc                 ! ocean passive tracers variables
+   USE lbclnk              ! ocean lateral boundary conditions (or mpp link)
 
    IMPLICIT NONE
@@ -92 +91 @@
 
 #if defined key_trcbbl_adv
-         
       ! Advective Bottom boundary layer: add the velocity
       ! -------------------------------------------------
@@ -131 +129 @@
          ! upstream tracer flux in the k direction
          ! Surface value
-#if defined key_dynspg_fsc
-         ! free surface-constant volume
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               zew = e1t(ji,jj) * e2t(ji,jj) * zwn(ji,jj,1)
-               ztw(ji,jj,1) = zew * trb(ji,jj,1,jn)
-            END DO
-         END DO
-#else                                  
-         ! rigid lid : flux set to zero
-         ztw(:,:,1) = 0.e0
-#endif
+         IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN   ! free surface-constant volume
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zew = e1t(ji,jj) * e2t(ji,jj) * zwn(ji,jj,1)
+                  ztw(ji,jj,1) = zew * trb(ji,jj,1,jn)
+               END DO
+            END DO
+         ELSE                                              ! rigid lid : flux set to zero
+            ztw(:,:,1) = 0.e0
+         ENDIF
 
          ! Interior value
@@ -235 +231 @@
          END DO
 
-         IF( l_ctl .AND. lwp ) THEN         ! print mean trends (used for debugging)
-            ztra = SUM( tra(2:jpim1,2:jpjm1,1:jpkm1,jn) * tmask(2:jpim1,2:jpjm1,1:jpkm1) )
+         IF(l_ctl) THEN         ! print mean trends (used for debugging)
+            ztra = SUM( tra(2:nictl,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )
             WRITE(numout,*) ' trc/zad  - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' tvd' 
             tra_ctl(jn) = ztra