Context

It is only a diagnostic issue which concern both v3.6_stable and trunk. The top, middle and bottom output of tracer and horizontal velocity done diatmb.F90 module has several issues that can be rather easily solved (see below). It should also be generalized to all available vertical coordinate and take into account ice-shelf cavities.

Analysis & Fix

1- Better to use mkbt which is directly the level needed (with 1 on land) instead of mbathy array.

2- small  BUG for u- and v-points mid and bottom calculation: the use of mbathy is wrong ! ===>>>> mbku and mbkv should be used instead

3- mid depth diag. case: here only the z-coordinate is OK.

For zps there will be a small error at the boundary. For s-coordinate, the diag is just wrong. Either add "IF(  ln_sco )   CALL ctl_stop(....)" in dia_tmb_init or adapt the diag to s-coordinate.

4- surface diag. case : in case of ice shelf cavities, the top of the ocean is not the level  k=1, but the bottom go the ice shelves. use mikt, miku or mikv (for t-, u-, or v-point)  

Context

• in the trunk, module zdftmx , routine zdf_tmx_init, zav_tide is allocated at the begining and never deallocated

Analysis

• This pointer is used only for diagnostics, under the test

        IF( nprint == 1 .AND. lwp ) THEN
           ! Control print
           ! Total power consumption due to vertical mixing
           ! zpc = rau0 * 1/rn_me * rn2 * zav_tide
  ...
        ENDIF
  

• The test against lwp is wrong as only one domain will be concerned by the diagnostics.
• Gurvan pointed out the bug.
• When corrected, zav_tide can be allocated/deallocated only in the case it is used, moving allocation after the IF..

Fix

• add CALL wrk_dealloc( jpi,jpj,jpk, zav_tide ) after deallocation of zpc.

Context

New branch to merge NOC and CMCC 2016 developments

Implementation

Start by copying branch dev_CMCC_2016