Changeset 645 for trunk

Timestamp:

2007-03-29T13:40:37+02:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_029:RB: correct critical bug in dynadv and dynvor (een scheme) introduced by previous commits

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• dynadv.F90 (modified) (1 diff)
• dynvor.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DYN/dynadv.F90

@@ -58 +58 @@
       IF( kt == nit000 )   CALL dyn_adv_ctl          ! initialisation & control of options
 
-!      SELECT CASE ( nadv )                     ! compute advection trend and add it to general trend
-!      CASE ( 0 )   ;   CALL dyn_keg     ( kt )    ! vector form : horizontal gradient of kinetic energy
-!         ;             CALL dyn_zad     ( kt )    ! vector form : vertical advection
-!      CASE ( 1 )   ;   CALL dyn_adv_cen2( kt )    ! 2nd order centered scheme
-!      CASE ( 2 )   ;   CALL dyn_adv_ubs ( kt )    ! 3rd order UBS      scheme
-!      !
-!      CASE (-1 )                                  ! esopa: test all possibility with control print
-!      ;                CALL dyn_keg     ( kt )
-!      ;                CALL dyn_zad     ( kt )
-!      ;                CALL dyn_adv_cen2( kt )
-!      ;                CALL dyn_adv_ubs ( kt )
-!      END SELECT
+      SELECT CASE ( nadv )                     ! compute advection trend and add it to general trend
+      CASE ( 0 )     
+                      CALL dyn_keg     ( kt )    ! vector form : horizontal gradient of kinetic energy
+                      CALL dyn_zad     ( kt )    ! vector form : vertical advection
+      CASE ( 1 ) 
+                      CALL dyn_adv_cen2( kt )    ! 2nd order centered scheme
+      CASE ( 2 )   
+                      CALL dyn_adv_ubs ( kt )    ! 3rd order UBS      scheme
+      !
+      CASE (-1 )                                 ! esopa: test all possibility with control print
+                      CALL dyn_keg     ( kt )
+                      CALL dyn_zad     ( kt )
+                      CALL dyn_adv_cen2( kt )
+                      CALL dyn_adv_ubs ( kt )
+      END SELECT
       !
    END SUBROUTINE dyn_adv

trunk/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -575 +575 @@
          ! -----------------------------------------
          SELECT CASE( kvor )      ! vorticity considered
-         CASE ( 1 )   ;   zwz(:,:) =                  ff(:,:)      ! planetary vorticity (Coriolis)
-         CASE ( 2 )   ;   zwz(:,:) =   rotn(:,:,jk)                ! relative  vorticity
+         CASE ( 1 )   ;   zwz(:,:) = ff(:,:)      * ze3f(:,:,jk)   ! planetary vorticity (Coriolis)
+         CASE ( 2 )   ;   zwz(:,:) = rotn(:,:,jk) * ze3f(:,:,jk)   ! relative  vorticity
          CASE ( 3 )                                                ! metric term
             DO jj = 1, jpjm1
@@ -585 +585 @@
                END DO
             END DO
-         CASE ( 4 )   ;   zwz(:,:) = ( rotn(:,:,jk) + ff(:,:) )    ! total (relative + planetary vorticity)
+         CASE ( 4 )   ;   zwz(:,:) = ( rotn(:,:,jk) + ff(:,:) ) * ze3f(:,:,jk) ! total (relative + planetary vorticity)
          CASE ( 5 )                                                ! total (coriolis + metric)
             DO jj = 1, jpjm1