Changeset 3598 for trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

Timestamp:

2012-11-19T14:35:09+01:00 (11 years ago)

Author:

rblod

Message:

Change of some variable range for TAM in 3.4 - Ticket #1004

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (8 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -16 +16 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers variables
-   USE dom_oce         ! ocean space and time domain variables 
+   USE dom_oce         ! ocean space and time domain variables
    USE zdf_oce         ! ocean vertical physics variables
    USE in_out_manager  ! I/O manager
@@ -31 +31 @@
 
    !                                    !!* 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 , PUBLIC ::   nn_bfr    = 0           ! = 0/1/2/3 type of bottom friction  (PUBLIC for TAM)
+   REAL(wp), PUBLIC ::   rn_bfri1  = 4.0e-4_wp   ! bottom drag coefficient (linear case)  (PUBLIC for TAM)
+   REAL(wp), PUBLIC ::   rn_bfri2  = 1.0e-3_wp   ! bottom drag coefficient (non linear case) (PUBLIC for TAM)
+   REAL(wp), PUBLIC ::   rn_bfeb2  = 2.5e-3_wp   ! background bottom turbulent kinetic energy  [m2/s2] (PUBLIC for TAM)
+   REAL(wp), PUBLIC ::   rn_bfrien = 30._wp      ! local factor to enhance coefficient bfri (PUBLIC for TAM)
+   LOGICAL , PUBLIC ::   ln_bfr2d  = .false.     ! logical switch for 2D enhancement (PUBLIC for TAM)
+   LOGICAL , PUBLIC                                    ::  ln_bfrimp = .false.  ! logical switch for implicit bottom friction
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:), PUBLIC ::  bfrcoef2d            ! 2D bottom drag coefficient (PUBLIC for TAM)
 
    !! * Substitutions
@@ -64 +64 @@
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE zdf_bfr  ***
-      !!                 
+      !!
       !! ** Purpose :   compute the bottom friction coefficient.
       !!
-      !! ** Method  :   Calculate and store part of the momentum trend due    
-      !!              to bottom friction following the chosen friction type 
+      !! ** Method  :   Calculate and store part of the momentum trend due
+      !!              to bottom friction following the chosen friction type
       !!              (free-slip, linear, or quadratic). The component
       !!              calculated here is multiplied by the bottom velocity in
@@ -102 +102 @@
             DO ji = 2, jpim1
 # endif
-               ikbu = mbku(ji,jj)         ! ocean bottom level at u- and v-points 
+               ikbu = mbku(ji,jj)         ! ocean bottom level at u- and v-points
                ikbv = mbkv(ji,jj)         ! (deepest ocean u- and v-points)
                !
@@ -113 +113 @@
                zecv = SQRT(  vn(ji,jj,ikbv) * vn(ji,jj,ikbv) + zuv*zuv + rn_bfeb2  )
                !
-               bfrua(ji,jj) = - 0.5_wp * ( bfrcoef2d(ji,jj) + bfrcoef2d(ji+1,jj  ) ) * zecu 
+               bfrua(ji,jj) = - 0.5_wp * ( bfrcoef2d(ji,jj) + bfrcoef2d(ji+1,jj  ) ) * zecu
                bfrva(ji,jj) = - 0.5_wp * ( bfrcoef2d(ji,jj) + bfrcoef2d(ji  ,jj+1) ) * zecv
             END DO
@@ -133 +133 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE zdf_bfr_init  ***
-      !!                    
+      !!
       !! ** Purpose :   Initialization of the bottom friction
       !!
@@ -193 +193 @@
          bfrcoef2d(:,:) = rn_bfri1  ! initialize bfrcoef2d to the namelist variable
          !
-         IF(ln_bfr2d) THEN 
+         IF(ln_bfr2d) THEN
             ! bfr_coef is a coefficient in [0,1] giving the mask where to apply the bfr enhancement
             CALL iom_open('bfr_coef.nc',inum)
@@ -213 +213 @@
          bfrcoef2d(:,:) = rn_bfri2  ! initialize bfrcoef2d to the namelist variable
          !
-         IF(ln_bfr2d) THEN 
+         IF(ln_bfr2d) THEN
             ! bfr_coef is a coefficient in [0,1] giving the mask where to apply the bfr enhancement
             CALL iom_open('bfr_coef.nc',inum)