Changeset 1662 for trunk/NEMO/OPA_SRC/TRD

Timestamp:

2009-10-14T18:51:06+02:00 (15 years ago)

Author:

rblod

Message:

Correction of major bug on bottom friction, see ticket #233

File:

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

trunk/NEMO/OPA_SRC/TRD/trdmod.F90

@@ -127 +127 @@
                      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) )
+                     ! bottom friction contribution now handled explicitly
                      !
                      ptrdx(ji,jj,1     ) = ptrdx(ji,jj,1     ) - ztswu(ji,jj)
@@ -146 +138 @@
                CALL trd_icp( ptrdx, ptrdy, jpicpd_zdf, ctype )   
                CALL trd_icp( ztswu, ztswv, jpicpd_swf, ctype )                               ! wind stress forcing term
-               CALL trd_icp( ztbfu, ztbfv, jpicpd_bfr, ctype )                               ! bottom friction term
+               ! bottom friction contribution now handled explicitly
+            CASE ( jpdyn_trd_bfr )   ;   CALL trd_icp( ptrdx, ptrdy, jpicpd_bfr, ctype )     ! bottom friction term
             END SELECT
             !