Changeset 2712

Timestamp:

2011-03-29T13:41:29+02:00 (13 years ago)

Author:

rfurner

Message:

bug fix for s coordinates and use of rn_hmin

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -500 +500 @@
       !                                               !     set a minimum depth     !
       !                                               ! =========================== !
-      IF( rn_hmin < 0._wp ) THEN    ;   ik = - INT( rn_hmin )                                      ! from a nb of level
-      ELSE                          ;   ik = MINLOC( gdepw_0, mask = gdepw_0 > rn_hmin, dim = 1 )  ! from a depth
-      ENDIF
-      zhmin = gdepw_0(ik+1)                                                         ! minimum depth = ik+1 w-levels 
-      WHERE( bathy(:,:) <= 0._wp )   ;   bathy(:,:) = 0._wp                         ! min=0     over the lands
-      ELSE WHERE                     ;   bathy(:,:) = MAX(  zhmin , bathy(:,:)  )   ! min=zhmin over the oceans
-      END WHERE
-      IF(lwp) write(numout,*) 'Minimum ocean depth: ', zhmin, ' minimum number of ocean levels : ', ik
+      IF ( .not. ln_sco ) THEN
+         IF( rn_hmin < 0._wp ) THEN    ;   ik = - INT( rn_hmin )                                      ! from a nb of level
+         ELSE                          ;   ik = MINLOC( gdepw_0, mask = gdepw_0 > rn_hmin, dim = 1 )  ! from a depth
+         ENDIF
+         zhmin = gdepw_0(ik+1)                                                         ! minimum depth = ik+1 w-levels 
+         WHERE( bathy(:,:) <= 0._wp )   ;   bathy(:,:) = 0._wp                         ! min=0     over the lands
+         ELSE WHERE                     ;   bathy(:,:) = MAX(  zhmin , bathy(:,:)  )   ! min=zhmin over the oceans
+         END WHERE
+         IF(lwp) write(numout,*) 'Minimum ocean depth: ', zhmin, ' minimum number of ocean levels : ', ik
+      ENDIF
       !
    END SUBROUTINE zgr_bat