Changeset 11248 for branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2019-07-10T19:01:37+02:00 (5 years ago)

Author:

mathiot

Message:

add condition to fill isolated grid point in the bathymetry in zgr_isf to ensure compatibility with ice shelf draft and properly mask bathy,risfdep,mbathy,misfdep after filling subglacial lakes

File:

• branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (2 diffs)

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -201 +201 @@
          END DO  
       END DO  
+      !
+      ! (ISF) define barotropic mask and mask the ice shelf point
+      DO jj = 1, jpj
+         DO ji = 1, jpi   ! vector loop
+            ssmask(ji,jj)  = MIN(1._wp,SUM(tmask(ji,jj,:)))
+         END DO
+      END DO
       !
       IF ( ln_isfsubgl ) THEN
@@ -222 +229 @@
             WHERE (tmask(:,:,jk) < 0) tmask(:,:,jk) = 1 ! restore mask value
          END DO
+         ! update ssmask
+         DO jj = 1, jpj
+            DO ji = 1, jpi   ! vector loop
+               ssmask(ji,jj)  = MIN(1._wp,SUM(tmask(ji,jj,:)))
+            END DO
+         END DO
+         ! update mbathy, misfdep, bathy, risfdep
+         bathy(:,:)   = bathy(:,:)   * ssmask(:,:)
+         risfdep(:,:) = risfdep(:,:) * ssmask(:,:)
+         WHERE ( ssmask(:,:) == 0._wp )
+            misfdep(:,:) = 1
+            mbathy(:,:)  = 0
+         END WHERE
       END IF
 
-      ! (ISF) define barotropic mask and mask the ice shelf point
-      DO jj = 1, jpj
-         DO ji = 1, jpi   ! vector loop
-            ssmask(ji,jj)  = MIN(1._wp,SUM(tmask(ji,jj,:)))
-         END DO
-      END DO
 !!gm  ????
 #if defined key_zdfkpp