Changeset 9746


Ignore:
Timestamp:
2018-06-06T10:57:59+02:00 (2 years ago)
Author:
mathiot
Message:

isf geometry: add comments and minor cleaning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_isf_remapping_UKESM_GO6package_r9314/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    r9732 r9746  
    12631263      !! ** Purpose :   check the bathymetry in levels 
    12641264      !!    
    1265       !! ** Method  :   THe water column have to contained at least 2 cells 
     1265      !! ** Method  :   The water column have to contained at least 2 cells 
    12661266      !!                Bathymetry and isfdraft are modified (dig/close) to respect 
    12671267      !!                this criterion. 
     1268      !!                          0.0 = definition of minal ice shelf draft 
    12681269      !!                digging and filling base on depth criterion only 
    12691270      !!                          1.0 = set iceshelf to the minimum depth allowed 
     
    12911292      ! 
    12921293      REAL(wp) ::   zdepth, vmskjp1, vmskjm1, umskip1, umskim1, umskip1_r, umskim1_r, vmskjp1_r, vmskjm1_r 
     1294      REAL(wp) :: zisfdep_min 
    12931295      REAL(wp), POINTER, DIMENSION(:,:)   ::   zdummy, zmask, zrisfdep   ! 2D workspace (ISH) 
    12941296      ! 
     
    13341336      END IF 
    13351337      ! 
     1338      ! 0.0 variable definition of minimal ice shelf draft allowed 
     1339      ! an ice shelf draft have to be larger than the first level thickness 
     1340      zisfdep_min = MAX(rn_isfdep_min,e3t_1d(1)) 
     1341 
    13361342      ! 1.0 set iceshelf to the minimum depth allowed 
    1337       WHERE(risfdep(:,:) > 0.0_wp .AND. risfdep(:,:) < MAX(rn_isfdep_min,e3t_1d(1))) 
    1338          risfdep(:,:)=rn_isfdep_min 
     1343      WHERE(risfdep(:,:) > 0.0_wp .AND. risfdep(:,:) < zisfdep_min) 
     1344         risfdep(:,:)=zisfdep_min 
    13391345      END WHERE 
    13401346      !   
     
    13511357         DO ji = 1, jpi 
    13521358            IF (bathy(ji,jj)-risfdep(ji,jj) < rn_isfhw_min) THEN 
    1353                IF ((bathy(ji,jj) - rn_isfhw_min) > MAX(rn_isfdep_min,e3t_1d(1))) THEN  
    1354                   risfdep(ji,jj) = bathy(ji,jj) - rn_isfhw_min 
    1355                ELSE 
     1359               risfdep(ji,jj) = bathy(ji,jj) - rn_isfhw_min 
     1360               ! sanity check on risfdep (if < zisfdep_min) => we ground it  
     1361               IF (risfdep(ji,jj) < zisfdep_min) THEN  
    13561362                  risfdep(ji,jj)=0.0 ; misfdep(ji,jj) = 1 
    13571363                  bathy  (ji,jj)=0.0 ; mbathy (ji,jj) = 0 
Note: See TracChangeset for help on using the changeset viewer.