Changeset 457 for trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90

Timestamp:

2006-05-10T19:01:19+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_049:RB: reorganization of tracers part, remove traadv_cen2_atsk.h90 traldf_iso_zps.F90 trazdf_iso.F90 trazdf_iso_vopt.F90, change atsk routines to jki

File:

• trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (10 diffs)

trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -42 +42 @@
 CONTAINS
 
-   SUBROUTINE tra_adv_tvd( kt )
+   SUBROUTINE tra_adv_tvd( kt, pun, pvn, pwn )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_adv_tvd  ***
@@ -64 +64 @@
       !!   8.5  !  02-06  (G. Madec)  F90: Free form and module
       !!   9.0  !  04-01  (A. de Miranda, G. Madec, J.M. Molines ): advective bbl
-      !!    "   !  08-04  (S. Cravatte) add the i-, j- & k- trends computation
+      !!   9.0  !  08-04  (S. Cravatte) add the i-, j- & k- trends computation
       !!    "   !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
@@ -72 +72 @@
          &                     ztaz => tladi,  &  ! use ua as workspace
          &                     zsaz => sladi      ! use ua as workspace
-#if defined key_trabbl_adv
-      USE oce                , zun => ua,  &  ! use ua as workspace
-         &                     zvn => va      ! use va as workspace
-
-      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zwn
-#else
-      USE oce                , zun => un,  &  ! When no bbl, zun == un
-                               zvn => vn,  &  !             zvn == vn
-                               zwn => wn      !             zwn == wn
-#endif
 
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kt         ! ocean time-step
+      INTEGER , INTENT( in ) ::   kt          ! ocean time-step index
+      REAL(wp), INTENT( in ), DIMENSION(jpi,jpj,jpk) ::   &
+         pun, pvn, pwn                        ! now ocean velocity fields
 
       !! * Local declarations
@@ -122 +114 @@
       ENDIF
 
-#if defined key_trabbl_adv
-      ! Advective Bottom boundary layer: add the velocity
-      ! -------------------------------------------------
-      zun(:,:,:) = un (:,:,:) - u_bbl(:,:,:)
-      zvn(:,:,:) = vn (:,:,:) - v_bbl(:,:,:)
-      zwn(:,:,:) = wn (:,:,:) + w_bbl(:,:,:)
-#endif
 
       ! 1. Bottom value : flux set to zero
@@ -144 +129 @@
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
-               zeu = 0.5 * e2u(ji,jj) * fse3u(ji,jj,jk) * zun(ji,jj,jk)
-               zev = 0.5 * e1v(ji,jj) * fse3v(ji,jj,jk) * zvn(ji,jj,jk)
+               zeu = 0.5 * e2u(ji,jj) * fse3u(ji,jj,jk) * pun(ji,jj,jk)
+               zev = 0.5 * e1v(ji,jj) * fse3v(ji,jj,jk) * pvn(ji,jj,jk)
                ! upstream scheme
                zfp_ui = zeu + ABS( zeu )
@@ -161 +146 @@
       ! upstream tracer flux in the k direction
       ! Surface value
-      IF( lk_dynspg_rl ) THEN          ! rigid lid : flux set to zero
+      IF( lk_dynspg_rl ) THEN                           ! rigid lid : flux set to zero
          ztw(:,:,1) = 0.e0
          zsw(:,:,1) = 0.e0
-      ELSE                 ! free surface
+      ELSE                                              ! free surface
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zew = e1t(ji,jj) * e2t(ji,jj) * zwn(ji,jj,1)
+               zew = e1t(ji,jj) * e2t(ji,jj) * pwn(ji,jj,1)
                ztw(ji,jj,1) = zew * tb(ji,jj,1)
                zsw(ji,jj,1) = zew * sb(ji,jj,1)
@@ -178 +163 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zew = 0.5 * e1t(ji,jj) * e2t(ji,jj) * zwn(ji,jj,jk)
+               zew = 0.5 * e1t(ji,jj) * e2t(ji,jj) * pwn(ji,jj,jk)
                zfp_wk = zew + ABS( zew )
                zfm_wk = zew - ABS( zew )
@@ -247 +232 @@
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
-               zeu = 0.5 * e2u(ji,jj) * fse3u(ji,jj,jk) * zun(ji,jj,jk)
-               zev = 0.5 * e1v(ji,jj) * fse3v(ji,jj,jk) * zvn(ji,jj,jk)
+               zeu = 0.5 * e2u(ji,jj) * fse3u(ji,jj,jk) * pun(ji,jj,jk)
+               zev = 0.5 * e1v(ji,jj) * fse3v(ji,jj,jk) * pvn(ji,jj,jk)
                ztu(ji,jj,jk) = zeu * ( tn(ji,jj,jk) + tn(ji+1,jj,jk) ) - ztu(ji,jj,jk)
                zsu(ji,jj,jk) = zeu * ( sn(ji,jj,jk) + sn(ji+1,jj,jk) ) - zsu(ji,jj,jk)
@@ -266 +251 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zew = 0.5 * e1t(ji,jj) * e2t(ji,jj) * zwn(ji,jj,jk)
+               zew = 0.5 * e1t(ji,jj) * e2t(ji,jj) * pwn(ji,jj,jk)
                ztw(ji,jj,jk) = zew * ( tn(ji,jj,jk) + tn(ji,jj,jk-1) ) - ztw(ji,jj,jk)
                zsw(ji,jj,jk) = zew * ( sn(ji,jj,jk) + sn(ji,jj,jk-1) ) - zsw(ji,jj,jk)
@@ -401 +386 @@
       zbig = 1.e+40
       zrtrn = 1.e-15
-      zbetup(:,:,:) = 0.e0   ;   zbetdo(:,:,:) = 0.e0
+      zbetup(:,:,:) = 0.e0   ;   zbetdo(:,:,:) = 0.e0  
 
       ! Search local extrema