Changeset 503 for trunk/NEMO/OPA_SRC/DYN/dynzdf_imp_jki.F90

Timestamp:

2006-09-27T10:52:29+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_064 : CT : general trends update including the addition of mean windows analysis possibility in the mixed layer

File:

• trunk/NEMO/OPA_SRC/DYN/dynzdf_imp_jki.F90 (modified) (11 diffs)

trunk/NEMO/OPA_SRC/DYN/dynzdf_imp_jki.F90

@@ -4 +4 @@
    !! Ocean dynamics:  vertical component(s) of the momentum mixing trend
    !!==============================================================================
+   !! History : 8.5  !  02-08  (G. Madec)  auto-tasking option
+   !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
@@ -17 +19 @@
    USE in_out_manager  ! I/O manager
    USE taumod          ! surface ocean stress
-   USE prtctl          ! Print control
 
    IMPLICIT NONE
@@ -30 +31 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! $Header$ 
+   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
 CONTAINS
 
-   SUBROUTINE dyn_zdf_imp_jki( kt )
+   SUBROUTINE dyn_zdf_imp_jki( kt, p2dt )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dyn_zdf_imp_jki  ***
@@ -52 +55 @@
       !! ** Action : - Update (ua,va) arrays with the after vertical diffusive
       !!               mixing trend.
-      !!
-      !! History :
-      !!   8.5  !  02-08  (G. Madec)  auto-tasking option
-      !!   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
+      INTEGER , INTENT( in ) ::   kt                          ! ocean time-step index
+      REAL(wp), INTENT( in ) ::   p2dt                        ! ocean time-step index
 
       !! * Local declarations
-      INTEGER ::   ji, jj, jk            ! dummy loop indices
-      INTEGER ::   ikst, ikenm2, ikstp1  ! temporary integers
-      REAL(wp) ::  zrau0r, z2dt,       & !temporary scalars
-         &         z2dtf, zcoef, zzws
-      REAL(wp), DIMENSION(jpi,jpk) ::  &
-         zwx, zwy, zwz,                & ! workspace
-         zwd, zws, zwi, zwt
+      INTEGER ::   ji, jj, jk                                 ! dummy loop indices
+      INTEGER ::   ikst, ikenm2, ikstp1                       ! temporary integers
+      REAL(wp) ::  zrau0r, z2dtf, zcoef, zzws                 ! temporary scalars
+      REAL(wp), DIMENSION(jpi,jpk) ::  zwx, zwy, zwz,       & ! workspace
+         &                             zwd, zws, zwi, zwt
       !!----------------------------------------------------------------------
 
@@ -84 +78 @@
       ! --------------------------------
       zrau0r = 1. / rau0      ! inverse of the reference density
-      z2dt   = 2. * rdt       ! Leap-frog environnement
-
-      ! Euler time stepping when starting from rest
-      IF( neuler == 0 .AND. kt == nit000 )   z2dt = rdt
 
       !                                                ! ===============
@@ -101 +91 @@
          DO jk = 1, jpkm1
             DO ji = 2, jpim1
-               zcoef = - z2dt / fse3u(ji,jj,jk)
+               zcoef = - p2dt / fse3u(ji,jj,jk)
                zwi(ji,jk) = zcoef * avmu(ji,jj,jk  ) / fse3uw(ji,jj,jk  )
                zzws       = zcoef * avmu(ji,jj,jk+1) / fse3uw(ji,jj,jk+1)
                zws(ji,jk) = zzws * umask(ji,jj,jk+1)
                zwd(ji,jk) = 1. - zwi(ji,jk) - zzws
-               zwy(ji,jk) = ub(ji,jj,jk) + z2dt * ua(ji,jj,jk)
+               zwy(ji,jk) = ub(ji,jj,jk) + p2dt * ua(ji,jj,jk)
             END DO
          END DO
@@ -112 +102 @@
          ! Surface boudary conditions
          DO ji = 2, jpim1
-            z2dtf = z2dt / ( fse3u(ji,jj,1)*rau0 )
+            z2dtf = p2dt / ( fse3u(ji,jj,1)*rau0 )
             zwi(ji,1) = 0.
             zwd(ji,1) = 1. - zws(ji,1)
@@ -175 +165 @@
          DO jk = 1, jpkm1
             DO ji = 2, jpim1
-               ua(ji,jj,jk) = ( zwx(ji,jk) - ub(ji,jj,jk) ) / z2dt
+               ua(ji,jj,jk) = ( zwx(ji,jk) - ub(ji,jj,jk) ) / p2dt
             END DO
          END DO
@@ -188 +178 @@
          DO jk = 1, jpkm1
             DO ji = 2, jpim1
-               zcoef = -z2dt/fse3v(ji,jj,jk)
+               zcoef = -p2dt/fse3v(ji,jj,jk)
                zwi(ji,jk) = zcoef * avmv(ji,jj,jk  ) / fse3vw(ji,jj,jk  )
                zzws       = zcoef * avmv(ji,jj,jk+1) / fse3vw(ji,jj,jk+1)
                zws(ji,jk) =  zzws * vmask(ji,jj,jk+1)
                zwd(ji,jk) = 1. - zwi(ji,jk) - zzws
-               zwy(ji,jk) = vb(ji,jj,jk) + z2dt * va(ji,jj,jk)
+               zwy(ji,jk) = vb(ji,jj,jk) + p2dt * va(ji,jj,jk)
             END DO
          END DO
@@ -199 +189 @@
          ! Surface boudary conditions
          DO ji = 2, jpim1
-            z2dtf = z2dt / ( fse3v(ji,jj,1)*rau0 )
+            z2dtf = p2dt / ( fse3v(ji,jj,1)*rau0 )
             zwi(ji,1) = 0.e0
             zwd(ji,1) = 1. - zws(ji,1)
@@ -262 +252 @@
          DO jk = 1, jpkm1
             DO ji = 2, jpim1
-               va(ji,jj,jk) = ( zwx(ji,jk) - vb(ji,jj,jk) ) / z2dt
+               va(ji,jj,jk) = ( zwx(ji,jk) - vb(ji,jj,jk) ) / p2dt
             END DO
          END DO