Changeset 457 for trunk/NEMO/OPA_SRC/TRA/traadv_muscl.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_muscl.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/TRA/traadv_muscl.F90

@@ -39 +39 @@
 CONTAINS
 
-   SUBROUTINE tra_adv_muscl( kt )
+   SUBROUTINE tra_adv_muscl( kt, pun, pvn, pwn )
       !!----------------------------------------------------------------------
       !!                    ***  ROUTINE tra_adv_muscl  ***
@@ -61 +61 @@
       !!   8.5  !  02-06  (G. Madec)  F90: Free form and module
       !!   9.0  !  04-08  (C. Talandier) New trends organization
-      !!    "   !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
-      !! * modules used
-#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
@@ -110 +100 @@
          l_adv = 'mus'
       ENDIF
-
-#if defined key_trabbl_adv
-      ! Advective bottom boundary layer
-      ! -------------------------------
-      zun(:,:,:) = un (:,:,:) - u_bbl(:,:,:)
-      zvn(:,:,:) = vn (:,:,:) - v_bbl(:,:,:)
-      zwn(:,:,:) = wn (:,:,:) + w_bbl( :,:,:)
-#endif
 
 
@@ -194 +176 @@
             DO ji = fs_2, fs_jpim1   ! vector opt.
                ! volume fluxes
-#if defined key_s_coord || defined key_partial_steps
-               zeu = e2u(ji,jj) * fse3u(ji,jj,jk) * zun(ji,jj,jk)
-               zev = e1v(ji,jj) * fse3v(ji,jj,jk) * zvn(ji,jj,jk)
+#if defined key_zco
+               zeu = e2u(ji,jj)                   * pun(ji,jj,jk)
+               zev = e1v(ji,jj)                   * pvn(ji,jj,jk)
 #else
-               zeu = e2u(ji,jj) * zun(ji,jj,jk)
-               zev = e1v(ji,jj) * zvn(ji,jj,jk)
+               zeu = e2u(ji,jj) * fse3u(ji,jj,jk) * pun(ji,jj,jk)
+               zev = e1v(ji,jj) * fse3v(ji,jj,jk) * pvn(ji,jj,jk)
 #endif
                ! MUSCL fluxes
-               z0u = SIGN( 0.5, zun(ji,jj,jk) )            
+               z0u = SIGN( 0.5, pun(ji,jj,jk) )            
                zalpha = 0.5 - z0u
-               zu  = z0u - 0.5 * zun(ji,jj,jk) * zstep / e1u(ji,jj)
+               zu  = z0u - 0.5 * pun(ji,jj,jk) * zstep / e1u(ji,jj)
                zzt1 = tb(ji+1,jj,jk) + zu*ztp1(ji+1,jj,jk)
                zzt2 = tb(ji  ,jj,jk) + zu*ztp1(ji  ,jj,jk)
@@ -212 +194 @@
                zs1(ji,jj,jk) = zeu * ( zalpha * zzs1 + (1.-zalpha) * zzs2 )
 
-               z0v = SIGN( 0.5, zvn(ji,jj,jk) )            
+               z0v = SIGN( 0.5, pvn(ji,jj,jk) )            
                zalpha = 0.5 - z0v
-               zv  = z0v - 0.5 * zvn(ji,jj,jk) * zstep / e2v(ji,jj)
+               zv  = z0v - 0.5 * pvn(ji,jj,jk) * zstep / e2v(ji,jj)
                zzt1 = tb(ji,jj+1,jk) + zv*ztp2(ji,jj+1,jk)
                zzt2 = tb(ji,jj  ,jk) + zv*ztp2(ji,jj  ,jk)
@@ -245 +227 @@
          DO jj = 2, jpjm1      
             DO ji = fs_2, fs_jpim1   ! vector opt.
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+               zbtr = 1. / ( e1t(ji,jj)*e2t(ji,jj) )
+#else
                zbtr = 1. / ( e1t(ji,jj)*e2t(ji,jj)*fse3t(ji,jj,jk) )
-#else
-               zbtr = 1. / ( e1t(ji,jj)*e2t(ji,jj) )
 #endif
                ! horizontal advective trends
@@ -287 +269 @@
       ! "zonal" mean advective heat and salt transport
       IF( ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN
-# if defined key_s_coord || defined key_partial_steps
+         IF( lk_zco ) THEN
+            DO jk = 1, jpkm1
+               DO jj = 2, jpjm1
+                  DO ji = fs_2, fs_jpim1   ! vector opt.
+                    zt2(ji,jj,jk) = zt2(ji,jj,jk) * fse3v(ji,jj,jk)
+                    zs2(ji,jj,jk) = zs2(ji,jj,jk) * fse3v(ji,jj,jk)
+                  END DO
+               END DO
+            END DO
+         ENDIF
          pht_adv(:) = ptr_vj( zt2(:,:,:) )
          pst_adv(:) = ptr_vj( zs2(:,:,:) )
-# else
-         DO jk = 1, jpkm1
-            DO jj = 2, jpjm1
-               DO ji = fs_2, fs_jpim1   ! vector opt.
-                 zt2(ji,jj,jk) = zt2(ji,jj,jk) * fse3v(ji,jj,jk)
-                 zs2(ji,jj,jk) = zs2(ji,jj,jk) * fse3v(ji,jj,jk)
-               END DO
-            END DO
-         END DO
-         pht_adv(:) = ptr_vj( zt2(:,:,:) )
-         pst_adv(:) = ptr_vj( zs2(:,:,:) )
-# endif
       ENDIF
 
@@ -355 +334 @@
          DO jj = 2, jpjm1      
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               zew = zwn(ji,jj,jk+1)
-               z0w = SIGN( 0.5, zwn(ji,jj,jk+1) )
+               zew = pwn(ji,jj,jk+1)
+               z0w = SIGN( 0.5, pwn(ji,jj,jk+1) )
                zalpha = 0.5 + z0w
-               zw  = z0w - 0.5 * zwn(ji,jj,jk+1)*zstep / fse3w(ji,jj,jk+1)
+               zw  = z0w - 0.5 * pwn(ji,jj,jk+1)*zstep / fse3w(ji,jj,jk+1)
                zzt1 = tb(ji,jj,jk+1) + zw*ztp1(ji,jj,jk+1)
                zzt2 = tb(ji,jj,jk  ) + zw*ztp1(ji,jj,jk  )
@@ -373 +352 @@
          zs1(:,:, 1 ) = 0.e0
       ELSE                                              ! free surface
-         zt1(:,:, 1 ) = zwn(:,:,1) * tb(:,:,1)
-         zs1(:,:, 1 ) = zwn(:,:,1) * sb(:,:,1)
+         zt1(:,:, 1 ) = pwn(:,:,1) * tb(:,:,1)
+         zs1(:,:, 1 ) = pwn(:,:,1) * sb(:,:,1)
       ENDIF