Problem in the trend routine for UBS+VVL option

[blaizotac]

Context

For the release 3.6 (and 4.0)

In the file traadv_ubs.F90:
In the routine tra_adv_ubs for vertical advective trends, there are 5 arguments

CALL trd_tra( kt, cdtype, jn, jptra_zad, zltv)

But in the file trdtra.F90, the routine trd_tra uses 7 arguments

SUBROUTINE trd_tra( kt, ctype, ktra, ktrd, ptrd, pun, ptra )

The last 2 are written like optional

      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in), OPTIONAL ::   pun     ! now velocity 
      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in), OPTIONAL ::   ptra    ! now tracer variable

But they do not appear like that in the rest of the code ...

CASE( jptra_zad )   ;   CALL trd_tra_adv( ptrd, pun, ptra, 'Z', trdt  )

   SUBROUTINE trd_tra_adv( pf, pun, ptn, cdir, ptrd )

      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in   ) ::   pun     ! now velocity   in one direction
      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in   ) ::   ptn     ! now or before tracer

Recommendation

Is the following change correct?
Change routine tra_adv_ubs and add the 2 missing arguments ?

CALL trd_tra( kt, cdtype, jn, jptra_zad, zltv, pwn, ptn(:,:,:,jn))

[smasson]

The proposed solution is not the good one.
The vertical trend in tra_ubs is a specific case and is already computed before calling trd_tra. We must use only 5 aguments. In trd_tra we must then go directly to the "CASE DEFAULT" without recomputing the trend.
I changed trd_tra in order to test the presence of pun and directly go to the "CASE DEFAULT" when this argument is not present.

[smasson]

In 13067:

Error: Failed to load processor CommitTicketReference

No macro or processor named 'CommitTicketReference' found

[smasson]

fixed in [13067]