Changeset 15157 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DOM/domzgr.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/DOM/domzgr.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DOM/domzgr.F90

@@ -224 +224 @@
       INTEGER , DIMENSION(:,:)  , INTENT(out) ::   k_top , k_bot               ! first & last ocean level
       !
-      INTEGER  ::   jk     ! dummy loop index
+      INTEGER  ::   ji,jj,jk     ! dummy loop index
       INTEGER  ::   inum   ! local logical unit
       REAL(WP) ::   z_zco, z_zps, z_sco, z_cav
@@ -249 +249 @@
       CALL iom_get( inum, 'ln_isfcav', z_cav )
       IF( z_cav == 0._wp ) THEN   ;   ld_isfcav = .false.   ;   ELSE   ;   ld_isfcav = .true.   ;   ENDIF
+      !
+      !                          !* ocean top and bottom level
+      CALL iom_get( inum, jpdom_global, 'top_level'    , z2d   )   ! 1st wet T-points (ISF)
+      k_top(:,:) = NINT( z2d(:,:) )
+      CALL iom_get( inum, jpdom_global, 'bottom_level' , z2d   )   ! last wet T-points
+      k_bot(:,:) = NINT( z2d(:,:) )
       !
       !                          !* vertical scale factors
@@ -278 +284 @@
          CALL e3_to_depth( pe3t_1d, pe3w_1d, pdept_1d, pdepw_1d )    ! 1D reference depth
          CALL e3_to_depth( pe3t   , pe3w   , pdept   , pdepw    )    ! 3D depths
+#if defined key_qco && key_isf
+!!st         IF( ln_isfcav ) THEN   ! ISF: adjust the calculation of T-point depth done in e3_to_depth subroutine
+!            pdept(:,:,1) = 0.5_wp * pe3w(:,:,1)       ! already computed by e3_to_depth
+            DO_3D( 1, 1, 1, 1, 2, jpk )                     ! vertical sum at partial cell xxxx other level 
+               IF( jk == k_top(ji,jj) ) THEN                    ! first ocean point : partial cell
+                  gdept_0(ji,jj,jk) = gdepw_0(ji,jj,jk  ) + 0.5_wp * e3w_0(ji,jj,jk)   ! = risfdep + 1/2 e3w_0(mikt)
+               ELSE                                            ! other level 
+                  gdept_0(ji,jj,jk) = gdept_0(ji,jj,jk-1) +          e3w_0(ji,jj,jk)
+               ENDIF
+            END_3D
+!!st         ENDIF
+#endif
          IF(lwp) THEN
             WRITE(numout,*)
@@ -285 +303 @@
          ENDIF
       ENDIF
-      !
-      !                          !* ocean top and bottom level
-      CALL iom_get( inum, jpdom_global, 'top_level'    , z2d   )   ! 1st wet T-points (ISF)
-      k_top(:,:) = NINT( z2d(:,:) )
-      CALL iom_get( inum, jpdom_global, 'bottom_level' , z2d   )   ! last wet T-points
-      k_bot(:,:) = NINT( z2d(:,:) )
       !
       ! reference depth for negative bathy (wetting and drying only)