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

trunk/NEMO/OPA_SRC/TRA/traldf_bilap.F90

@@ -50 +50 @@
       !!      evaluated using before fields (forward time scheme). The hor.
       !!      diffusive trends of temperature (idem for salinity) is given by:
-      !!       * s-coordinate ('key_s_coord' defined), the vertical scale 
-      !!      factors e3. are inside the derivatives:
       !!      Laplacian of tb:
       !!         zlt   = 1/(e1t*e2t*e3t) {  di-1[ e2u*e3u/e1u di(tb) ]
@@ -61 +59 @@
       !!         difft = 1/(e1t*e2t*e3t) {  di-1[ e2u*e3u/e1u di(zlt) ]
       !!                                  + dj-1[ e1v*e3v/e2v dj(zlt) ]  }
-      !!       * z-coordinate (default key), e3t=e3u=e3v, the trend becomes:
-      !!      Laplacian of tb:
-      !!         zlt   = 1/(e1t*e2t) {  di-1[ e2u/e1u di(tb) ]
-      !!                              + dj-1[ e1v/e2v dj(tb) ] }
-      !!      Multiply by the eddy diffusivity coef. and insure lateral bc:
-      !!        zlt   = ahtt * zlt
-      !!        call to lbc_lnk
-      !!      Bilaplacian (laplacian of zlt):
-      !!         difft = 1/(e1t*e2t) {  di-1[ e2u/e1u di(zlt) ]
-      !!                              + dj-1[ e1v/e2v dj(zlt) ]  }
+      !!      Note: if key_zco defined, e3t=e3u=e3v, they are simplified.
       !!
       !!      Add this trend to the general trend (ta,sa):
@@ -77 +66 @@
       !! ** Action : - Update (ta,sa) arrays with the before iso-level
       !!               biharmonic mixing trend.
-      !!             - Save the trends in (ztdta,ztdsa) ('key_trdtra')
       !!
       !! History :
@@ -88 +76 @@
       !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
       !!   9.0  !  04-08  (C. Talandier) New trends organization
+      !!        !  05-11  (G. Madec)  zps or sco as default option
       !!----------------------------------------------------------------------
       !! * Modules used
@@ -98 +87 @@
       !! * Local declarations
       INTEGER ::   ji, jj, jk             ! dummy loop indices
-#if defined key_partial_steps
       INTEGER ::   iku, ikv               ! temporary integers
-#endif
       REAL(wp) ::   zta, zsa              ! temporary scalars
       REAL(wp), DIMENSION(jpi,jpj) ::   & 
-         zeeu, zeev, zbtr,              & ! workspace
+         zeeu, zeev, zbtr,              & ! 2D workspace
          zlt, zls
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   & 
-         zsu, zsv,                          & ! workspace arrays
-         ztdta, ztdsa
+         zsu, zsv                         ! 3D workspace 
       !!----------------------------------------------------------------------
 
@@ -116 +102 @@
       ENDIF
 
-      ! Save ta and sa trends
-      IF( l_trdtra )   THEN
-         ztdta(:,:,:) = ta(:,:,:) 
-         ztdsa(:,:,:) = sa(:,:,:) 
-      ENDIF
 
       !                                                ! ===============
@@ -129 +110 @@
          ! ----------------------------------
 
-         DO jj = 1, jpjm1
-            DO ji = 1, fs_jpim1   ! vector opt.
-#if defined key_s_coord || defined key_partial_steps
-               ! s-coordinates, vertical scale factor are used
-               zbtr(ji,jj) = 1. / ( e1t(ji,jj)*e2t(ji,jj)*fse3t(ji,jj,jk) )
-               zeeu(ji,jj) = e2u(ji,jj) * fse3u(ji,jj,jk) / e1u(ji,jj) * umask(ji,jj,jk)
-               zeev(ji,jj) = e1v(ji,jj) * fse3v(ji,jj,jk) / e2v(ji,jj) * vmask(ji,jj,jk)
-#else
-               ! z-coordinates, no vertical scale factors
-               zbtr(ji,jj) = 1. / ( e1t(ji,jj)*e2t(ji,jj) )
-               zeeu(ji,jj) = e2u(ji,jj) / e1u(ji,jj) * umask(ji,jj,jk)
-               zeev(ji,jj) = e1v(ji,jj) / e2v(ji,jj) * vmask(ji,jj,jk)
-#endif
-            END DO
-         END DO
+         IF( lk_zco ) THEN      ! z-coordinate (1D arrays): no vertical scale factors
+            DO jj = 1, jpjm1
+               DO ji = 1, fs_jpim1   ! vector opt.
+                  zbtr(ji,jj) = 1. / ( e1t(ji,jj)*e2t(ji,jj) )
+                  zeeu(ji,jj) = e2u(ji,jj) / e1u(ji,jj) * umask(ji,jj,jk)
+                  zeev(ji,jj) = e1v(ji,jj) / e2v(ji,jj) * vmask(ji,jj,jk)
+               END DO
+            END DO
+         ELSE                   ! All coordinates (3D arrays): vertical scale factor are used
+            DO jj = 1, jpjm1
+               DO ji = 1, fs_jpim1   ! vector opt.
+                  zbtr(ji,jj) = 1. / ( e1t(ji,jj)*e2t(ji,jj)*fse3t(ji,jj,jk) )
+                  zeeu(ji,jj) = e2u(ji,jj) * fse3u(ji,jj,jk) / e1u(ji,jj) * umask(ji,jj,jk)
+                  zeev(ji,jj) = e1v(ji,jj) * fse3v(ji,jj,jk) / e2v(ji,jj) * vmask(ji,jj,jk)
+               END DO
+            END DO
+         ENDIF
 
 
@@ -158 +141 @@
             END DO
          END DO
-#if defined key_partial_steps
-         DO jj = 1, jpj-1
-            DO ji = 1, jpi-1
-               ! last level
-               iku = MIN ( mbathy(ji,jj), mbathy(ji+1,jj  ) ) - 1
-               ikv = MIN ( mbathy(ji,jj), mbathy(ji  ,jj+1) ) - 1
-               IF( iku == jk ) THEN
-                  ztu(ji,jj,jk) = zeeu(ji,jj) * gtu(ji,jj)
-                  zsu(ji,jj,jk) = zeeu(ji,jj) * gsu(ji,jj)
-               ENDIF
-               IF( ikv == jk ) THEN
-                  ztv(ji,jj,jk) = zeev(ji,jj) * gtv(ji,jj)
-                  zsv(ji,jj,jk) = zeev(ji,jj) * gsv(ji,jj)
-               ENDIF
-            END DO
-         END DO
-#endif
+         IF( ln_zps ) THEN      ! set gradient at partial step level
+            DO jj = 1, jpjm1
+               DO ji = 1, jpim1
+                  ! last level
+                  iku = MIN ( mbathy(ji,jj), mbathy(ji+1,jj  ) ) - 1
+                  ikv = MIN ( mbathy(ji,jj), mbathy(ji  ,jj+1) ) - 1
+                  IF( iku == jk ) THEN
+                     ztu(ji,jj,jk) = zeeu(ji,jj) * gtu(ji,jj)
+                     zsu(ji,jj,jk) = zeeu(ji,jj) * gsu(ji,jj)
+                  ENDIF
+                  IF( ikv == jk ) THEN
+                     ztv(ji,jj,jk) = zeev(ji,jj) * gtv(ji,jj)
+                     zsv(ji,jj,jk) = zeev(ji,jj) * gsv(ji,jj)
+                  ENDIF
+               END DO
+            END DO
+         ENDIF
 
          ! Second derivative (divergence)
@@ -223 +206 @@
       !                                                ! ===============
 
-      ! save the trends for diagnostic
-      ! save the horizontal diffusive trends
-      IF( l_trdtra )   THEN
-         ztdta(:,:,:) = ta(:,:,:) - ztdta(:,:,:)
-         ztdsa(:,:,:) = sa(:,:,:) - ztdsa(:,:,:)
-
-         CALL trd_mod(ztdta, ztdsa, jpttdldf, 'TRA', kt)
-      ENDIF
-
-      IF(ln_ctl) THEN         ! print mean trends (used for debugging)
-         CALL prt_ctl(tab3d_1=ta, clinfo1=' ldf  - Ta: ', mask1=tmask, &
-            &         tab3d_2=sa, clinfo2=' Sa: ', mask2=tmask, clinfo3='tra')
-      ENDIF
-
       ! "zonal" mean lateral diffusive 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      ! z-coordinate (1D arrays): multiply by the vertical scale factor
+            DO jk = 1, jpkm1
+               DO jj = 2, jpjm1
+                  DO ji = fs_2, fs_jpim1   ! vector opt.
+                     ztv(ji,jj,jk) = ztv(ji,jj,jk) * fse3v(ji,jj,jk)
+                     zsv(ji,jj,jk) = zsv(ji,jj,jk) * fse3v(ji,jj,jk)
+                  END DO
+               END DO
+            END DO
+         ENDIF
          pht_ldf(:) = ptr_vj( ztv(:,:,:) )
          pst_ldf(:) = ptr_vj( zsv(:,:,:) )
-# else
-         DO jk = 1, jpkm1
-            DO jj = 2, jpjm1
-               DO ji = fs_2, fs_jpim1   ! vector opt.
-                  ztv(ji,jj,jk) = ztv(ji,jj,jk) * fse3v(ji,jj,jk)
-                  zsv(ji,jj,jk) = zsv(ji,jj,jk) * fse3v(ji,jj,jk)
-               END DO
-            END DO
-         END DO
-         pht_ldf(:) = ptr_vj( ztv(:,:,:) )
-         pst_ldf(:) = ptr_vj( zsv(:,:,:) )
-# endif
       ENDIF