Changeset 4924 for branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

Timestamp:

2014-11-28T18:24:01+01:00 (9 years ago)

Author:

mathiot

Message:

UKM02_ice_shelves merged and SETTE tested with revision 4879 of trunk

File:

• branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (8 diffs)

branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -168 +168 @@
                !
                ! in case of 2 cell water column, we assume each cell feels the top and bottom friction
-               IF ( miku(ji,jj) + 2 .LE. mbku(ji,jj) ) THEN
+               IF ( miku(ji,jj) + 2 .GE. mbku(ji,jj) ) THEN
                   bfrua(ji,jj) = - 0.5_wp * ( ( zbfrt(ji,jj) + zbfrt(ji+1,jj  ) )   &
                                &            + ( ztfrt(ji,jj) + ztfrt(ji+1,jj  ) ) ) &
                                &          * zecu * (1._wp - umask(ji,jj,1))
                END IF
-               IF ( mikv(ji,jj) + 2 .LE. mbkv(ji,jj) ) THEN
+               IF ( mikv(ji,jj) + 2 .GE. mbkv(ji,jj) ) THEN
                   bfrva(ji,jj) = - 0.5_wp * ( ( zbfrt(ji,jj) + zbfrt(ji  ,jj+1) )   &
                                &            + ( ztfrt(ji,jj) + ztfrt(ji  ,jj+1) ) ) &
-                               &          * zecv
+                               &          * zecv * (1._wp - vmask(ji,jj,1))
                END IF
                ! (ISF) ========================================================================
@@ -194 +194 @@
                ! (ISF) END ====================================================================
                ! in case of 2 cell water column, we assume each cell feels the top and bottom friction
-               IF ( miku(ji,jj) + 2 .LE. mbku(ji,jj) ) THEN
+               IF ( miku(ji,jj) + 2 .GE. mbku(ji,jj) ) THEN
                   tfrua(ji,jj) = - 0.5_wp * ( ( ztfrt(ji,jj) + ztfrt(ji+1,jj  ) )   &
                                &            + ( zbfrt(ji,jj) + zbfrt(ji+1,jj  ) ) ) &
                                &          * zecu * (1._wp - umask(ji,jj,1))
                END IF
-               IF ( mikv(ji,jj) + 2 .LE. mbkv(ji,jj) ) THEN
+               IF ( mikv(ji,jj) + 2 .GE. mbkv(ji,jj) ) THEN
                   tfrva(ji,jj) = - 0.5_wp * ( ( ztfrt(ji,jj) + ztfrt(ji  ,jj+1) )   &
                                &            + ( zbfrt(ji,jj) + zbfrt(ji  ,jj+1) ) ) &
@@ -209 +209 @@
          !
          CALL lbc_lnk( bfrua, 'U', 1. )   ;   CALL lbc_lnk( bfrva, 'V', 1. )      ! Lateral boundary condition
-         CALL lbc_lnk( tfrua, 'U', 1. )   ;   CALL lbc_lnk( tfrva, 'V', 1. )      ! Lateral boundary condition
          !
          IF(ln_ctl)   CALL prt_ctl( tab2d_1=bfrua, clinfo1=' bfr  - u: ', mask1=umask,        &
@@ -300 +299 @@
          bfrua(:,:) = - bfrcoef2d(:,:)
          bfrva(:,:) = - bfrcoef2d(:,:)
-         !
-         IF(ln_tfr2d) THEN
-            ! tfr_coef is a coefficient in [0,1] giving the mask where to apply the bfr enhancement
-            CALL iom_open('tfr_coef.nc',inum)
-            CALL iom_get (inum, jpdom_data, 'tfr_coef',tfrcoef2d,1) ! tfrcoef2d is used as tmp array
-            CALL iom_close(inum)
-            tfrcoef2d(:,:) = rn_tfri1 * ( 1 + rn_tfrien * tfrcoef2d(:,:) )
-         ELSE
-            tfrcoef2d(:,:) = rn_tfri1  ! initialize tfrcoef2d to the namelist variable
-         ENDIF
-         !
-         tfrua(:,:) = - tfrcoef2d(:,:)
-         tfrva(:,:) = - tfrcoef2d(:,:)
          !
       CASE( 2 )
@@ -354 +340 @@
             bfrcoef2d(:,:) = rn_bfri2  ! initialize bfrcoef2d to the namelist variable
          ENDIF
-
-         IF(ln_tfr2d) THEN
-            ! tfr_coef is a coefficient in [0,1] giving the mask where to apply the bfr enhancement
-            CALL iom_open('tfr_coef.nc',inum)
-            CALL iom_get (inum, jpdom_data, 'tfr_coef',tfrcoef2d,1) ! bfrcoef2d is used as tmp array
-            CALL iom_close(inum)
-            !
-            tfrcoef2d(:,:) = rn_tfri2 * ( 1 + rn_tfrien * tfrcoef2d(:,:) )
-         ELSE
-            tfrcoef2d(:,:) = rn_tfri2  ! initialize tfrcoef2d to the namelist variable
-         ENDIF
          !
          IF ( ln_loglayer.AND.(.NOT.lk_vvl) ) THEN ! set "log layer" bottom friction once for all
@@ -381 +356 @@
                   bfrcoef2d(ji,jj) = MAX(bfrcoef2d(ji,jj), ztmp)
                   bfrcoef2d(ji,jj) = MIN(bfrcoef2d(ji,jj), rn_bfri2_max)
-                  ikbt = mikt(ji,jj)
-                  ztmp = tmask(ji,jj,ikbt) * ( vkarmn / LOG( 0.5_wp * fse3t_n(ji,jj,ikbt) / rn_tfrz0 ))**2._wp
-                  tfrcoef2d(ji,jj) = MAX(tfrcoef2d(ji,jj), ztmp)
-                  tfrcoef2d(ji,jj) = MIN(tfrcoef2d(ji,jj), rn_tfri2_max)
                END DO
             END DO
@@ -447 +418 @@
              zminbfr = MIN(  zminbfr, MIN( zfru, ABS( bfrcoef2d(ji,jj) ) )  )
              zmaxbfr = MAX(  zmaxbfr, MIN( zfrv, ABS( bfrcoef2d(ji,jj) ) )  )
-! (ISF)
-             ikbu = miku(ji,jj)       ! deepest ocean level at u- and v-points
-             ikbv = mikv(ji,jj)
-             zfru = 0.5 * fse3u(ji,jj,ikbu) / rdt
-             zfrv = 0.5 * fse3v(ji,jj,ikbv) / rdt
-             IF( ABS( tfrcoef2d(ji,jj) ) > zfru ) THEN
-                IF( ln_ctl ) THEN
-                   WRITE(numout,*) 'BFR ', narea, nimpp+ji, njmpp+jj, ikbu
-                   WRITE(numout,*) 'BFR ', ABS( tfrcoef2d(ji,jj) ), zfru
-                ENDIF
-                ictu = ictu + 1
-             ENDIF
-             IF( ABS( tfrcoef2d(ji,jj) ) > zfrv ) THEN
-                 IF( ln_ctl ) THEN
-                     WRITE(numout,*) 'BFR ', narea, nimpp+ji, njmpp+jj, ikbv
-                     WRITE(numout,*) 'BFR ', tfrcoef2d(ji,jj), zfrv
-                 ENDIF
-                 ictv = ictv + 1
-             ENDIF
-             zmintfr = MIN(  zmintfr, MIN( zfru, ABS( tfrcoef2d(ji,jj) ) )  )
-             zmaxtfr = MAX(  zmaxtfr, MIN( zfrv, ABS( tfrcoef2d(ji,jj) ) )  )
-
          END DO
       END DO
@@ -476 +425 @@
          CALL mpp_min( zminbfr )
          CALL mpp_max( zmaxbfr )
-         CALL mpp_min( zmintfr )
-         CALL mpp_max( zmaxtfr )
       ENDIF
       IF( .NOT.ln_bfrimp) THEN