Changeset 9089 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90

Timestamp:

2017-12-15T18:00:09+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: bug correction in zdfdrg + ISOMIP cfg

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (modified) (13 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90

@@ -29 +29 @@
    USE lib_mpp        ! distributed memory computing
    USE prtctl         ! Print control
-   USE timing         ! Timing
 
    IMPLICIT NONE
@@ -78 +77 @@
 CONTAINS
 
-   SUBROUTINE zdf_drg( kt, k_mk, pCdmin, pCdmax, pz0, pke0, pCd0, pCdU )
+   SUBROUTINE zdf_drg( kt, k_mk, pCdmin, pCdmax, pz0, pke0, pCd0,   &   ! <<== in 
+      &                                                     pCdU )      ! ==>> out : bottom drag [m/s]
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE zdf_drg  ***
@@ -108 +108 @@
       REAL(wp)::   zzz, zut, zvt, zcd   ! local scalars
       !!----------------------------------------------------------------------
-      !
-      IF( ln_timing )   CALL timing_start('zdf_drg')
-      !
       !
       IF( l_log_not_linssh ) THEN     !==  "log layer"  ==!   compute Cd and -Cd*|U|
@@ -123 +120 @@
                zcd = (  vkarmn / LOG( zzz / pz0 )  )**2
                zcd = pCd0(ji,jj) * MIN(  MAX( pCdmin , zcd ) , pCdmax  )   ! here pCd0 = mask*boost
-               pCdU(ji,jj) = - zcd * SQRT(  0.25 * ( zut*zvt + zvt*zvt ) + pke0  )
+               pCdU(ji,jj) = - zcd * SQRT(  0.25 * ( zut*zut + zvt*zvt ) + pke0  )
             END DO
          END DO
@@ -133 +130 @@
                zvt = vn(ji,jj,imk) + vn(ji,jj-1,imk)
                !                                                           ! here pCd0 = mask*boost * drag
-               pCdU(ji,jj) = - pCd0(ji,jj) * SQRT(  0.25 * ( zut*zvt + zvt*zvt ) + pke0  )
+               pCdU(ji,jj) = - pCd0(ji,jj) * SQRT(  0.25 * ( zut*zut + zvt*zvt ) + pke0  )
             END DO
          END DO
@@ -139 +136 @@
       !
       IF(ln_ctl)   CALL prt_ctl( tab2d_1=pCdU, clinfo1=' Cd*U ')
-      !
-      IF( ln_timing )   CALL timing_stop('zdf_drg')
       !
    END SUBROUTINE zdf_drg
@@ -200 +195 @@
       !                     !==  TOP drag setting  ==!   (applied at the top of ocean cavities)
       !
-      IF ( ln_isfcav ) THEN             ! Ocean cavities: top friction setting
+      IF( ln_isfcav ) THEN              ! Ocean cavities: top friction setting
          ALLOCATE( rCd0_top(jpi,jpj), rCdU_top(jpi,jpj) )
          CALL drg_init( 'TOP   '   , mikt       ,                                         &   ! <== in
-            &           r_Cdmin_top, r_Cdmax_top, r_z0_top, r_ke0_top, rCd0_bot, rCdU_bot )   ! ==> out
+            &           r_Cdmin_top, r_Cdmax_top, r_z0_top, r_ke0_top, rCd0_top, rCdU_top )   ! ==> out
       ENDIF
       !
@@ -223 +218 @@
       REAL(wp)                , INTENT(  out) ::   pke0            ! background KE          [m2/s2]
       REAL(wp), DIMENSION(:,:), INTENT(  out) ::   pCd0            ! masked precomputed part of the non-linear drag coefficient
-      REAL(wp), DIMENSION(:,:), INTENT(  out) ::   pCdU            ! linear drag*|U| at t-points  [m/s]
+      REAL(wp), DIMENSION(:,:), INTENT(  out) ::   pCdU            ! minus linear drag*|U| at t-points  [m/s]
       !!
       CHARACTER(len=40) ::   cl_namdrg, cl_file, cl_varname, cl_namref, cl_namcfg  ! local names 
@@ -318 +313 @@
          l_zdfdrg = .FALSE.         ! no time variation of the drag: set it one for all
          !
-         pCdU(:,:) = 0._wp          ! pCd0 never used
+         pCdU(:,:) = 0._wp
+         pCd0(:,:) = 0._wp
          !
       CASE( np_lin )             !==  linear friction  ==!   (pCdU = Cd0 * Uc0)
@@ -326 +322 @@
          l_zdfdrg = .FALSE.         ! no time variation of the Cd*|U| : set it one for all
          !                      
-         pCdU(:,:) = - rn_Cd0 * rn_Uc0 * zmsk_boost(:,:)   ! pCd0 never used: remain undefined
+         pCd0(:,:) = rn_Cd0 * zmsk_boost(:,:)  !* constant in time drag coefficient (= mask (and boost) Cd0)
+         pCdU(:,:) = - pCd0(:,:) * rn_Uc0      !  using a constant velocity
          !
       CASE( np_non_lin )         !== non-linear friction  ==!   (pCd0 = Cd0 )
@@ -337 +334 @@
          !
          pCd0(:,:) = rn_Cd0 * zmsk_boost(:,:)  !* constant in time proportionality coefficient (= mask (and boost) Cd0)
+         pCdU(:,:) = 0._wp                     !  
          !
       CASE( np_loglayer )       !== logarithmic layer formulation of friction  ==!   (CdU = (vkarman log(z/z0))^2 |U| )
@@ -349 +347 @@
          !
          IF( ln_linssh ) THEN       !* pCd0 = (v log(z/z0))^2   as velocity points have a fixed z position
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) '   N.B.   linear free surface case, Cd0 computed one for all'
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) '   N.B.   linear free surface case, Cd0 computed one for all'
             !
             l_log_not_linssh = .FALSE.    !- don't update Cd at each time step
@@ -369 +367 @@
             pCd0(:,:) = zmsk_boost(:,:)
          ENDIF
+         pCdU(:,:) = 0._wp          ! initialisation to zero (will be updated at each time step)
          !
       CASE DEFAULT