Changeset 789 for trunk/NEMO/OPA_SRC/DYN/dynzdf.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/DYN/dynzdf.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DYN/dynzdf.F90

@@ -17 +17 @@
    USE dynzdf_exp      ! vertical diffusion: explicit (dyn_zdf_exp     routine)
    USE dynzdf_imp      ! vertical diffusion: implicit (dyn_zdf_imp     routine)
-   USE dynzdf_imp_jki  ! vertical diffusion  implicit (dyn_zdf_imp_jki routine)
 
    USE ldfdyn_oce      ! ocean dynamics: lateral physics
@@ -74 +73 @@
       !
       CASE ( 0 )   ;   CALL dyn_zdf_exp    ( kt, r2dt )      ! explicit scheme
-      CASE ( 1 )   ;   CALL dyn_zdf_imp    ( kt, r2dt )      ! implicit scheme (k-j-i loop)
-      CASE ( 2 )   ;   CALL dyn_zdf_imp_jki( kt, r2dt )      ! implicit scheme (j-k-i loop)
+      CASE ( 1 )   ;   CALL dyn_zdf_imp    ( kt, r2dt )      ! implicit scheme
       !
       CASE ( -1 )                                      ! esopa: test all possibility with control print
@@ -83 +81 @@
                        CALL dyn_zdf_imp    ( kt, r2dt )
                        CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf1 - Ua: ', mask1=umask,               &
-            &                        tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
-                       CALL dyn_zdf_imp_jki( kt, r2dt )
-                       CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf2 - Ua: ', mask1=umask,               &
             &                        tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       END SELECT
@@ -109 +104 @@
       !! ** Method  :   implicit (euler backward) scheme (default)
       !!                explicit (time-splitting) scheme if ln_zdfexp=T
-      !!                OpenMP / NEC autotasking: use j-k-i loops
       !!----------------------------------------------------------------------
       USE zdftke
@@ -125 +119 @@
       IF( ln_dynldf_hor .AND. ln_sco )   nzdf = 1   ! horizontal lateral physics in s-coordinate
 
-      ! OpenMP / NEC autotasking
-#if defined key_mpp_omp
-      IF( nzdf == 1 )   nzdf = 2                    ! j-k-i loop
-#endif
-
       IF( lk_esopa )    nzdf = -1                   ! Esopa key: All schemes used
 
@@ -139 +128 @@
          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
       !