Changeset 14210

Timestamp:

2020-12-18T11:03:04+01:00 (3 years ago)

Author:

mathiot

Message:

ticket #2570: switch off tramle under isf until tramle is compatible with isf cavities (SETTE results unchanged)

File:

• NEMO/trunk/src/OCE/TRA/tramle.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/TRA/tramle.F90

@@ -246 +246 @@
          zmvw = MAX(  0._wp , ( 1._wp - zcvw ) * ( 1._wp + r5_21 * zcvw )  )
          !
-         zpsi_uw(ji,jj,jk) = zpsim_u(ji,jj) * zmuw * umask(ji,jj,jk)
-         zpsi_vw(ji,jj,jk) = zpsim_v(ji,jj) * zmvw * vmask(ji,jj,jk)
+         zpsi_uw(ji,jj,jk) = zpsim_u(ji,jj) * zmuw * wumask(ji,jj,jk) * wumask(ji,jj,1)
+         zpsi_vw(ji,jj,jk) = zpsim_v(ji,jj) * zmvw * wvmask(ji,jj,jk) * wvmask(ji,jj,1)
       END_3D
       !
@@ -258 +258 @@
          DO_2D( 0, 0, 0, 0 )
             pw(ji,jj,jk) = pw(ji,jj,jk) - ( zpsi_uw(ji,jj,jk) - zpsi_uw(ji-1,jj,jk)   &
-               &                          + zpsi_vw(ji,jj,jk) - zpsi_vw(ji,jj-1,jk) )
+               &                          + zpsi_vw(ji,jj,jk) - zpsi_vw(ji,jj-1,jk) ) * wmask(ji,jj,1)
          END_2D
       END DO