Changeset 811 for branches/dev_001_SBC/NEMO/OPA_SRC/step.F90

Timestamp:

2008-02-07T17:00:12+01:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: merge with the trunk last changesets: #780, 782, 783, 784, 785, 788, 789, 793, 794

File:

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

branches/dev_001_SBC/NEMO/OPA_SRC/step.F90

@@ -84 +84 @@
    USE zdfbfr          ! bottom friction                  (zdf_bfr routine)
    USE zdftke          ! TKE vertical mixing              (zdf_tke routine)
-   USE zdftke_jki      ! TKE vertical mixing              (zdf_tke routine)
    USE zdfkpp          ! KPP vertical mixing              (zdf_kpp routine)
    USE zdfddm          ! double diffusion mixing          (zdf_ddm routine)
@@ -210 +209 @@
       !                                                     ! Vertical eddy viscosity and diffusivity coefficients
       IF( lk_zdfric )   CALL zdf_ric( kstp )                       ! Richardson number dependent Kz
-#if defined key_mpp_omp
-      IF( lk_zdftke )   CALL zdf_tke_jki( kstp )                   ! TKE closure scheme for Kz - j-k-i loops
-#else
+
       IF( lk_zdftke )   CALL zdf_tke( kstp )                       ! TKE closure scheme for Kz
-#endif
+
       IF( lk_zdfkpp )   CALL zdf_kpp( kstp )                       ! KPP closure scheme for Kz
 
@@ -275 +272 @@
                              CALL tra_ldf    ( kstp )       ! lateral mixing
 #if defined key_agrif
-      IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_tra( kstp )  ! tracers sponge
+      IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_tra          ! tracers sponge
 #endif
                              CALL tra_zdf    ( kstp )       ! vertical mixing
@@ -306 +303 @@
                                CALL dyn_ldf( kstp )           ! lateral mixing
 #if defined key_agrif
-      IF(.NOT. Agrif_Root())   CALL Agrif_Sponge_dyn( kstp )  ! momemtum sponge
+      IF(.NOT. Agrif_Root())   CALL Agrif_Sponge_dyn          ! momemtum sponge
 #endif
                                CALL dyn_hpg( kstp )           ! horizontal gradient of Hydrostatic pressure