Changeset 5932 for branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2015-11-26T18:25:42+01:00 (8 years ago)

Author:

mathiot

Message:

ice sheet coupling: cosmetic changes + rm duplicate sanity check on isf draft + namelist issues

File:

• branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (2 diffs)

branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -574 +574 @@
       !                       
       IF ( .not. ln_sco ) THEN                                !==  set a minimum depth  ==!
-         ! patch to avoid case bathy = ice shelf draft and bathy between 0 and zhmin
-         IF ( ln_isfcav ) THEN
-            WHERE ( bathy == risfdep )
-               bathy   = 0.0_wp ; risfdep = 0.0_wp
-            END WHERE
-         END IF
-         ! end patch
          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
@@ -1234 +1227 @@
       CALL wrk_alloc( jpi, jpj, zbathy, zmask, zrisfdep)
       CALL wrk_alloc( jpi, jpj, zmisfdep, zmbathy )
-
 
       ! (ISF) compute misfdep