Changeset 3633 for branches

Timestamp:

2012-11-22T18:12:53+01:00 (11 years ago)

Author:

acc

Message:

Branch dev_NOC_2012_r3555. #1006. Step 10: merge in changes from the 2012/dev_r3452_NOCL06_LOGLAYER branch

Location:

branches/2012/dev_NOC_2012_rev3555/NEMOGCM

Files:

• CONFIG/AMM12/EXP00/namelist (modified) (1 diff)
• NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (8 diffs)

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/CONFIG/AMM12/EXP00/namelist

@@ -511 +511 @@
    rn_bfrien   =    50.    !  local multiplying factor of bfr (ln_bfr2d=T)
    ln_bfrimp   = .true.    !  implicit bottom friction (requires ln_zdfexp = .false. if true)
+   ln_loglayer = .false.   !  loglayer bottom friction (only effect when nn_bfr = 2)
+   rn_bfrz0    =    0.003  !  bottom roughness (only effect when ln_loglayer = .true.)
 /
 !-----------------------------------------------------------------------

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -8 +8 @@
    !!            3.2  ! 2009-09  (A.C.Coward)  Correction to include barotropic contribution
    !!            3.3  ! 2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
+   !!            3.4  ! 2011-11  (H. Liu) implementation of semi-implicit bottom friction option
+   !!                 ! 2012-06  (H. Liu) implementation of Log Layer bottom friction option
    !!----------------------------------------------------------------------
 
@@ -24 +26 @@
    USE timing          ! Timing
 
+   USE phycst, ONLY: vkarmn
+
    IMPLICIT NONE
    PRIVATE
@@ -31 +35 @@
 
    !                                    !!* Namelist nambfr: bottom friction namelist *
-   INTEGER  ::   nn_bfr    = 0           ! = 0/1/2/3 type of bottom friction 
-   REAL(wp) ::   rn_bfri1  = 4.0e-4_wp   ! bottom drag coefficient (linear case) 
-   REAL(wp) ::   rn_bfri2  = 1.0e-3_wp   ! bottom drag coefficient (non linear case)
-   REAL(wp) ::   rn_bfeb2  = 2.5e-3_wp   ! background bottom turbulent kinetic energy  [m2/s2]
-   REAL(wp) ::   rn_bfrien = 30._wp      ! local factor to enhance coefficient bfri
-   LOGICAL  ::   ln_bfr2d  = .false.     ! logical switch for 2D enhancement
-   LOGICAL , PUBLIC                            ::  ln_bfrimp = .false.  ! logical switch for implicit bottom friction
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  bfrcoef2d            ! 2D bottom drag coefficient
+   INTEGER  ::   nn_bfr      = 0           ! = 0/1/2/3 type of bottom friction 
+   REAL(wp) ::   rn_bfri1    = 4.0e-4_wp   ! bottom drag coefficient (linear case) 
+   REAL(wp) ::   rn_bfri2    = 1.0e-3_wp   ! bottom drag coefficient (non linear case)
+   REAL(wp) ::   rn_bfeb2    = 2.5e-3_wp   ! background bottom turbulent kinetic energy  [m2/s2]
+   REAL(wp) ::   rn_bfrien   = 30._wp      ! local factor to enhance coefficient bfri
+   LOGICAL  ::   ln_bfr2d    = .false.     ! logical switch for 2D enhancement
+   LOGICAL  ::   ln_loglayer = .false.     ! switch for log layer bfr coeff.
+   REAL(wp) ::   rn_bfrz0    = 0.003_wp    ! bottom roughness for loglayer bfr coeff
+   LOGICAL , PUBLIC                            ::  ln_bfrimp   = .false.  ! switch for implicit bottom friction
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  bfrcoef2d              ! 2D bottom drag coefficient
 
    !! * Substitutions
@@ -79 +85 @@
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
       !!
-      INTEGER  ::   ji, jj       ! dummy loop indices
-      INTEGER  ::   ikbu, ikbv   ! local integers
-      REAL(wp) ::   zvu, zuv, zecu, zecv   ! temporary scalars
+      INTEGER  ::   ji, jj                       ! dummy loop indices
+      INTEGER  ::   ikbu, ikbv                   ! local integers
+      REAL(wp) ::   zvu, zuv, zecu, zecv, ztmp   ! temporary scalars
       !!----------------------------------------------------------------------
       !
@@ -92 +98 @@
          ! where -F_h/e3U_bot = bfrUa*Ub/e3U_bot {U=[u,v]}
          !
+
+         IF(ln_loglayer) THEN       ! "log layer" bottom friction coefficient
+#  if defined key_vectopt_loop
+           DO jj = 1, 1
+             DO ji = 1, jpij   ! vector opt. (forced unrolling)
+#  else
+           DO jj = 1, jpj
+             DO ji = 1, jpi
+#  endif
+                ztmp = 0.5_wp * fse3t(ji,jj,mbkt(ji,jj))
+                ztmp = max(ztmp, rn_bfrz0)
+                bfrcoef2d(ji,jj) = ( log( ztmp / rn_bfrz0 ) / vkarmn ) ** (-2)
+             END DO
+           END DO
+         ENDIF
+
 # if defined key_vectopt_loop
          DO jj = 1, 1
@@ -117 +139 @@
             END DO
          END DO
+
          !
          CALL lbc_lnk( bfrua, 'U', 1. )   ;   CALL lbc_lnk( bfrva, 'V', 1. )      ! Lateral boundary condition
@@ -141 +164 @@
       USE iom   ! I/O module for ehanced bottom friction file
       !!
-      INTEGER ::   inum         ! logical unit for enhanced bottom friction file
-      INTEGER ::   ji, jj       ! dummy loop indexes
-      INTEGER ::   ikbu, ikbv   ! temporary integers
-      INTEGER ::   ictu, ictv   !    -          -
-      REAL(wp) ::  zminbfr, zmaxbfr   ! temporary scalars
-      REAL(wp) ::  zfru, zfrv         !    -         -
-      !!
-      NAMELIST/nambfr/ nn_bfr, rn_bfri1, rn_bfri2, rn_bfeb2, ln_bfr2d, rn_bfrien, ln_bfrimp
+      INTEGER   ::   inum         ! logical unit for enhanced bottom friction file
+      INTEGER   ::   ji, jj       ! dummy loop indexes
+      INTEGER   ::   ikbu, ikbv   ! temporary integers
+      INTEGER   ::   ictu, ictv   !    -          -
+      REAL(wp)  ::   zminbfr, zmaxbfr   ! temporary scalars
+      REAL(wp)  ::   zfru, zfrv         !    -         -
+      !!
+      NAMELIST/nambfr/ nn_bfr, rn_bfri1, rn_bfri2, rn_bfeb2, rn_bfrz0, ln_bfr2d, &
+                    &  rn_bfrien, ln_bfrimp, ln_loglayer
       !!----------------------------------------------------------------------
       !
@@ -212 +236 @@
          ENDIF
          bfrcoef2d(:,:) = rn_bfri2  ! initialize bfrcoef2d to the namelist variable
+
          !
          IF(ln_bfr2d) THEN