Changeset 15157 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traqsr.F90

Timestamp:

2021-07-29T10:28:32+02:00 (3 years ago)

Author:

techene

Message:

#2695 isf+qco OK in both ISOMIP+ and WED025 (pass sette with and without key_qco)

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traqsr.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/traqsr.F90

@@ -786 +786 @@
       zcoef    =  zprec * rho0_rcp / ( rDt * zQmax * pfr)
       !
-      klev = jpkm1      ! Level of light extinction
-      DO jk = jpkm1, 1, -1
-         IF( SUM( tmask(:,:,jk) ) > 0 ) THEN    ! ocean point at that level
-            zdw  = MAXVAL( gdepw_0(:,:,jk+1) *       wmask(:,:,jk)         )    ! max w-depth at jk+1 level
-            ze3t = MINVAL(   e3t_0(:,:,jk  ) , mask=(wmask(:,:,jk+1)==1)   )    ! minimum e3t at jk   level
-            zhext =  - pL * LOG( zcoef * ze3t )                                 ! extinction depth
-            IF( zdw >= zhext )   klev = jk                                      ! last T-level reached by Qsr
-         ELSE                                   ! only land point at level jk
-            klev = jk                                                           ! local domain sea-bed level 
-         ENDIF
-      END DO
+      IF( ln_zco .OR. ln_zps ) THEN      ! z- or zps coordinate (use 1D ref vertcial coordinate)
+         klev = jpkm1                              ! Level of light extinction zco / zps
+         DO jk = jpkm1, 1, -1
+            zdw  = gdepw_1d(jk+1)                  ! max w-depth at jk+1 level
+            ze3t =   e3t_1d(jk  )                  ! minimum e3t at jk   level
+            zhext =  - pL * LOG( zcoef * ze3t )    ! extinction depth
+            IF( zdw >= zhext )   klev = jk         ! last T-level reached by Qsr
+         END DO
+      ELSE                               ! s- or s-z- coordinate (use 3D vertical coordinate)
+         klev = jpkm1                              ! Level of light extinction 
+         DO jk = jpkm1, 1, -1    ! 
+            IF( SUM( tmask(:,:,jk) ) > 0 ) THEN    ! ocean point at that level
+               zdw  = MAXVAL( gdepw_0(:,:,jk+1) *       wmask(:,:,jk)         )    ! max w-depth at jk+1 level
+               ze3t = MINVAL(   e3t_0(:,:,jk  ) , mask=(wmask(:,:,jk+1)==1)   )    ! minimum e3t at jk   level
+               zhext =  - pL * LOG( zcoef * ze3t )                                 ! extinction depth
+               IF( zdw >= zhext )   klev = jk                                      ! last T-level reached by Qsr
+            ELSE                                   ! only land point at level jk
+               klev = jk                                                           ! local domain sea-bed level 
+            ENDIF
+         END DO
+         CALL mpp_max('tra_qsr', klev)             ! needed for reproducibility   !!st may be modified to avoid this comm.
+         !                                                                        !!st use ssmask to remove the comm ?
+      ENDIF
       !
 !!st      IF(lwp) WRITE(numout,*) '                level of e3t light extinction = ', klev, ' ref depth = ', gdepw_1d(klev+1), ' m'
-!!st      !
-!!st      klev = jpkm1      ! Level of light extinction
-!!st      DO jk = jpkm1, 1, -1
-!!st         IF( SUM( tmask(:,:,jk) ) > 0 ) THEN    ! ocean point at that level
-!!st            zdw  = MAXVAL( gdepw_0(:,:,jk+1) * wmask(:,:,jk) )    ! max w-depth at jk+1 level
-!!st            ze3t = MINVAL(   e3t_0(:,:,jk  )                 )    ! minimum e3t at jk   level
-!!st            zhext =  - pL * LOG( zcoef * pL )                   ! extinction depth
-!!st            IF( zdw >= zhext )   klev = jk                        ! last T-level reached by Qsr
-!!st         ELSE                                   ! only land point at level jk
-!!st            klev = jk                                             ! local domain sea-bed level 
-!!st         ENDIF
-!!st      END DO
-!!st      !
-!!st      IF(lwp) WRITE(numout,*) '                level of pL light extinction = ', klev, ' ref depth = ', gdepw_1d(klev+1), ' m'
-      !
    END FUNCTION qsr_ext_lev