Changeset 1531 for trunk/NEMO/OPA_SRC/ZDF/zdftke2.F90

Timestamp:

2009-07-24T08:48:42+02:00 (15 years ago)

Author:

ctlod

Message:

change TKE cpp key names, see ticket: #485

File:

• trunk/NEMO/OPA_SRC/ZDF/zdftke2.F90 (modified) (13 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdftke2.F90

@@ -1 @@
-MODULE zdftke2
+MODULE zdftke
    !!======================================================================
-   !!                       ***  MODULE  zdftke2  ***
+   !!                       ***  MODULE  zdftke  ***
    !! Ocean physics:  vertical mixing coefficient computed from the tke 
    !!                 turbulent closure parameterization
@@ -27 +27 @@
    !!                 !                                + cleaning of the parameters + bugs correction
    !!----------------------------------------------------------------------
-#if defined key_zdftke2   ||   defined key_esopa
+#if defined key_zdftke   ||   defined key_esopa
    !!----------------------------------------------------------------------
-   !!   'key_zdftke2'                                  TKE vertical physics
+   !!   'key_zdftke'                                   TKE vertical physics
    !!----------------------------------------------------------------------
-   !!   zdf_tke2      : update momentum and tracer Kz from a tke scheme
+   !!   zdf_tke       : update momentum and tracer Kz from a tke scheme
    !!   tke_tke       : tke time stepping: update tke at now time step (en)
    !!   tke_avn       : compute mixing length scale and deduce avm and avt
    !!   tke_init      : initialization, namelist read, and parameters control
-   !!   tke2_rst      : read/write tke restart in ocean restart file
+   !!   tke_rst       : read/write tke restart in ocean restart file
    !!----------------------------------------------------------------------
    USE oce            ! ocean dynamics and active tracers 
@@ -53 +53 @@
    PRIVATE
 
-   PUBLIC   zdf_tke2   ! routine called in step module
-   PUBLIC   tke2_rst   ! routine called in step module
-
-   LOGICAL , PUBLIC, PARAMETER              ::   lk_zdftke2 = .TRUE.  !: TKE vertical mixing flag
+   PUBLIC   zdf_tke    ! routine called in step module
+   PUBLIC   tke_rst    ! routine called in step module
+
+   LOGICAL , PUBLIC, PARAMETER              ::   lk_zdftke = .TRUE.  !: TKE vertical mixing flag
 
 #if defined key_c1d
@@ -99 +99 @@
 
    REAL(wp), DIMENSION(jpi,jpj)     ::   htau      ! depth of tke penetration (nn_htau)
-   REAL(wp), DIMENSION(jpi,jpj)     ::   avtb_2d   ! set in tke2_init, for other modif than ice
+   REAL(wp), DIMENSION(jpi,jpj)     ::   avtb_2d   ! set in tke_init, for other modif than ice
    REAL(wp), DIMENSION(jpi,jpj,jpk) ::   en        ! now turbulent kinetic energy   [m2/s2]
    REAL(wp), DIMENSION(jpi,jpj,jpk) ::   dissl     ! now mixing lenght of dissipation
@@ -114 +114 @@
 CONTAINS
 
-   SUBROUTINE zdf_tke2( kt )
+   SUBROUTINE zdf_tke( kt )
       !!----------------------------------------------------------------------
-      !!                   ***  ROUTINE zdf_tke2  ***
+      !!                   ***  ROUTINE zdf_tke  ***
       !!
       !! ** Purpose :   Compute the vertical eddy viscosity and diffusivity
@@ -168 +168 @@
                            CALL tke_avn      ! now avt, avm, avmu, avmv
       !
-   END SUBROUTINE zdf_tke2
+   END SUBROUTINE zdf_tke
 
 
@@ -627 +627 @@
    SUBROUTINE tke_init
       !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE zdf_tke2_init  ***
+      !!                  ***  ROUTINE tke_init  ***
       !!                     
       !! ** Purpose :   Initialization of the vertical eddy diffivity and 
@@ -654 +654 @@
       IF(lwp) THEN                    !* Control print
          WRITE(numout,*)
-         WRITE(numout,*) 'zdf_tke2 : tke turbulent closure scheme - initialisation'
+         WRITE(numout,*) 'zdf_tke : tke turbulent closure scheme - initialisation'
          WRITE(numout,*) '~~~~~~~~'
          WRITE(numout,*) '          Namelist namtke : set tke mixing parameters'
@@ -738 +738 @@
       dissl(:,:,:) = 1.e-12
       !                               !* read or initialize all required files 
-      CALL tke2_rst( nit000, 'READ' )
+      CALL tke_rst( nit000, 'READ' )
       !
    END SUBROUTINE tke_init
 
 
-   SUBROUTINE tke2_rst( kt, cdrw )
+   SUBROUTINE tke_rst( kt, cdrw )
      !!---------------------------------------------------------------------
-     !!                   ***  ROUTINE ts_rst  ***
+     !!                   ***  ROUTINE tke_rst  ***
      !!                     
      !! ** Purpose :   Read or write TKE file (en) in restart file
@@ -785 +785 @@
               en (:,:,:) = rn_emin * tmask(:,:,:)
               CALL tke_avn                               ! recompute avt, avm, avmu, avmv and dissl (approximation)
-              DO jit = nit000 + 1, nit000 + 10   ;   CALL zdf_tke2( jit )   ;   END DO
+              DO jit = nit000 + 1, nit000 + 10   ;   CALL zdf_tke( jit )   ;   END DO
            ENDIF
         ELSE                                   !* Start from rest
@@ -799 +799 @@
      ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN   ! Create restart file
         !                                   ! -------------------
-        IF(lwp) WRITE(numout,*) '---- tke2-rst ----'
+        IF(lwp) WRITE(numout,*) '---- tke-rst ----'
         CALL iom_rstput( kt, nitrst, numrow, 'en'   , en     )
         CALL iom_rstput( kt, nitrst, numrow, 'avt'  , avt    )
@@ -809 +809 @@
      ENDIF
      !
-   END SUBROUTINE tke2_rst
+   END SUBROUTINE tke_rst
 
 #else
@@ -815 +815 @@
    !!   Dummy module :                                        NO TKE scheme
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zdftke2 = .FALSE.   !: TKE flag
+   LOGICAL, PUBLIC, PARAMETER ::   lk_zdftke = .FALSE.   !: TKE flag
 CONTAINS
-   SUBROUTINE zdf_tke2( kt )          ! Empty routine
-      WRITE(*,*) 'zdf_tke2: You should not have seen this print! error?', kt
-   END SUBROUTINE zdf_tke2
-   SUBROUTINE tke2_rst( kt, cdrw )
+   SUBROUTINE zdf_tke( kt )          ! Empty routine
+      WRITE(*,*) 'zdf_tke: You should not have seen this print! error?', kt
+   END SUBROUTINE zdf_tke
+   SUBROUTINE tke_rst( kt, cdrw )
      CHARACTER(len=*) ::   cdrw
-     WRITE(*,*) 'tke2_rst: You should not have seen this print! error?', kt, cdwr
-   END SUBROUTINE tke2_rst
+     WRITE(*,*) 'tke_rst: You should not have seen this print! error?', kt, cdwr
+   END SUBROUTINE tke_rst
 #endif
 
    !!======================================================================
-END MODULE zdftke2
+END MODULE zdftke