Changeset 1531 for trunk/NEMO/OPA_SRC/step.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/step.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/step.F90

@@ -87 +87 @@
    USE zdftmx          ! tide-induced vertical mixing     (zdf_tmx routine)
    USE zdfbfr          ! bottom friction                  (zdf_bfr routine)
+   USE zdftke_old      ! old TKE vertical mixing      (zdf_tke_old routine)
    USE zdftke          ! TKE vertical mixing              (zdf_tke routine)
-   USE zdftke2         ! TKE2 vertical mixing             (zdf_tke2 routine)
    USE zdfkpp          ! KPP vertical mixing              (zdf_kpp routine)
    USE zdfddm          ! double diffusion mixing          (zdf_ddm routine)
@@ -200 +200 @@
       !  VERTICAL PHYSICS   
       !                                               ! Vertical eddy viscosity and diffusivity coefficients
-      IF( lk_zdfric  )   CALL zdf_ric( kstp )         ! Richardson number dependent Kz
-      IF( lk_zdftke  )   CALL zdf_tke ( kstp )        ! TKE  closure scheme for Kz
-      IF( lk_zdftke2 )   CALL zdf_tke2( kstp )        ! TKE2 closure scheme for Kz
-      IF( lk_zdfkpp  )   CALL zdf_kpp( kstp )         ! KPP closure scheme for Kz
-      IF( lk_zdfcst  )   THEN                         ! Constant Kz (reset avt, avm[uv] to the background value)
+      IF( lk_zdfric     )   CALL zdf_ric    ( kstp )  ! Richardson number dependent Kz
+      IF( lk_zdftke_old )   CALL zdf_tke_old( kstp )  ! TKE closure scheme for Kz (old scheme)
+      IF( lk_zdftke     )   CALL zdf_tke    ( kstp )  ! TKE closure scheme for Kz
+      IF( lk_zdfkpp     )   CALL zdf_kpp    ( kstp )  ! KPP closure scheme for Kz
+      IF( lk_zdfcst     )   THEN                      ! Constant Kz (reset avt, avm[uv] to the background value)
          avt (:,:,:) = avt0 * tmask(:,:,:)
          avmu(:,:,:) = avm0 * umask(:,:,:)
@@ -223 +223 @@
                          CALL zdf_mxl( kstp )         ! mixed layer depth
 
-                                                      ! write tke2 information in the restart file
-      IF( lrst_oce .AND. lk_zdftke2 )   CALL tke2_rst( kstp, 'WRITE' )
+                                                      ! write tke information in the restart file
+      IF( lrst_oce .AND. lk_zdftke )   CALL tke_rst( kstp, 'WRITE' )
       !
       !  LATERAL  PHYSICS