Ignore:
Timestamp:
2020-07-09T15:19:01+02:00 (3 months ago)
Author:
ayoung
Message:

Merging changes for ticket #2407. Patch for iceberg melting stability. Fully SETTE tested: this merge introduces a change to the results in ORCA2_ICE_PISCES.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/ICB/icb_oce.F90

    r12472 r13281  
    5757   TYPE, PUBLIC ::   point              !: properties of an individual iceberg (position, mass, size, etc...) 
    5858      INTEGER  ::   year 
    59       REAL(wp) ::   xi , yj                                              ! iceberg coordinates in the (i,j) referential (global) 
    60       REAL(wp) ::   e1 , e2                                              ! horizontal scale factors at the iceberg position 
    61       REAL(wp) ::   lon, lat, day                                        ! geographic position 
    62       REAL(wp) ::   mass, thickness, width, length, uvel, vvel           ! iceberg physical properties 
    63       REAL(wp) ::   uo, vo, ui, vi, ua, va, ssh_x, ssh_y, sst, cn, hi    ! properties of iceberg environment  
     59      REAL(wp) ::   xi , yj                                                   ! iceberg coordinates in the (i,j) referential (global) 
     60      REAL(wp) ::   e1 , e2                                                   ! horizontal scale factors at the iceberg position 
     61      REAL(wp) ::   lon, lat, day                                             ! geographic position 
     62      REAL(wp) ::   mass, thickness, width, length, uvel, vvel                ! iceberg physical properties 
     63      REAL(wp) ::   uo, vo, ui, vi, ua, va, ssh_x, ssh_y, sst, cn, hi, sss    ! properties of iceberg environment  
    6464      REAL(wp) ::   mass_of_bits, heat_density 
    6565   END TYPE point 
     
    8686   ! particularly for MPP when iceberg can lie inside T grid but outside U, V, or f grid 
    8787   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   uo_e, vo_e 
    88    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ff_e, tt_e, fr_e 
     88   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ff_e, tt_e, fr_e, ss_e 
    8989   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ua_e, va_e 
    9090   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ssh_e 
     
    183183         &      ff_e(0:jpi+1,0:jpj+1) , fr_e(0:jpi+1,0:jpj+1)  ,   & 
    184184         &      tt_e(0:jpi+1,0:jpj+1) , ssh_e(0:jpi+1,0:jpj+1) ,   & 
     185         &      ss_e(0:jpi+1,0:jpj+1) ,                            &  
    185186         &      first_width(nclasses) , first_length(nclasses) ,   & 
    186187         &      src_calving (jpi,jpj) ,                            & 
Note: See TracChangeset for help on using the changeset viewer.