Changeset 2492

Timestamp:

2010-12-20T11:17:05+01:00 (13 years ago)

Author:

cetlod

Message:

v3.2:correction of some inconsistencies of zdftke_old with namelist, see ticket #768

File:

• trunk/NEMO/OPA_SRC/ZDF/zdftke_old.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdftke_old.F90

@@ -66 +66 @@
 
    !                                       !!! ** Namelist  namzdf_tke  **
-   LOGICAL  ::   ln_rstke = .FALSE.         ! =T restart with tke from a run without tke
    LOGICAL  ::   ln_mxl0  = .FALSE.         ! mixing length scale surface value as function of wind stress or not
    LOGICAL  ::   ln_lc    = .FALSE.         ! Langmuir cells (LC) as a source term of TKE or not
-   INTEGER  ::   nn_itke  = 50              ! number of restart iterative loops
    INTEGER  ::   nn_mxl   =  2              ! type of mixing length (=0/1/2/3)
    INTEGER  ::   nn_pdl   =  1              ! Prandtl number or not (ratio avt/avm) (=0/1)
-   INTEGER  ::   nn_ave   =  1              ! horizontal average or not on avt, avmu, avmv (=0/1)
    REAL(wp) ::   rn_ediff = 0.1_wp          ! coefficient for avt: avt=rn_ediff*mxl*sqrt(e)
    REAL(wp) ::   rn_ediss = 0.7_wp          ! coefficient of the Kolmogoroff dissipation 
    REAL(wp) ::   rn_ebb   = 3.75_wp         ! coefficient of the surface input of tke
-   REAL(wp) ::   rn_efave = 1._wp           ! coefficient for ave : ave=rn_efave*avm
    REAL(wp) ::   rn_emin  = 0.7071e-6_wp    ! minimum value of tke (m2/s2)
    REAL(wp) ::   rn_emin0 = 1.e-4_wp        ! surface minimum value of tke (m2/s2)
-   REAL(wp) ::   rn_cri   = 2._wp / 9._wp   ! critic Richardson number
+   REAL(wp) ::   rn_bshear= 1.e-20_wp       ! background shear (>0)    (Not used in old TKE)
    INTEGER  ::   nn_etau  = 0               ! type of depth penetration of surface tke (=0/1/2)
    INTEGER  ::   nn_htau  = 0               ! type of tke profile of penetration (=0/1)
@@ -85 +81 @@
    REAL(wp) ::   rn_lmin  = 0.1_wp          ! interior min value of mixing length
    REAL(wp) ::   rn_efr   = 1.0_wp          ! fraction of TKE surface value which penetrates in the ocean
+   REAL(wp) ::   rn_addhft= 0.0_wp          ! add offset   applied to HF tau    (Not used in old TKE)
+   REAL(wp) ::   rn_sclhft= 1.0_wp          ! scale factor applied to HF tau    (Not used in old TKE)
    REAL(wp) ::   rn_lc    = 0.15_wp         ! coef to compute vertical velocity of Langmuir cells
+
+  !                                       !! ** old namelist value: now hard coded **
+   INTEGER  ::   nn_ave   =  1              ! horizontal average or not on avt, avmu, avmv (=0/1)
+   REAL(wp) ::   rn_efave = 1._wp           ! coefficient for ave : ave=rn_efave*avm
+   REAL(wp) ::   rn_cri   = 2._wp / 9._wp   ! critic Richardson number
 
    !! * Substitutions
@@ -721 +724 @@
 # endif
       !!
-      NAMELIST/namzdf_tke/ ln_rstke, rn_ediff, rn_ediss, rn_ebb  , rn_efave, rn_emin,   &
-         &                 rn_emin0, rn_cri  , nn_itke , nn_mxl  , nn_pdl  , nn_ave ,   &
-         &                 ln_mxl0 , rn_lmin , rn_lmin0, nn_etau,   &
-         &                 nn_htau , rn_efr  , ln_lc   , rn_lc 
+      NAMELIST/namzdf_tke/ rn_ediff, rn_ediss , rn_ebb   , rn_emin  ,   &
+         &                 rn_emin0, rn_bshear, nn_mxl   , ln_mxl0  ,   &
+         &                 rn_lmin , rn_lmin0 , nn_pdl   , nn_etau  ,   &
+         &                 nn_htau , rn_efr   , rn_addhft, rn_sclhft,   &
+         &                 ln_lc   , rn_lc 
       !!----------------------------------------------------------------------
 
@@ -747 +751 @@
          WRITE(numout,*) '~~~~~~~~~~~~'
          WRITE(numout,*) '          Namelist namzdf_tke : set tke mixing parameters'
-         WRITE(numout,*) '             restart with tke from no tke              ln_rstke = ', ln_rstke
          WRITE(numout,*) '             coef. to compute avt                      rn_ediff = ', rn_ediff
          WRITE(numout,*) '             Kolmogoroff dissipation coef.             rn_ediss = ', rn_ediss
          WRITE(numout,*) '             tke surface input coef.                   rn_ebb   = ', rn_ebb
-         WRITE(numout,*) '             tke diffusion coef.                       rn_efave = ', rn_efave
          WRITE(numout,*) '             minimum value of tke                      rn_emin  = ', rn_emin
          WRITE(numout,*) '             surface minimum value of tke              rn_emin0 = ', rn_emin0
-         WRITE(numout,*) '             number of restart iter loops              nn_itke  = ', nn_itke
          WRITE(numout,*) '             mixing length type                        nn_mxl   = ', nn_mxl
          WRITE(numout,*) '             prandl number flag                        nn_pdl   = ', nn_pdl
@@ -875 +876 @@
      IF( TRIM(cdrw) == 'READ' ) THEN
         IF( ln_rstart ) THEN
-           IF( iom_varid( numror, 'en', ldstop = .FALSE. ) > 0 .AND. .NOT.(ln_rstke) ) THEN 
+           IF( iom_varid( numror, 'en', ldstop = .FALSE. ) > 0 ) THEN 
               CALL iom_get( numror, jpdom_autoglo, 'en', en )
            ELSE
-              IF( lwp .AND. iom_varid( numror, 'en', ldstop = .FALSE. ) > 0 )   &
-                 &                       WRITE(numout,*) ' ===>>>> : previous run without tke scheme'
-              IF( lwp .AND. ln_rstke )   WRITE(numout,*) ' ===>>>> : We do not use en from the restart file'
-              IF( lwp                )   WRITE(numout,*) ' ===>>>> : en is set by iterative loop'
+              IF(lwp)  WRITE(numout,*) ' ===>>>> : previous run without tke scheme'
+              IF(lwp)  WRITE(numout,*) ' ===>>>> : en is set by iterative loop'
               en (:,:,:) = rn_emin * tmask(:,:,:)
-              DO jit = 2, nn_itke + 1
+              DO jit = 2, 51
                  CALL zdf_tke_old( jit )
               END DO