Changeset 455 for trunk/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

Timestamp:

2006-05-10T18:53:54+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_048:RB: reorganization of dynamics part, in addition change atsk to jki, suppress dynhpg_atsk.F90 dynzdf_imp_atsk.F90 dynzdf_iso.F90

File:

• trunk/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 (modified) (12 diffs)

trunk/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

@@ -17 +17 @@
    USE trdmod_oce      ! ocean variables trends
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE prtctl          ! Print control
 
    IMPLICIT NONE
@@ -61 +60 @@
       !!              diffu = 1/e1u di[ zut ] - 1/(e2u*e3u) dj-1[ e3f zuf ]
       !!              diffv = 1/e2v dj[ zut ] + 1/(e1v*e3v) di-1[ e3f zuf ]
-      !!      If lk_sco=F and lk_zps=F, the vertical scale factors in the
+      !!      If ln_sco=F and ln_zps=F, the vertical scale factors in the
       !!      rotational part of the diffusion are simplified
       !!      Add this before trend to the general trend (ua,va):
@@ -70 +69 @@
       !! ** Action : - Update (ua,va) with the before iso-level biharmonic
       !!               mixing trend.
-      !!             - Save in (ztdua,ztdva) the trends ('key_trddyn')
       !!
       !! History :
@@ -81 +79 @@
       !!   9.0  !  04-08  (C. Talandier) New trends organization
       !!----------------------------------------------------------------------
-      !! * Modules used     
-      USE oce, ONLY :    ztdua => ta,      & ! use ta as 3D workspace   
-                         ztdva => sa         ! use sa as 3D workspace   
-
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt           ! ocean time-step index
@@ -107 +101 @@
       zlv(:,:) = 0.e0
 
-      ! Save ua and va trends
-      IF( l_trddyn )   THEN
-         ztdua(:,:,:) = ua(:,:,:) 
-         ztdva(:,:,:) = va(:,:,:) 
-      ENDIF
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -118 +107 @@
          ! ---------
 
-         IF( lk_sco .OR. lk_zps ) THEN   ! s-coordinate or z-coordinate with partial steps
+         IF( ln_sco .OR. ln_zps ) THEN   ! s-coordinate or z-coordinate with partial steps
             zuf(:,:) = rotb(:,:,jk) * fse3f(:,:,jk)
             DO jj = 2, jpjm1
@@ -129 +118 @@
                END DO
             END DO
-         ELSE                            ! z-coordinate
+         ELSE                            ! z-coordinate - full step
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -162 +151 @@
                zuf(ji,jj) = fmask(ji,jj,jk) * (  zcv(ji+1,jj  ) - zcv(ji,jj)      &
                   &                            - zcu(ji  ,jj+1) + zcu(ji,jj)  )   &
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+                  &                         / ( e1f(ji,jj)*e2f(ji,jj) )
+#else
                   &       * fse3f(ji,jj,jk) / ( e1f(ji,jj)*e2f(ji,jj) )
-#else
-                  &                         / ( e1f(ji,jj)*e2f(ji,jj) )
 #endif
             END DO  
@@ -173 +162 @@
          DO jj = 1, jpjm1
             DO ji = 1, fs_jpim1   ! vector opt.
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+               zlu(ji,jj) = e2u(ji,jj) * zlu(ji,jj)
+               zlv(ji,jj) = e1v(ji,jj) * zlv(ji,jj)
+#else
                zlu(ji,jj) = e2u(ji,jj) * fse3u(ji,jj,jk) * zlu(ji,jj)
                zlv(ji,jj) = e1v(ji,jj) * fse3v(ji,jj,jk) * zlv(ji,jj)
-#else
-               zlu(ji,jj) = e2u(ji,jj) * zlu(ji,jj)
-               zlv(ji,jj) = e1v(ji,jj) * zlv(ji,jj)
 #endif
             END DO
@@ -186 +175 @@
          DO jj = 2, jpj
             DO ji = fs_2, jpi   ! vector opt.
-#if defined key_s_coord || defined key_partial_steps
+#if defined key_zco
+               zbt = e1t(ji,jj) * e2t(ji,jj)
+#else
                zbt = e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk)
-#else
-               zbt = e1t(ji,jj) * e2t(ji,jj)
 #endif
                zut(ji,jj) = (  zlu(ji,jj) - zlu(ji-1,jj  )   &
@@ -207 +196 @@
          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
+               ze2u = e2u(ji,jj)
+               ze2v = e1v(ji,jj)
+#else
                ze2u = e2u(ji,jj) * fse3u(ji,jj,jk)
                ze2v = e1v(ji,jj) * fse3v(ji,jj,jk)
-#else
-               ze2u = e2u(ji,jj)
-               ze2v = e1v(ji,jj)
 #endif
                ! horizontal biharmonic diffusive trends
@@ -229 +218 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      ! save the lateral diffusion trends for diagnostic
-      ! momentum trends
-      IF( l_trddyn )   THEN
-         ztdua(:,:,:) = ua(:,:,:) - ztdua(:,:,:)
-         ztdva(:,:,:) = va(:,:,:) - ztdva(:,:,:)
-
-         CALL trd_mod(ztdua, ztdva, jpdtdldf, 'DYN', kt)
-      ENDIF
-
-      IF(ln_ctl) THEN         ! print sum trends (used for debugging)
-         CALL prt_ctl(tab3d_1=ua, clinfo1=' ldf  - Ua: ', mask1=umask, &
-            &         tab3d_2=va, clinfo2=' Va: ', mask2=vmask, clinfo3='dyn')
-      ENDIF
 
    END SUBROUTINE dyn_ldf_bilap