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

trunk/NEMO/OPA_SRC/TRA/traadv.F90

@@ -14 +14 @@
    USE dom_oce         ! ocean space and time domain
    USE traadv_cen2     ! 2nd order centered scheme (tra_adv_cen2   routine)
-   USE traadv_cen2_jki ! 2nd order centered scheme (tra_adv_cen2   routine)
    USE traadv_tvd      ! TVD      scheme           (tra_adv_tvd    routine)
    USE traadv_muscl    ! MUSCL    scheme           (tra_adv_muscl  routine)
@@ -88 +87 @@
 
       SELECT CASE ( nadv )                           ! compute advection trend and add it to general trend
-      CASE ( 0 )   ;   CALL tra_adv_cen2    ( kt, zun, zvn, zwn )    ! 2nd order centered scheme k-j-i loops
-      CASE ( 1 )   ;   CALL tra_adv_cen2_jki( kt, zun, zvn, zwn )    ! 2nd order centered scheme
+      CASE ( 1 )   ;   CALL tra_adv_cen2    ( kt, zun, zvn, zwn )    ! 2nd order centered scheme
       CASE ( 2 )   ;   CALL tra_adv_tvd     ( kt, zun, zvn, zwn )    ! TVD      scheme
       CASE ( 3 )   ;   CALL tra_adv_muscl   ( kt, zun, zvn, zwn )    ! MUSCL    scheme
@@ -99 +97 @@
                        CALL tra_adv_cen2    ( kt, zun, zvn, zwn )
                        CALL prt_ctl( tab3d_1=ta, clinfo1=' adv0 - Ta: ', mask1=tmask,               &
-            &                        tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
-                       CALL tra_adv_cen2_jki( kt, zun, zvn, zwn )
-                       CALL prt_ctl( tab3d_1=ta, clinfo1=' adv1 - Ta: ', mask1=tmask,               &
             &                        tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
                        CALL tra_adv_tvd     ( kt, zun, zvn, zwn )
@@ -171 +166 @@
 
       !                              ! Set nadv
-      IF( ln_traadv_cen2   )   nadv =  0
-#if defined key_mpp_omp
       IF( ln_traadv_cen2   )   nadv =  1
-#endif
       IF( ln_traadv_tvd    )   nadv =  2
       IF( ln_traadv_muscl  )   nadv =  3
@@ -184 +176 @@
       IF(lwp) THEN                   ! Print the choice
          WRITE(numout,*)
-         IF( nadv ==  0 )   WRITE(numout,*) '         2nd order scheme is used'
-         IF( nadv ==  1 )   WRITE(numout,*) '         2nd order scheme is usedi, k-j-i case'
+         IF( nadv ==  1 )   WRITE(numout,*) '         2nd order scheme is used'
          IF( nadv ==  2 )   WRITE(numout,*) '         TVD       scheme is used'
          IF( nadv ==  3 )   WRITE(numout,*) '         MUSCL     scheme is used'
          IF( nadv ==  4 )   WRITE(numout,*) '         MUSCL2    scheme is used'
          IF( nadv ==  5 )   WRITE(numout,*) '         UBS       scheme is used'
-         IF( nadv ==  6 )   WRITE(numout,*) '         PPM       scheme is used'
-         IF( nadv ==  7 )   WRITE(numout,*) '         QUICKEST  scheme is used'
+         IF( nadv ==  6 )   WRITE(numout,*) '         QUICKEST  scheme is used'
          IF( nadv == -1 )   WRITE(numout,*) '         esopa test: use all advection scheme'
       ENDIF