Changeset 15152 for NEMO/branches/UKMO/tools_r4.0-HEAD_dev_MEs

Timestamp:

2021-07-27T17:02:19+02:00 (3 years ago)

Author:

dbruciaferri

Message:

bug fixing to reproduce NEMO 3.6 results

File:

• NEMO/branches/UKMO/tools_r4.0-HEAD_dev_MEs/DOMAINcfg/src/domzgr.f90 (modified) (2 diffs)

NEMO/branches/UKMO/tools_r4.0-HEAD_dev_MEs/DOMAINcfg/src/domzgr.f90

@@ -617 +617 @@
       IF( nn_closea == 0 )   CALL clo_bat( bathy, mbathy )    !==  NO closed seas or lakes  ==!
       !                       
-      IF ( (.not. ln_sco) .OR. (.not. ln_mes) ) THEN          !==  set a minimum depth  ==!
+      IF ( (.not. ln_sco) .AND. (.not. ln_mes) ) THEN          !==  set a minimum depth  ==!
          IF( rn_hmin < 0._wp ) THEN    ;   ik = - INT( rn_hmin )                                      ! from a nb of level
          ELSE                          ;   ik = MINLOC( gdepw_1d, mask = gdepw_1d > rn_hmin, dim = 1 )  ! from a depth
@@ -1990 +1990 @@
                   iim1 = MAX( ji-1, 1 )
                   ijm1 = MAX( jj-1, 1 )
-!!gm BUG fix see ticket #1617
-                  IF( ( + bathy(iim1,ijm1) + bathy(ji,ijp1) + bathy(iip1,ijp1)              &
+!!DB to reproduce R&D suite
+                  IF( ( + bathy(iim1,ijp1) + bathy(ji,ijp1) + bathy(iip1,ijp1)              &
                      &  + bathy(iim1,jj  )                  + bathy(iip1,jj  )              &
                      &  + bathy(iim1,ijm1) + bathy(ji,ijm1) + bathy(iip1,ijp1)  ) > 0._wp ) &