Changeset 455 for trunk/NEMO/OPA_SRC/DYN/dynldf_lap.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_lap.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/DYN/dynldf_lap.F90

@@ -18 +18 @@
    USE trdmod_oce      ! ocean variables trends
    USE ldfslp          ! iso-neutral slopes 
-   USE prtctl          ! Print control
 
    IMPLICIT NONE
@@ -51 +50 @@
       !!         difu = 1/e1u di[ahmt hdivb] - 1/(e2u*e3u) dj-1[e3f ahmf rotb]
       !!         difv = 1/e2v dj[ahmt hdivb] + 1/(e1v*e3v) di-1[e3f ahmf rotb]
-      !!      If 'key_s_coord' key is not activated, the vertical scale factor
-      !!      is simplified in the rotational part of the diffusion.
+      !!      If lk_zco=T, e3f=e3u=e3v, the vertical scale factor are simplified
+      !!      in the rotational part of the diffusion.
       !!      Add this before trend to the general trend (ua,va):
       !!            (ua,va) = (ua,va) + (diffu,diffv)
@@ -60 +59 @@
       !! ** Action : - Update (ua,va) with the before iso-level harmonic 
       !!               mixing trend.
-      !!             - Save in (ztdua,ztdva) arrays the trends ('key_trddyn')
       !!
       !! History :
@@ -69 +67 @@
       !!   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
@@ -88 +82 @@
       ENDIF
 
-      ! Save ua and va trends
-      IF( l_trddyn )   THEN
-         ztdua(:,:,:) = ua(:,:,:) 
-         ztdva(:,:,:) = va(:,:,:) 
-      ENDIF
-
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab
@@ -99 +87 @@
          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
+               ! horizontal diffusive trends
+               ze2u = rotb (ji,jj,jk)*fsahmf(ji,jj,jk)
+               ze1v = hdivb(ji,jj,jk)*fsahmt(ji,jj,jk)
+               zua = - ( ze2u - rotb (ji,jj-1,jk)*fsahmf(ji,jj-1,jk)                   ) / e2u(ji,jj)   &
+                     + ( hdivb(ji+1,jj,jk)*fsahmt(ji+1,jj,jk) - ze1v                   ) / e1u(ji,jj)
+
+               zva = + ( ze2u - rotb (ji-1,jj,jk)*fsahmf(ji-1,jj,jk)                   ) / e1v(ji,jj)   &
+                     + ( hdivb(ji,jj+1,jk)*fsahmt(ji,jj+1,jk) - ze1v                   ) / e2v(ji,jj)
+#else
                ze2u = rotb (ji,jj,jk)*fsahmf(ji,jj,jk)*fse3f(ji,jj,jk)
                ze1v = hdivb(ji,jj,jk)*fsahmt(ji,jj,jk)
@@ -108 +105 @@
                zva = + ( ze2u - rotb (ji-1,jj,jk)*fsahmf(ji-1,jj,jk)*fse3f(ji-1,jj,jk) ) / ( e1v(ji,jj) * fse3v(ji,jj,jk) )   &
                      + ( hdivb(ji,jj+1,jk)*fsahmt(ji,jj+1,jk) - ze1v                   ) / e2v(ji,jj)
-#else
-               ! horizontal diffusive trends
-               ze2u = rotb (ji,jj,jk)*fsahmf(ji,jj,jk)
-               ze1v = hdivb(ji,jj,jk)*fsahmt(ji,jj,jk)
-               zua = - (                ze2u                  - rotb (ji,jj-1,jk)*fsahmf(ji,jj-1,jk) ) / e2u(ji,jj)   &
-                     + ( hdivb(ji+1,jj,jk)*fsahmt(ji+1,jj,jk) -                ze1v                  ) / e1u(ji,jj)
-
-               zva = + (                ze2u                  - rotb (ji-1,jj,jk)*fsahmf(ji-1,jj,jk) ) / e1v(ji,jj)   &
-                     + ( hdivb(ji,jj+1,jk)*fsahmt(ji,jj+1,jk) -                ze1v                  ) / e2v(ji,jj)
 #endif
 
@@ -128 +116 @@
       !                                                ! ===============
 
-      ! 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_lap