Bug in vertical advection with ice shelf and vector form

[mathiot]

Context

There is a bug in the vertical advection in case of opened ice shelf cavity with vector form. The vertical advection is masked at u-,v- w points on the top interface. It should not. It should be done as for the bottom interface (no masking). (thank you Gurvan and Andrew).

Analysis

It affect all simulation running with ice shelf cavity open and vector form with the trunk and 3.6_STABLE.

Fix

replace in dynzad.F90:

      !
      ! Surface and bottom advective fluxes set to zero
      IF( ln_isfcav ) THEN
         DO jj = 2, jpjm1
            DO ji = fs_2, fs_jpim1           ! vector opt.
               zwuw(ji,jj, 1:miku(ji,jj) ) = 0._wp
               zwvw(ji,jj, 1:mikv(ji,jj) ) = 0._wp
               zwuw(ji,jj,jpk) = 0._wp
               zwvw(ji,jj,jpk) = 0._wp
            END DO
         END DO
      ELSE
         DO jj = 2, jpjm1
            DO ji = fs_2, fs_jpim1           ! vector opt.
               zwuw(ji,jj, 1 ) = 0._wp
               zwvw(ji,jj, 1 ) = 0._wp
               zwuw(ji,jj,jpk) = 0._wp
               zwvw(ji,jj,jpk) = 0._wp
            END DO
         END DO
      END IF

by:

      !
      ! Surface and bottom advective fluxes set to zero
      DO jj = 2, jpjm1
         DO ji = fs_2, fs_jpim1           ! vector opt.
            zwuw(ji,jj, 1 ) = 0._wp
            zwvw(ji,jj, 1 ) = 0._wp
            zwuw(ji,jj,jpk) = 0._wp
            zwvw(ji,jj,jpk) = 0._wp
         END DO
      END DO

ISOMIP is running fine with the fix with only minor change of the results.

[mathiot]

In 9965:

Error: Failed to load processor CommitTicketReference

No macro or processor named 'CommitTicketReference' found

[mathiot]

In 9967:

Error: Failed to load processor CommitTicketReference

No macro or processor named 'CommitTicketReference' found