Changeset 9746

Timestamp:

2018-06-06T10:57:59+02:00 (6 years ago)

Author:

mathiot

Message:

isf geometry: add comments and minor cleaning

File:

• branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (4 diffs)

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

@@ -1263 +1263 @@
       !! ** Purpose :   check the bathymetry in levels
       !!   
-      !! ** Method  :   THe water column have to contained at least 2 cells
+      !! ** Method  :   The water column have to contained at least 2 cells
       !!                Bathymetry and isfdraft are modified (dig/close) to respect
       !!                this criterion.
+      !!                          0.0 = definition of minal ice shelf draft
       !!                digging and filling base on depth criterion only
       !!                          1.0 = set iceshelf to the minimum depth allowed
@@ -1291 +1292 @@
       !
       REAL(wp) ::   zdepth, vmskjp1, vmskjm1, umskip1, umskim1, umskip1_r, umskim1_r, vmskjp1_r, vmskjm1_r
+      REAL(wp) :: zisfdep_min
       REAL(wp), POINTER, DIMENSION(:,:)   ::   zdummy, zmask, zrisfdep   ! 2D workspace (ISH)
       !
@@ -1334 +1336 @@
       END IF
       !
+      ! 0.0 variable definition of minimal ice shelf draft allowed
+      ! an ice shelf draft have to be larger than the first level thickness
+      zisfdep_min = MAX(rn_isfdep_min,e3t_1d(1))
+
       ! 1.0 set iceshelf to the minimum depth allowed
-      WHERE(risfdep(:,:) > 0.0_wp .AND. risfdep(:,:) < MAX(rn_isfdep_min,e3t_1d(1)))
-         risfdep(:,:)=rn_isfdep_min
+      WHERE(risfdep(:,:) > 0.0_wp .AND. risfdep(:,:) < zisfdep_min)
+         risfdep(:,:)=zisfdep_min
       END WHERE
       !  
@@ -1351 +1357 @@
          DO ji = 1, jpi
             IF (bathy(ji,jj)-risfdep(ji,jj) < rn_isfhw_min) THEN
-               IF ((bathy(ji,jj) - rn_isfhw_min) > MAX(rn_isfdep_min,e3t_1d(1))) THEN 
-                  risfdep(ji,jj) = bathy(ji,jj) - rn_isfhw_min
-               ELSE
+               risfdep(ji,jj) = bathy(ji,jj) - rn_isfhw_min
+               ! sanity check on risfdep (if < zisfdep_min) => we ground it 
+               IF (risfdep(ji,jj) < zisfdep_min) THEN 
                   risfdep(ji,jj)=0.0 ; misfdep(ji,jj) = 1
                   bathy  (ji,jj)=0.0 ; mbathy (ji,jj) = 0