Changeset 1708 for trunk/NEMO/OPA_SRC/TRD/trdmod.F90

Timestamp:

2009-11-04T14:24:34+01:00 (15 years ago)

Author:

rblod

Message:

Stability for explicit bottom friction, see ticket #588

File:

• trunk/NEMO/OPA_SRC/TRD/trdmod.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -57 +57 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( inout ) ::   ptrdy ! Salinity    or V trend
       !!
-      INTEGER ::   ji, ikbu, ikbum1
-      INTEGER ::   jj, ikbv, ikbvm1
+      INTEGER ::   ji, jj
       CHARACTER(len=3) ::   ccpas                                  ! number of passage
-      REAL(wp) ::   zua, zva                                       ! scalars
       REAL(wp), DIMENSION(jpi,jpj) ::   ztswu, ztswv               ! 2D workspace
       REAL(wp), DIMENSION(jpi,jpj) ::   ztbfu, ztbfv               ! 2D workspace
@@ -131 +129 @@
                      ptrdx(ji,jj,1     ) = ptrdx(ji,jj,1     ) - ztswu(ji,jj)
                      ptrdy(ji,jj,1     ) = ptrdy(ji,jj,1     ) - ztswv(ji,jj)
-                     ptrdx(ji,jj,ikbum1) = ptrdx(ji,jj,ikbum1) - ztbfu(ji,jj)
-                     ptrdy(ji,jj,ikbvm1) = ptrdy(ji,jj,ikbvm1) - ztbfv(ji,jj)
                   END DO
                END DO
@@ -172 +168 @@
                   ztswu(ji,jj) = utau(ji,jj) / ( fse3u(ji,jj,1)*rau0 )
                   ztswv(ji,jj) = vtau(ji,jj) / ( fse3v(ji,jj,1)*rau0 )
-                  ! save bottom friction momentum fluxes
-                  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 )
-                  zua = ua(ji,jj,ikbum1) * r2dt + ub(ji,jj,ikbum1)
-                  zva = va(ji,jj,ikbvm1) * r2dt + vb(ji,jj,ikbvm1)
-                  ztbfu(ji,jj) = - avmu(ji,jj,ikbu) * zua / ( fse3u(ji,jj,ikbum1)*fse3uw(ji,jj,ikbu) )
-                  ztbfv(ji,jj) = - avmv(ji,jj,ikbv) * zva / ( fse3v(ji,jj,ikbvm1)*fse3vw(ji,jj,ikbv) )
                   !
                   ptrdx(ji,jj,1     ) = ptrdx(ji,jj,1     ) - ztswu(ji,jj)
-                  ptrdx(ji,jj,ikbum1) = ptrdx(ji,jj,ikbum1) - ztbfu(ji,jj)
                   ptrdy(ji,jj,1     ) = ptrdy(ji,jj,1     ) - ztswv(ji,jj)
-                  ptrdy(ji,jj,ikbvm1) = ptrdy(ji,jj,ikbvm1) - ztbfv(ji,jj)
                END DO
             END DO
@@ -191 +176 @@
             CALL trd_vor_zint( ptrdx, ptrdy, jpvor_zdf )   
             CALL trd_vor_zint( ztswu, ztswv, jpvor_swf )                               ! Wind stress forcing term
-            CALL trd_vor_zint( ztbfu, ztbfv, jpvor_bfr )                               ! Bottom friction term
+         CASE ( jpdyn_trd_bfr )
+            CALL trd_vor_zint( ptrdx, ptrdy, jpvor_bfr )                               ! Bottom friction term
          END SELECT
          !