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

trunk/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -20 +20 @@
    USE dynspg_flt     ! surface pressure gradient     (dyn_spg_flt routine)
    USE dynspg_rl      ! surface pressure gradient     (dyn_spg_rl  routine)
-   USE dynspg_exp_jki ! surface pressure gradient (dyn_spg_exp_jki routine)
-   USE dynspg_ts_jki  ! surface pressure gradient (dyn_spg_ts_jki  routine)
-   USE dynspg_flt_jki ! surface pressure gradient (dyn_spg_flt_jki routine)
    USE trdmod         ! ocean dynamics trends
    USE trdmod_oce     ! ocean variables trends
@@ -68 +65 @@
 
       SELECT CASE ( nspg )                       ! compute surf. pressure gradient trend and add it to the general trend
-      !                                                      ! k-j-i loops
+      !                                                     
       CASE (  0 )   ;   CALL dyn_spg_exp    ( kt )              ! explicit
       CASE (  1 )   ;   CALL dyn_spg_ts     ( kt )              ! time-splitting
       CASE (  2 )   ;   CALL dyn_spg_flt    ( kt, kindic )      ! filtered
       CASE (  3 )   ;   CALL dyn_spg_rl     ( kt, kindic )      ! rigid lid
-      !                                                      ! j-k-i loops
-      CASE ( 10 )   ;   CALL dyn_spg_exp_jki( kt )              ! explicit with j-k-i loop
-      CASE ( 11 )   ;   CALL dyn_spg_ts_jki ( kt )              ! time-splitting with j-k-i loop
-      CASE ( 12 )   ;   CALL dyn_spg_flt_jki( kt, kindic )      ! filtered with j-k-i loop
-      !
+      !                                                    
       CASE ( -1 )                                       ! esopa: test all possibility with control print
          ;              CALL dyn_spg_exp    ( kt )
@@ -87 +80 @@
          ;              CALL dyn_spg_flt  ( kt, kindic )
          ;              CALL prt_ctl( tab3d_1=ua, clinfo1=' spg2 - Ua: ', mask1=umask, &
-            &                         tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
-         ;              CALL dyn_spg_exp_jki( kt )
-         ;              CALL prt_ctl( tab3d_1=ua, clinfo1=' spg10- Ua: ', mask1=umask, &
-            &                         tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
-         ;              CALL dyn_spg_ts_jki ( kt )
-         ;              CALL prt_ctl( tab3d_1=ua, clinfo1=' spg12- Ua: ', mask1=umask, &
-            &                         tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
-         ;              CALL dyn_spg_flt_jki( kt, kindic )
-         ;              CALL prt_ctl( tab3d_1=ua, clinfo1=' spg13- Ua: ', mask1=umask, &
             &                         tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       END SELECT
@@ -159 +143 @@
       IF( lk_dynspg_flt)   nspg =  2
       IF( lk_dynspg_rl )   nspg =  3
-      IF( lk_jki       )   nspg =  nspg + 10
       IF( nspg == 13   )   nspg =  3
 
@@ -171 +154 @@
          IF( nspg ==  2 )   WRITE(numout,*) '     filtered free surface'
          IF( nspg ==  3 )   WRITE(numout,*) '     rigid-lid'
-         IF( nspg == 10 )   WRITE(numout,*) '     explicit free surface with j-k-i loop'
-         IF( nspg == 11 )   WRITE(numout,*) '     time splitting free surface with j-k-i loop'
-         IF( nspg == 12 )   WRITE(numout,*) '     filtered free surface with j-k-i loop'
       ENDIF