Changeset 637 for trunk/NEMO/OPA_SRC

Timestamp:

2007-03-07T14:30:12+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_update_009:RB: remove useless routine traadv_ctl and add quickest scheme

Location:

trunk/NEMO/OPA_SRC/TRA

Files:

• traadv.F90 (modified) (9 diffs)
• traadv_ctl.F90 (deleted)
• traadv_qck.F90 (added)

trunk/NEMO/OPA_SRC/TRA/traadv.F90

@@ -15 +15 @@
    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)
-   USE traadv_muscl2   ! MUSCL2 scheme             (tra_adv_muscl2 routine)
-   USE traadv_ubs      ! UBS    scheme             (tra_adv_ubs    routine)
+   USE traadv_tvd      ! TVD      scheme           (tra_adv_tvd    routine)
+   USE traadv_muscl    ! MUSCL    scheme           (tra_adv_muscl  routine)
+   USE traadv_muscl2   ! MUSCL2   scheme           (tra_adv_muscl2 routine)
+   USE traadv_ubs      ! UBS      scheme           (tra_adv_ubs    routine)
+   USE traadv_qck     !! QUICKEST scheme           (tra_adv_qck    routine)
    USE traadv_eiv      ! eddy induced velocity     (tra_adv_eiv    routine)
    USE trabbl          ! tracers: bottom boundary layer
@@ -36 +37 @@
    LOGICAL, PUBLIC ::   ln_traadv_muscl2 = .FALSE.      ! MUSCL2 scheme flag
    LOGICAL, PUBLIC ::   ln_traadv_ubs    = .FALSE.      ! UBS scheme flag
+   LOGICAL, PUBLIC ::   ln_traadv_qck    = .FALSE.      ! QUICKEST scheme flag
 
    INTEGER ::   nadv   ! choice of the type of advection scheme
@@ -88 +90 @@
       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 ( 2 )   ;   CALL tra_adv_tvd     ( kt, zun, zvn, zwn )    ! TVD    scheme
-      CASE ( 3 )   ;   CALL tra_adv_muscl   ( kt, zun, zvn, zwn )    ! MUSCL  scheme
-      CASE ( 4 )   ;   CALL tra_adv_muscl2  ( kt, zun, zvn, zwn )    ! MUSCL2 scheme
-      CASE ( 5 )   ;   CALL tra_adv_ubs     ( kt, zun, zvn, zwn )    ! UBS    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
+      CASE ( 4 )   ;   CALL tra_adv_muscl2  ( kt, zun, zvn, zwn )    ! MUSCL2   scheme
+      CASE ( 5 )   ;   CALL tra_adv_ubs     ( kt, zun, zvn, zwn )    ! UBS      scheme
+      CASE ( 6 )   ;   CALL tra_adv_qck     ( kt, zun, zvn, zwn )    ! QUICKEST scheme
       !
       CASE (-1 )                                                     ! esopa: test all possibility with control print
@@ -111 +114 @@
          ;             CALL tra_adv_ubs     ( kt, zun, zvn, zwn )
          ;             CALL prt_ctl( tab3d_1=ta, clinfo1=' adv5 - Ta: ', mask1=tmask,               &
+            &                        tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
+         ;             CALL tra_adv_qck     ( kt, zun, zvn, zwn )
+         ;             CALL prt_ctl( tab3d_1=ta, clinfo1=' adv6 - Ta: ', mask1=tmask,               &
             &                        tab3d_2=sa, clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
       END SELECT
@@ -129 +135 @@
       INTEGER ::   ioptio
 
-      NAMELIST/nam_traadv/ ln_traadv_cen2 , ln_traadv_tvd,   &
-         &                 ln_traadv_muscl, ln_traadv_muscl2, ln_traadv_ubs
+      NAMELIST/nam_traadv/ ln_traadv_cen2 , ln_traadv_tvd,    &
+         &                 ln_traadv_muscl, ln_traadv_muscl2, &
+         &                 ln_traadv_ubs  , ln_traadv_qck
       !!----------------------------------------------------------------------
 
@@ -146 +153 @@
          WRITE(numout,*) '          MUSCL2 advection scheme        ln_traadv_muscl2 = ', ln_traadv_muscl2
          WRITE(numout,*) '          UBS    advection scheme        ln_traadv_ubs    = ', ln_traadv_ubs
-      ENDIF
+         WRITE(numout,*) '          QUICKEST advection scheme      ln_traadv_qck    = ', ln_traadv_qck
+    ENDIF
 
       ioptio = 0                      ! Parameter control
@@ -154 +162 @@
       IF( ln_traadv_muscl2 )   ioptio = ioptio + 1
       IF( ln_traadv_ubs    )   ioptio = ioptio + 1
+      IF( ln_traadv_qck    )   ioptio = ioptio + 1
       IF( lk_esopa         )   ioptio =          1
 
@@ -170 +179 @@
       IF( ln_traadv_muscl2 )   nadv =  4
       IF( ln_traadv_ubs    )   nadv =  5
+      IF( ln_traadv_qck    )   nadv =  6
       IF( lk_esopa         )   nadv = -1
 
@@ -180 +190 @@
          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 == -1 )   WRITE(numout,*) '         esopa test: use all advection scheme'
       ENDIF