Changeset 11568 for NEMO/branches/2019/ENHANCE-02_ISF_domcfg

Timestamp:

2019-09-18T17:52:11+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF: fix compatibility issue between rn_hmin and ice shelf (ticket #2142)

Location:

NEMO/branches/2019/ENHANCE-02_ISF_domcfg/src

Files:

• domisf.F90 (modified) (4 diffs)
• domzgr.F90 (modified) (1 diff)

NEMO/branches/2019/ENHANCE-02_ISF_domcfg/src/domisf.F90

@@ -122 +122 @@
       ! 1.1 ground ice shelf if water column less than rn_glhw_min m 
       ! => set the grounding line position
-      WHERE( bathy(:,:) - risfdep(:,:) < rn_glhw_min ) 
+      WHERE( bathy(:,:) - risfdep(:,:) < rn_glhw_min .AND. risfdep(:,:) > 0.0_wp ) 
          bathy  (:,:) = 0._wp ; risfdep(:,:) = 0._wp
       END WHERE
@@ -130 +130 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            IF ( bathy(ji,jj) - risfdep(ji,jj) < rn_isfhw_min ) THEN
+            IF ( bathy(ji,jj) - risfdep(ji,jj) < rn_isfhw_min .AND. risfdep(ji,jj) > 0.0_wp ) THEN
                risfdep(ji,jj) = bathy(ji,jj) - rn_isfhw_min
                ! sanity check on risfdep (if < zisfdep_min)
@@ -145 +145 @@
       IF (ln_isfchannel) THEN
          imask(:,:) = 0
-         WHERE ( bathy(:,:) > 0._wp .AND. risfdep(:,:) > 0._wp )
+         WHERE ( bathy(:,:) > 0._wp )
             imask(:,:) = 1
          END WHERE
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               IF( imask(ji,jj) == 1 ) THEN
+               IF( imask(ji,jj) == 1 .AND. risfdep(ji,jj) > 0._wp) THEN
                   ! define connexion
                   imskip1=imask(ji,jj)*imask(ji+1,jj  )  ! 1 = connexion
@@ -507 +507 @@
                gdept_0(ji,jj,ik-1) = gdept_0(ji,jj,ik) - e3w_0(ji,jj,ik)
                gdepw_0(ji,jj,ik-1) = gdepw_0(ji,jj,ik) - e3t_0(ji,jj,ik-1)
+               IF ( ik > 2 ) THEN
+                  e3w_0  (ji,jj,ik-1) = gdept_0(ji,jj,ik-1) - gdept_0(ji,jj,ik-2)
+               ELSE
+                  e3w_0  (ji,jj,ik-1) = 2.0 * gdept_0(ji,jj,ik-1)
+               END IF
             ENDIF
          END DO

NEMO/branches/2019/ENHANCE-02_ISF_domcfg/src/domzgr.F90

@@ -612 +612 @@
          zhmin = gdepw_1d(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
+         ELSE WHERE ( risfdep == 0._wp );   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