Ignore:
Timestamp:
2020-07-09T12:39:43+02:00 (3 months ago)
Author:
clem
Message:

merge with r4.0-HEAD at r13278

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/OCE/ICB/icb_oce.F90

    r10702 r13279  
    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 
     
    122122   LOGICAL , PUBLIC ::   ln_operator_splitting           !: Use first order operator splitting for thermodynamics 
    123123   LOGICAL , PUBLIC ::   ln_passive_mode                 !: iceberg - ocean decoupling 
    124    LOGICAL , PUBLIC ::   ln_time_average_weight          !: Time average the weight on the ocean    !!gm I don't understand that ! 
    125124   REAL(wp), PUBLIC ::   rn_speed_limit                  !: CFL speed limit for a berg 
    126125   ! 
     
    179178         &      ff_e(0:jpi+1,0:jpj+1) , fr_e(0:jpi+1,0:jpj+1)  ,   & 
    180179         &      tt_e(0:jpi+1,0:jpj+1) , ssh_e(0:jpi+1,0:jpj+1) ,   & 
     180         &      ss_e(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.