Changeset 3764 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF

Timestamp:

2013-01-23T15:33:04+01:00 (11 years ago)

Author:

smasson

Message:

dev_MERGE_2012: report bugfixes done in the trunk from r3555 to r3763 into dev_MERGE_2012

Location:

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF

Files:

• zdfbfr.F90 (modified) (8 diffs)
• zdfkpp.F90 (modified) (4 diffs)

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

@@ -18 +18 @@
    !!----------------------------------------------------------------------
    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
@@ -35 +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  ::   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
+   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_loglayer = .false.     ! switch for log layer bfr coeff. (PUBLIC for TAM)
+   REAL(wp), PUBLIC ::   rn_bfrz0    = 0.003_wp    ! bottom roughness for loglayer bfr coeff (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
@@ -70 +70 @@
       !!----------------------------------------------------------------------
       !!                   ***  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
@@ -124 +124 @@
             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)
                !
@@ -135 +135 @@
                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
@@ -156 +156 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE zdf_bfr_init  ***
-      !!                    
+      !!
       !! ** Purpose :   Initialization of the bottom friction
       !!
@@ -217 +217 @@
          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)
@@ -238 +238 @@
 
          !
-         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)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -247 +247 @@
 #if defined key_zdfddm
       REAL(wp) ::   zrrau, zds, zavdds, zavddt,zinr   ! double diffusion mixing
-      REAL(wp), POINTER, DIMENSION(:,:) ::     zdifs
-      REAL(wp), POINTER, DIMENSION(:)   ::   za2s, za3s, zkmps
+      REAL(wp), POINTER, DIMENSION(:,:)   ::     zdifs
+      REAL(wp), POINTER, DIMENSION(:)     ::   za2s, za3s, zkmps
       REAL(wp) ::                            zkm1s
-      REAL(wp), POINTER, DIMENSION(:,:) ::   zblcs
+      REAL(wp), POINTER, DIMENSION(:,:)   ::   zblcs
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   zdiffus
 #endif
@@ -266 +266 @@
       CALL wrk_alloc( jpi,4, zdepw, zdift, zvisc )
       CALL wrk_alloc( jpi,jpj, zBo, zBosol, zustar )
-      CALL wrk_alloc( jpi,jpk, zmask, zblcm, zblct, zblcs )
+      CALL wrk_alloc( jpi,jpk, zmask, zblcm, zblct )
 #if defined key_zdfddm
       CALL wrk_alloc( jpi,4, zdifs )
@@ -1081 +1081 @@
                zdiffut(ji,jj,jk) = zdiffut(ji,jj,jk) * tmask(ji,jj,jk) 
 #if defined key_zdfddm
-               zdiffus(ji,jj,jk) = ( 1.0 - zmask(ji,jk) )          * avs (ji,jj,jk) & ! interior diffusivities 
+               zdiffus(ji,jj,jk) = ( 1.0 - zmask(ji,jk) )         * avs (ji,jj,jk) & ! interior diffusivities 
                   &              +                        zflag   * zblcs(ji,jk   ) & ! boundary layer diffusivities
                   &              + zmask(ji,jk) * ( 1.0 - zflag ) * zkmps(ji      )   ! diffusivity enhancement at W_level near zhbl
-                       
                zdiffus(ji,jj,jk) = zdiffus(ji,jj,jk) * tmask(ji,jj,jk) 
 #endif               
@@ -1212 +1211 @@
       CALL wrk_dealloc( jpi,4, zdepw, zdift, zvisc )
       CALL wrk_dealloc( jpi,jpj, zBo, zBosol, zustar )
-      CALL wrk_dealloc( jpi,jpk, zmask, zblcm, zblct, zblcs )
+      CALL wrk_dealloc( jpi,jpk, zmask, zblcm, zblct )
 #if defined key_zdfddm
       CALL wrk_dealloc( jpi,4, zdifs )