Changeset 2329 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

Timestamp:

2010-10-28T12:21:58+02:00 (14 years ago)

Author:

gm

Message:

v3.3beta: Suppress old keys (key_diaspr, key_flx..., key_vectopt_memory) & phasing of zdfgls interface

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (8 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -5 +5 @@
    !!                 turbulent closure parameterization
    !!======================================================================
-   !! History :   3.0  !  2009-09  (G. Reffray) : Original code
+   !! History :   3.0  ! 2009-09 (G. Reffray)  Original code
+   !!             3.3  ! 2010-10 (C. Bricaud)  add in the reference
    !!----------------------------------------------------------------------
 #if defined key_zdfgls   ||   defined key_esopa
    !!----------------------------------------------------------------------
    !!   'key_zdfgls'                 Generic Length Scale vertical physics
-   !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
    !!   zdf_gls      : update momentum and tracer Kz from a gls scheme
@@ -33 +33 @@
    PRIVATE
 
-   PUBLIC   zdf_gls    ! routine called in step module
-   PUBLIC   gls_rst    ! routine called in step module
+   PUBLIC   zdf_gls        ! routine called in step module
+   PUBLIC   zdf_gls_init   ! routine called in step module
+   PUBLIC   gls_rst        ! routine called in step module
 
    LOGICAL , PUBLIC, PARAMETER              ::   lk_zdfgls = .TRUE.  !: TKE vertical mixing flag
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   en                  !: now turbulent kinetic energy
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   mxln                !: now mixing length
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   zwall              !: wall function
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)     ::   ustars2            !: Squared surface velocity scale at T-points
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)     ::   ustarb2            !: Squared bottom  velocity scale at T-points
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   zwall               !: wall function
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)     ::   ustars2             !: Squared surface velocity scale at T-points
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)     ::   ustarb2             !: Squared bottom  velocity scale at T-points
 
    !                                         !!! ** Namelist  namzdf_gls  **
    LOGICAL  ::   ln_crban      = .FALSE.      ! =T use Craig and Banner scheme
-   LOGICAL  ::   ln_length_lim = .FALSE.      ! use limit on the dissipation rate understable stratification (Galperin et al., 1988)
+   LOGICAL  ::   ln_length_lim = .FALSE.      ! use limit on the dissipation rate under stable stratif. (Galperin et al., 1988)
    LOGICAL  ::   ln_sigpsi     = .FALSE.      ! Activate Burchard (2003) modification for k-eps closure AND wave breaking mixing
    REAL(wp) ::   rn_epsmin     = 1.e-12_wp    ! minimum value of dissipation (m2/s3)
@@ -113 +114 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id$
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! $Id $
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -150 +150 @@
       !!--------------------------------------------------------------------
 
-      IF( kt == nit000  ) CALL zdf_gls_init        ! Initialization (first time-step only)
-
-      !!--------------------------------------------------------------------
       ! Preliminary computing
 
@@ -905 +902 @@
    END SUBROUTINE zdf_gls
 
+
    SUBROUTINE zdf_gls_init
       !!----------------------------------------------------------------------
@@ -920 +918 @@
       !!
       !!----------------------------------------------------------------------
-      USE dynzdf_exp
-      USE trazdf_exp
-      !
-# if defined key_vectopt_memory
-      INTEGER ::   ji, jj, jk   ! dummy loop indices
-# else
-      INTEGER ::           jk   ! dummy loop indices
-# endif
-      REAL(wp)::   zcr
+      INTEGER ::   jk    ! dummy loop indices
+      REAL(wp)::   zcr   ! local scalar
       !!
       NAMELIST/namzdf_gls/rn_emin, rn_epsmin, ln_length_lim, &
@@ -1232 +1223 @@
    END SUBROUTINE zdf_gls_init
 
+
    SUBROUTINE gls_rst( kt, cdrw )
      !!---------------------------------------------------------------------
@@ -1244 +1236 @@
      INTEGER         , INTENT(in) ::   kt         ! ocean time-step
      CHARACTER(len=*), INTENT(in) ::   cdrw       ! "READ"/"WRITE" flag
-     !
+     !!
      INTEGER ::   jit, jk   ! dummy loop indices
      INTEGER ::   id1, id2, id3, id4, id5, id6, id7, id8