Changeset 9342

Timestamp:

2018-02-21T12:16:04+01:00 (6 years ago)

Author:

mathiot

Message:

condition to detect grounding line for deep isf overwrite in some case the one for shallow isf

Location:

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (5 diffs)

branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -121 +121 @@
 !-----------------------------------------------------------------------
    rn_isfdep_min    = 10.         ! minimum isf draft tickness (if lower, isf draft set to this value)
-   rn_isfhw_deep    = 1.e-3       ! minimum water column thickness to declare a column 'wet'
+   rn_isfhw_deep    = 1.e-3       ! minimum water column thickness to declare a column 'wet' in case of deep isf
    rn_isfshallow    = 0.0         ! bathy between surface and rn_isfshallow are declared shallow
    rn_isfhw_shallow = 1.e-3       ! minimum water column thickness to declare a column 'wet' in case of shallow isf

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

@@ -395 +395 @@
       IF(lwp) WRITE(numout,*) '    zgr_bat : defines level and meter bathymetry'
       IF(lwp) WRITE(numout,*) '    ~~~~~~~'
+      !
+      ! (ISF) initialisation ice shelf draft and top level
+      risfdep(:,:)=0._wp
+      misfdep(:,:)=1
       !                                               ! ================== ! 
       IF( ntopo == 0 .OR. ntopo == -1 ) THEN          !   defined by hand  !
@@ -484 +488 @@
             END DO
          END DO
-         risfdep(:,:)=0.e0
-         misfdep(:,:)=1
          !
          DEALLOCATE( idta, zdta )
@@ -535 +537 @@
             CALL iom_close( inum )
             !                                                
-            risfdep(:,:)=0._wp         
-            misfdep(:,:)=1             
             IF ( ln_isfcav ) THEN
                CALL iom_open ( 'isf_draft_meter.nc', inum ) 
@@ -1337 +1337 @@
       !  
       ! 1.1 ground ice shelf if water column less than X m
-      WHERE( bathy(:,:) - risfdep(:,:) < rn_isfhw_deep ) 
+      WHERE( bathy(:,:) - risfdep(:,:) < rn_isfhw_deep .AND. (bathy(:,:) > rn_isfshallow) ) 
          risfdep(:,:)=0.0 ; misfdep(:,:) = 1
          bathy  (:,:)=0.0 ; mbathy (:,:) = 0
@@ -1343 +1343 @@
       !
       ! 1.2 ensure a minimum thickness for iceshelf cavity in shallow water
-      WHERE( (bathy(:,:) < rn_isfshallow) .AND. (bathy(:,:) - risfdep(:,:) < rn_isfhw_shallow) ) 
+      WHERE( (bathy(:,:) <= rn_isfshallow) .AND. (bathy(:,:) - risfdep(:,:) < rn_isfhw_shallow) ) 
          risfdep(:,:)=0.0 ; misfdep(:,:) = 1
          bathy  (:,:)=0.0 ; mbathy (:,:) = 0