Changeset 789 for trunk/NEMO/OPA_SRC/TRA/trazdf.F90

Timestamp:

2008-01-11T19:04:56+01:00 (16 years ago)

Author:

rblod

Message:

Suppress jki routines and associated key_mpp_omp

File:

• trunk/NEMO/OPA_SRC/TRA/trazdf.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/TRA/trazdf.F90

@@ -17 +17 @@
    USE trazdf_exp      ! vertical diffusion: explicit (tra_zdf_exp     routine)
    USE trazdf_imp      ! vertical diffusion: implicit (tra_zdf_imp     routine)
-   USE trazdf_imp_jki  ! vertical diffusion  implicit (tra_zdf_imp_jki routine)
 
    USE ldftra_oce      ! ocean active tracers: lateral physics
@@ -90 +89 @@
          CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf1 - Ta: ', mask1=tmask,               &
             &          tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
-         CALL tra_zdf_imp_jki( kt, r2dt )
-         CALL prt_ctl( tab3d_1=ta, clinfo1=' zdf2 - Ta: ', mask1=tmask,               &
-            &          tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
 
       CASE ( 0 )                                       ! explicit scheme
@@ -102 +98 @@
          ENDIF
 
-      CASE ( 1 )                                       ! implicit scheme (k-j-i loop)
+      CASE ( 1 )                                       ! implicit scheme 
          CALL tra_zdf_imp    ( kt, r2dt )
-         IF( l_trdtra )   THEN                         ! save the vertical diffusive trends for further diagnostics
-            DO jk = 1, jpkm1
-               ztrdt(:,:,jk) = ( ( ta(:,:,jk) - tb(:,:,jk) ) / r2dt(jk) ) - ztrdt(:,:,jk)
-               ztrds(:,:,jk) = ( ( sa(:,:,jk) - sb(:,:,jk) ) / r2dt(jk) ) - ztrds(:,:,jk)
-            END DO
-            CALL trd_mod( ztrdt, ztrds, jptra_trd_zdf, 'TRA', kt )
-         ENDIF
-
-      CASE ( 2 )                                       ! implicit scheme (j-k-i loop)
-         CALL tra_zdf_imp_jki( kt, r2dt )
          IF( l_trdtra )   THEN                         ! save the vertical diffusive trends for further diagnostics
             DO jk = 1, jpkm1
@@ -137 +123 @@
       !! ** Purpose :   Choose the vertical mixing scheme
       !!
-      !! ** Method  :   Set nzdf from ln_zdfexp and 'key_mpp_omp'.
+      !! ** Method  :   Set nzdf from ln_zdfexp
       !!      nzdf = 0   explicit (time-splitting) scheme (ln_zdfexp=T)
       !!           = 1   implicit (euler backward) scheme (ln_zdfexp=F)
-      !!           = 2   implicit (euler backward) scheme with j-k-i loops
-      !!                 (ln_zdfexp=T and 'key_mpp_omp')
       !!      NB: rotation of lateral mixing operator or TKE or KPP scheme,
       !!      the implicit scheme is required.
@@ -169 +153 @@
       ENDIF
 
-      ! NEC autotasking / OpenMP
-#if defined key_mpp_omp
-      IF( nzdf == 1 )   nzdf = 2                       ! j-k-i loop
-#endif
-
       ! Test: esopa
       IF( lk_esopa )    nzdf = -1                      ! All schemes used
@@ -184 +163 @@
          IF( nzdf ==  0 )   WRITE(numout,*) '              Explicit time-splitting scheme'
          IF( nzdf ==  1 )   WRITE(numout,*) '              Implicit (euler backward) scheme'
-         IF( nzdf ==  2 )   WRITE(numout,*) '              Implicit (euler backward) scheme with j-k-i loops'
       ENDIF