Changeset 2536 for trunk/NEMOGCM/NEMO

Timestamp:

2010-12-30T17:17:43+01:00 (13 years ago)

Author:

rblod

Message:

correct a bug in domzgr, see ticket #783

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 = ABS(INT( rn_hmin ))                                   ! from a nb of level
+      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(:,:) = MIN(  zhmin , bathy(:,:)  )   ! min=zhmin over the oceans
+      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