Changeset 11844 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isftbl.F90

Timestamp:

2019-11-01T21:54:15+01:00 (4 years ago)

Author:

mathiot

Message:

rm useless lbclnk + fix reproducibility WED025 + add isf debug option

File:

• NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isftbl.F90 (modified) (5 diffs)

NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isftbl.F90

@@ -16 +16 @@
    USE dom_oce ! vertical scale factor
    USE lbclnk  ! lbc_lnk subroutine
+   USE isfutils
+   USE isf
 
    IMPLICIT NONE
@@ -48 +50 @@
       REAL(wp), DIMENSION(jpi,jpj), OPTIONAL, INTENT(in   ) :: pfrac         ! fraction of bottom cell affected by tbl
       !!--------------------------------------------------------------------
-      INTEGER ::   ji, jj                   ! loop index
-      INTEGER , DIMENSION(jpi,jpj) :: ikbot ! bottom level of the tbl
-      REAL(wp), DIMENSION(jpi,jpj) :: zhtbl ! thickness of the tbl
-      REAL(wp), DIMENSION(jpi,jpj) :: zfrac ! thickness of the tbl
+      INTEGER ::   ji, jj                     ! loop index
+      INTEGER , DIMENSION(jpi,jpj) :: ikbot   ! bottom level of the tbl
+      REAL(wp), DIMENSION(jpi,jpj) :: zvarout ! 2d average of pvarin
+      REAL(wp), DIMENSION(jpi,jpj) :: zhtbl   ! thickness of the tbl
+      REAL(wp), DIMENSION(jpi,jpj) :: zfrac   ! thickness of the tbl
       !!--------------------------------------------------------------------
       ! 
@@ -64 +67 @@
          !
          ! compute tbl property at U point
-         CALL isf_tbl_avg( miku, ikbot, zhtbl, zfrac, e3u_n, pvarin, pvarout )
+         CALL isf_tbl_avg( miku, ikbot, zhtbl, zfrac, e3u_n, pvarin, zvarout )
+         !
+         ! check if needed (probably yes)
+         CALL lbc_lnk('sbcisf', pvarout,'U',-1.)
          !
          ! compute tbl property at T point
+         pvarout(1,:) = 0._wp
          DO jj = 1, jpj
             DO ji = 2, jpi
-               pvarout(ji,jj) = 0.5_wp * (pvarout(ji,jj) + pvarout(ji-1,jj))
+               pvarout(ji,jj) = 0.5_wp * (zvarout(ji,jj) + zvarout(ji-1,jj))
             END DO
          END DO
-         !
-         ! check if needed (probably yes)
-         CALL lbc_lnk('sbcisf', pvarout,'T',-1.)
+         ! lbclnk not needed as a final communication is done after the computation of fwf
          ! 
       CASE ( 'V' )
@@ -85 +90 @@
          !
          ! compute tbl property at V point
-         CALL isf_tbl_avg( mikv, ikbot, zhtbl, zfrac, e3v_n, pvarin, pvarout )
+         CALL isf_tbl_avg( mikv, ikbot, zhtbl, zfrac, e3v_n, pvarin, zvarout )
+         !
+         ! check if needed (probably yes)
+         CALL lbc_lnk('sbcisf', pvarout,'V',-1.)
          !
          ! pvarout is an averaging of wet point
+         pvarout(:,1) = 0._wp
          DO jj = 2, jpj
             DO ji = 1, jpi
-               pvarout(ji,jj) = 0.5_wp * (pvarout(ji,jj) + pvarout(ji,jj-1))
+               pvarout(ji,jj) = 0.5_wp * (zvarout(ji,jj) + zvarout(ji,jj-1))
             END DO
          END DO
-         !
-         ! check if needed (probably yes)
-         CALL lbc_lnk('sbcisf', pvarout,'T',-1.)
+         ! lbclnk not needed as a final communication is done after the computation of fwf
          !
       CASE ( 'T' )
@@ -103 +110 @@
          !
       END SELECT
+      !
+      IF (ln_isfdebug) CALL debug('isf_tbl pvarout:',pvarout)
       !
    END SUBROUTINE isf_tbl