Ignore:
Timestamp:
2019-02-20T10:44:07+01:00 (20 months ago)
Author:
mathiot
Message:

merge branch fix_ticket2238_solution1 into the trunk (ticket #2238)

File:
1 edited

Legend:

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

    r10691 r10702  
    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, hicth 
     88   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ff_e, tt_e, fr_e 
    8989   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ua_e, va_e 
    9090   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ssh_e 
    9191   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   tmask_e, umask_e, vmask_e 
    9292#if defined key_si3 || defined key_cice 
    93    REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   ui_e, vi_e 
     93   REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE ::   hi_e, ui_e, vi_e 
    9494#endif 
    9595 
     
    175175         &      ui_e(0:jpi+1,0:jpj+1) ,                            & 
    176176         &      vi_e(0:jpi+1,0:jpj+1) ,                            & 
     177         &      hi_e(0:jpi+1,0:jpj+1) ,                            & 
    177178#endif 
    178179         &      ff_e(0:jpi+1,0:jpj+1) , fr_e(0:jpi+1,0:jpj+1)  ,   & 
    179180         &      tt_e(0:jpi+1,0:jpj+1) , ssh_e(0:jpi+1,0:jpj+1) ,   & 
    180          &      hicth(0:jpi+1,0:jpj+1),                            & 
    181181         &      first_width(nclasses) , first_length(nclasses) ,   & 
    182182         &      src_calving (jpi,jpj) ,                            & 
Note: See TracChangeset for help on using the changeset viewer.