Changeset 255 for trunk/NEMO/OPA_SRC/step.F90

Timestamp:

2005-09-02T17:06:49+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_002 : CT : Integration of the KPP turbulent closure scheme

File:

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

trunk/NEMO/OPA_SRC/step.F90

@@ -91 +91 @@
    USE zdfbfr          ! bottom friction                  (zdf_bfr routine)
    USE zdftke          ! TKE vertical mixing              (zdf_tke routine)
+   USE zdfkpp          ! KPP vertical mixing              (zdf_kpp routine)
    USE zdfddm          ! double diffusion mixing          (zdf_ddm routine)
    USE zdfevd          ! enhanced vertical diffusion      (zdf_evd routine)
@@ -163 +164 @@
       !!   9.0  !  02-06  (G. Madec)  free form, suppress macro-tasking
       !!    "   !  04-08  (C. Talandier) New trends organization
+      !!    "   !  05-01  (C. Ethe) Add the KPP closure scheme
       !!----------------------------------------------------------------------
       !! * Arguments
@@ -237 +239 @@
       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_zdfkpp )   CALL zdf_kpp( kstp )                       ! KPP closure scheme for Kz
       IF( lk_zdfcst )   avt (:,:,:) = avt0 * tmask(:,:,:)          ! Constant Kz (reset avt to the background value)
 
@@ -248 +251 @@
       IF( ln_zdfevd )   CALL zdf_evd( kstp )                 ! enhanced vertical eddy diffusivity
 
-      IF( lk_zdfddm )   CALL zdf_ddm( kstp )                 ! double diffusive mixing
+      IF( lk_zdfddm .AND. .NOT. lk_zdfkpp)   &
+         &              CALL zdf_ddm( kstp )                 ! double diffusive mixing
 
                         CALL zdf_bfr( kstp )                 ! bottom friction