Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90 (modified) (6 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90

@@ -4 +4 @@
    !! Ocean dynamics :  bottom friction component of the momentum mixing trend
    !!==============================================================================
-   !! History :  9.0  !  2008-11  (A. C. Coward)  Original code
+   !! History :  3.2  ! 2008-11  (A. C. Coward)  Original code
    !!----------------------------------------------------------------------
 
@@ -13 +13 @@
    USE dom_oce         ! ocean space and time domain variables 
    USE zdf_oce         ! ocean vertical physics variables
-   USE zdfbfr          ! bottom friction
 
    USE trdmod          ! ocean active dynamics and tracers trends 
@@ -30 +29 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
-   !! $Id: dynzdf.F90 1152 2008-06-26 14:11:13Z rblod $
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! $Id$
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
    
@@ -45 +43 @@
       !! ** Action  :   (ua,va)   momentum trend increased by bottom friction trend
       !!---------------------------------------------------------------------
-      USE oce, ONLY :   ztrdu => ta   ! use ta as 3D workspace
-      USE oce, ONLY :   ztrdv => sa   ! use sa as 3D workspace
+      USE oce, ONLY :   ztrduv => tsa   ! use tsa as 4D workspace
       !!
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !! 
-      INTEGER  ::   ji, jj          ! dummy loop indexes
-      INTEGER  ::   ikbu  , ikbv    ! temporary integers
-      INTEGER  ::   ikbum1, ikbvm1  !    -          -
-      REAL(wp) ::   zinv, zbfru, zbfrv   ! temporary scalar
+      INTEGER  ::   ji, jj       ! dummy loop indexes
+      INTEGER  ::   ikbu, ikbv   ! local integers
+      REAL(wp) ::   zm1_2dt      ! local scalar
       !!---------------------------------------------------------------------
       !
-      zinv = -1. / ( 2.*rdt )
+      zm1_2dt = - 1._wp / ( 2._wp * rdt )
 
       IF( l_trddyn )   THEN                      ! temporary save of ua and va trends
-         ztrdu(:,:,:) = ua(:,:,:)
-         ztrdv(:,:,:) = va(:,:,:)
+         ztrduv(:,:,:,1) = ua(:,:,:)
+         ztrduv(:,:,:,2) = va(:,:,:)
       ENDIF
 
@@ -70 +66 @@
          DO ji = 2, jpim1
 # endif
-            ikbu = MIN( mbathy(ji+1,jj), mbathy(ji,jj) )
-            ikbv = MIN( mbathy(ji,jj+1), mbathy(ji,jj) )
-            ikbum1 = MAX( ikbu-1, 1 )
-            ikbvm1 = MAX( ikbv-1, 1 )
+            ikbu = mbku(ji,jj)          ! deepest ocean u- & v-levels
+            ikbv = mbkv(ji,jj)
             !
-            ! Apply stability criteria on absolute value  : Min abs(bfr) => Max (bfr)
-            zbfru = MAX( bfrua(ji,jj), fse3u(ji,jj,ikbum1)*zinv )
-            zbfrv = MAX( bfrva(ji,jj), fse3v(ji,jj,ikbvm1)*zinv )
-            !
-            ua(ji,jj,ikbum1) = ua(ji,jj,ikbum1) + zbfru * ub(ji,jj,ikbum1) / fse3u(ji,jj,ikbum1)
-            va(ji,jj,ikbvm1) = va(ji,jj,ikbvm1) + zbfrv * vb(ji,jj,ikbvm1) / fse3v(ji,jj,ikbvm1)
-            !
+            ! Apply stability criteria on absolute value  : abs(bfr/e3) < 1/(2dt) => bfr/e3 > -1/(2dt)
+            ua(ji,jj,ikbu) = ua(ji,jj,ikbu) + MAX(  bfrua(ji,jj) / fse3u(ji,jj,ikbu) , zm1_2dt  ) * ub(ji,jj,ikbu)
+            va(ji,jj,ikbv) = va(ji,jj,ikbv) + MAX(  bfrua(ji,jj) / fse3v(ji,jj,ikbu) , zm1_2dt  ) * vb(ji,jj,ikbv)
          END DO
       END DO
@@ -87 +77 @@
       !
       IF( l_trddyn )   THEN                      ! save the vertical diffusive trends for further diagnostics
-         ztrdu(:,:,:) = ua(:,:,:) - ztrdu(:,:,:)
-         ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
-         CALL trd_mod( ztrdu, ztrdv, jpdyn_trd_bfr, 'DYN', kt )
+         ztrduv(:,:,:,1) = ua(:,:,:) - ztrduv(:,:,:,1)
+         ztrduv(:,:,:,2) = va(:,:,:) - ztrduv(:,:,:,2)
+         CALL trd_mod( ztrduv(:,:,:,1), ztrduv(:,:,:,2), jpdyn_trd_bfr, 'DYN', kt )
       ENDIF
       !                                          ! print mean trends (used for debugging)