New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10345 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/IOM – NEMO

Ignore:
Timestamp:
2018-11-21T11:25:53+01:00 (5 years ago)
Author:
smasson
Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: merge with trunk@10344, see #2133

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/IOM/iom.F90

    r10170 r10345  
    4343   USE ioipsl, ONLY :  ju2ymds    ! for calendar 
    4444   USE crs             ! Grid coarsening 
     45#if defined key_top 
     46   USE trc, ONLY    :  profsed 
     47#endif 
    4548   USE lib_fortran  
    4649   USE diurnal_bulk, ONLY : ln_diurnal_only, ln_diurnal 
     
    193196      ! vertical grid definition 
    194197      IF(.NOT.llrst_context) THEN 
    195           CALL iom_set_axis_attr( "deptht", paxis = gdept_1d ) 
    196           CALL iom_set_axis_attr( "depthu", paxis = gdept_1d ) 
    197           CALL iom_set_axis_attr( "depthv", paxis = gdept_1d ) 
    198           CALL iom_set_axis_attr( "depthw", paxis = gdepw_1d ) 
     198          CALL iom_set_axis_attr( "deptht",  paxis = gdept_1d ) 
     199          CALL iom_set_axis_attr( "depthu",  paxis = gdept_1d ) 
     200          CALL iom_set_axis_attr( "depthv",  paxis = gdept_1d ) 
     201          CALL iom_set_axis_attr( "depthw",  paxis = gdepw_1d ) 
    199202 
    200203          ! Add vertical grid bounds 
     
    219222          CALL iom_set_axis_attr( "nstrait", (/ (REAL(ji,wp), ji=1,4) /) ) 
    220223# endif 
     224#if defined key_top 
     225          CALL iom_set_axis_attr( "profsed", paxis = profsed ) 
     226#endif 
    221227          CALL iom_set_axis_attr( "icbcla", class_num ) 
    222228          CALL iom_set_axis_attr( "iax_20C", (/ REAL(20,wp) /) ) 
Note: See TracChangeset for help on using the changeset viewer.