Changeset 503 for trunk/NEMO/OPA_SRC/DYN/dynzdf_exp.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_exp.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DYN/dynzdf_exp.F90

@@ -4 +4 @@
    !! Ocean dynamics:  vertical component(s) of the momentum mixing trend
    !!==============================================================================
+   !! History :      !  90-10  (B. Blanke)  Original code
+   !!                !  97-05  (G. Madec)  vertical component of isopycnal
+   !!           8.5  !  02-08  (G. Madec)  F90: Free form and module
+   !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
@@ -16 +20 @@
    USE in_out_manager  ! I/O manager
    USE taumod          ! surface ocean stress
-   USE prtctl          ! Print control
 
    IMPLICIT NONE
@@ -30 +33 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Header$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
 CONTAINS
 
-   SUBROUTINE dyn_zdf_exp( kt )
+   SUBROUTINE dyn_zdf_exp( kt, p2dt )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dyn_zdf_exp  ***
@@ -50 +53 @@
       !!
       !! ** Action : - Update (ua,va) with the vertical diffusive trend
-      !!             - Save the trends in (ztdua,ztdva) ('key_trddyn')
-      !!
-      !! History :
-      !!        !  90-10  (B. Blanke)  Original code
-      !!        !  97-05  (G. Madec)  vertical component of isopycnal
-      !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
-      !!   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                         ! time-step 
 
       !! * Local declarations
-      INTEGER ::   &
-         ji, jj, jk, jl                    ! dummy loop indices
-      REAL(wp) ::   &
-         zrau0r, zlavmr, z2dt, zua, zva    ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpk) ::    &
-         zwx, zwy, zwz, zww                ! temporary workspace arrays
+      INTEGER ::   ji, jj, jk, jl                              ! dummy loop indices
+      REAL(wp) ::   zrau0r, zlavmr, zua, zva                   ! temporary scalars
+      REAL(wp), DIMENSION(jpi,jpk) ::   zwx, zwy, zwz, zww     ! temporary workspace arrays
       !!----------------------------------------------------------------------
 
@@ -83 +74 @@
       zrau0r = 1. / rau0                                   ! inverse of the reference density
       zlavmr = 1. / float( n_zdfexp )                      ! inverse of the number of sub time step
-      z2dt = 2. * rdt                                      ! Leap-frog environnement
-
-      IF( neuler == 0 .AND. kt == nit000 )   z2dt = rdt    ! Euler time stepping when starting from rest
 
       !                                                ! ===============
@@ -124 +112 @@
                   va(ji,jj,jk) = va(ji,jj,jk) + zva
 
-                  zwx(ji,jk) = zwx(ji,jk) + z2dt*zua*umask(ji,jj,jk)
-                  zwz(ji,jk) = zwz(ji,jk) + z2dt*zva*vmask(ji,jj,jk)
+                  zwx(ji,jk) = zwx(ji,jk) + p2dt*zua*umask(ji,jj,jk)
+                  zwz(ji,jk) = zwz(ji,jk) + p2dt*zva*vmask(ji,jj,jk)
                END DO  
             END DO