Changeset 463 for trunk/NEMO/OPA_SRC/ZDF/zdfini.F90

Timestamp:

2006-05-10T19:26:55+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_054:RB: take into account tracers and dynamics reorganization, change atsk to jki

File:

• trunk/NEMO/OPA_SRC/ZDF/zdfini.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -31 +31 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
    
@@ -52 +50 @@
       !! * Local declarations
       INTEGER ::   ioptio       ! temporary scalar
-      LOGICAL ::           & !!! namzdf: vertical diffusion
-         ln_zdfexp = .FALSE.   ! explicit vertical diffusion scheme flag
 
       !! * Namelist
-      NAMELIST/namzdf/ ln_zdfevd, ln_zdfnpc,   &
-         &             avm0, avt0, avevd, nevdm, ln_zdfexp, n_zdfexp
+      NAMELIST/namzdf/ ln_zdfexp, n_zdfexp, ln_zdfevd, ln_zdfnpc,   &
+         &             avm0     , avt0    , avevd    , n_evdm
       !!----------------------------------------------------------------------
       !!  OPA 9.0, LODYC-IPSL (2003)
@@ -73 +69 @@
          WRITE(numout,*) 'zdf_init: vertical physics'
          WRITE(numout,*) '~~~~~~~~'
-         WRITE(numout,*) '          Namelist namzdf : set vertical mixing mixing parameters'
-         WRITE(numout,*) '             enhanced vertical diffusion      ln_zdfevd = ', ln_zdfevd
-         WRITE(numout,*) '             non-penetrative convection       ln_zdfnpc = ', ln_zdfnpc
-         WRITE(numout,*) '             vertical eddy viscosity             avm0   = ', avm0
-         WRITE(numout,*) '             vertical eddy diffusivity           avt0   = ', avt0
-         WRITE(numout,*) '             vertical coefficient for evd        avevd  = ', avevd
-         WRITE(numout,*) '                applied on momentum (=1/0)       nevdm  = ', nevdm
-         WRITE(numout,*) '             time splitting / backward scheme ln_zdfexp = ', ln_zdfexp
-         WRITE(numout,*) '             number of time step               n_zdfexp = ', n_zdfexp
+         WRITE(numout,*) '   Namelist namzdf : set vertical mixing mixing parameters'
+         WRITE(numout,*) '      time splitting / backward scheme    ln_zdfexp = ', ln_zdfexp
+         WRITE(numout,*) '      number of time step                  n_zdfexp = ', n_zdfexp
+         WRITE(numout,*) '      enhanced vertical diffusion         ln_zdfevd = ', ln_zdfevd
+         WRITE(numout,*) '      non-penetrative convection          ln_zdfnpc = ', ln_zdfnpc
+         WRITE(numout,*) '      vertical eddy viscosity             avm0      = ', avm0
+         WRITE(numout,*) '      vertical eddy diffusivity           avt0      = ', avt0
+         WRITE(numout,*) '      vertical coefficient for evd        avevd     = ', avevd
+         WRITE(numout,*) '         applied on momentum (=1/0)       n_evdm    = ', n_evdm
       ENDIF
 
       ! Parameter & logicals controls
       ! -----------------------------
-      ! ... vertical mixing
-      ! time stepping scheme (N.B. TKE or KPP schemes => force the use of implicit scheme)
-      IF( ( ln_zdfexp .AND. .NOT.lk_zdftke ) .OR. ( ln_zdfexp .AND. .NOT.lk_zdfkpp ) ) THEN  
-         l_trazdf_exp = .TRUE.           ! use explicit scheme
-         l_trazdf_imp = .FALSE.
-         l_dynzdf_exp = .TRUE.           ! use explicit scheme
-         l_dynzdf_imp = .FALSE.
-      ELSE
-         l_trazdf_exp = .FALSE.          ! use implicit scheme
-         l_trazdf_imp = .TRUE. 
-         l_dynzdf_exp = .FALSE.          ! use implicit scheme
-         l_dynzdf_imp = .TRUE. 
-      ENDIF
-      IF( l_trazdf_iso .OR. l_trazdf_iso_vo ) THEN  
-         l_trazdf_exp = .FALSE.          ! iso-neutral diffusion : 
-         l_trazdf_imp = .FALSE.          ! implicit scheme included in iso-neutral routine
-      ENDIF
-      IF( l_dynldf_iso ) THEN  
-         l_dynzdf_exp = .FALSE.          ! iso-neutral diffusion :
-         l_dynzdf_imp = .FALSE.          ! implicit scheme included in iso-neutral routine
-      ENDIF
-#if defined key_autotasking
-      IF( l_dynzdf_imp ) THEN
-         l_dynzdf_imp     = .FALSE.
-         l_dynzdf_imp_tsk = .TRUE.
-      ENDIF
-#else
-      l_dynzdf_imp_tsk = .FALSE.
-#endif
-      IF( lk_esopa  ) THEN
-         l_trazdf_exp = .TRUE.           ! esopa: use all options
-         l_trazdf_imp = .TRUE.
-         l_dynzdf_exp     = .TRUE.           ! esopa: use all options
-         l_dynzdf_imp     = .TRUE.
-         l_dynzdf_imp_tsk = .TRUE.
-      ENDIF
+      ! ... check of vertical mixing scheme on tracers
+      !           ==> will be done in trazdf module
 
+      ! ... check of mixing coefficient
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) '          vertical mixing option :'
       ioptio = 0
       IF( lk_zdfcst ) THEN
-         IF(lwp) WRITE(numout,*) '             constant eddy diffusion coef.'
+         IF(lwp) WRITE(numout,*) '             constant eddy diffusion coefficients'
          ioptio = ioptio+1
       ENDIF
       IF( lk_zdfric ) THEN
-         IF(lwp) WRITE(numout,*) '             Richardson dependent eddy coef.'
+         IF(lwp) WRITE(numout,*) '             Richardson dependent eddy coefficients'
          ioptio = ioptio+1
       ENDIF
       IF( lk_zdftke ) THEN
-         IF(lwp) WRITE(numout,*) '             TKE dependent eddy coef.'
+         IF(lwp) WRITE(numout,*) '             TKE dependent eddy coefficients'
          ioptio = ioptio+1
       ENDIF
       IF( lk_zdfkpp ) THEN
-         IF(lwp) WRITE(numout,*) '             KPP dependent eddy coef.'
+         IF(lwp) WRITE(numout,*) '             KPP dependent eddy coefficients'
          ioptio = ioptio+1
       ENDIF
@@ -176 +139 @@
           nstop = nstop + 1
       ENDIF
-      IF( ioptio == 0 .AND. .NOT. lk_zdftke ) THEN
+      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfkpp ) ) THEN
          IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) ' except for TKE scheme, a convection scheme is'
+         IF(lwp) WRITE(numout,*) ' except for TKE sor KPP physics, a convection scheme is'
          IF(lwp) WRITE(numout,*) ' required: ln_zdfevd or ln_zdfnpc logicals'
          nstop = nstop + 1