Changeset 7953 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90

Timestamp:

2017-04-23T09:30:41+02:00 (7 years ago)

Author:

gm

Message:

#1880 (HPC-09): add zdfphy (the ZDF manager) + remove all key_...

File:

• branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) (5 diffs)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90

@@ -13 +13 @@
    !!            3.3.1! 2011-09  (P. Oddo) Mixed layer depth parameterization
    !!----------------------------------------------------------------------
-#if defined key_zdfric
-   !!----------------------------------------------------------------------
-   !!   'key_zdfric'                                             Kz = f(Ri)
-   !!----------------------------------------------------------------------
-   !!   zdf_ric       : update momentum and tracer Kz from the Richardson
-   !!                  number computation
+
+   !!----------------------------------------------------------------------
+   !!   zdf_ric       : update momentum and tracer Kz from the Richardson number
    !!   zdf_ric_init  : initialization, namelist read, & parameters control
    !!----------------------------------------------------------------------
@@ -38 +35 @@
    PUBLIC   zdf_ric         ! called by step.F90
    PUBLIC   zdf_ric_init    ! called by opa.F90
-
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zdfric = .TRUE.   !: Richardson vertical mixing flag
 
    !                           !!* Namelist namzdf_ric : Richardson number dependent Kz *
@@ -108 +103 @@
       !!      namelist
       !!        N.B. the mask are required for implicit scheme, and surface
-      !!      and bottom value already set in zdfini.F90
+      !!      and bottom value already set in zdfphy.F90
       !!
       !! References : Pacanowski & Philander 1981, JPO, 1441-1451.
@@ -183 +178 @@
             zrhos          = rhop(ji,jj,1) + zflageos * ( 1. - tmask(ji,jj,1) )
             zustar         = SQRT( taum(ji,jj) / ( zrhos +  rsmall ) )
-            ekm_dep(ji,jj) = rn_ekmfc * zustar / ( ABS( ff(ji,jj) ) + rsmall )
+            ekm_dep(ji,jj) = rn_ekmfc * zustar / ( ABS( ff_t(ji,jj) ) + rsmall )
             ekm_dep(ji,jj) = MAX(ekm_dep(ji,jj),rn_mldmin) ! Minimun allowed
             ekm_dep(ji,jj) = MIN(ekm_dep(ji,jj),rn_mldmax) ! Maximum allowed
@@ -303 +298 @@
    END SUBROUTINE zdf_ric_init
 
-#else
-   !!----------------------------------------------------------------------
-   !!   Dummy module :              NO Richardson dependent vertical mixing
-   !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zdfric = .FALSE.   !: Richardson mixing flag
-CONTAINS
-   SUBROUTINE zdf_ric_init         ! Dummy routine
-   END SUBROUTINE zdf_ric_init
-   SUBROUTINE zdf_ric( kt )        ! Dummy routine
-      WRITE(*,*) 'zdf_ric: You should not have seen this print! error?', kt
-   END SUBROUTINE zdf_ric
-#endif
-
    !!======================================================================
 END MODULE zdfric