Changeset 12068 for NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isftbl.F90

Timestamp:

2019-12-05T13:18:21+01:00 (5 years ago)

Author:

davestorkey

Message:

2019/UKMO_MERGE_2019 : Merging in changes from ENHANCE-02_ISF_nemo.

Location:

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF

Files:

• . (copied) (copied from NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/ISF)
• isftbl.F90 (modified) (6 diffs)

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/ISF/isftbl.F90

@@ -26 +26 @@
 CONTAINS
 
-   SUBROUTINE isf_tbl( pvarin, pvarout, cd_ptin, ktop, phtbl, kbot, pfrac )
+   SUBROUTINE isf_tbl( Kmm, pvarin, pvarout, cd_ptin, ktop, phtbl, kbot, pfrac )
       !!--------------------------------------------------------------------
       !!                  ***  SUBROUTINE isf_tbl  ***
@@ -40 +40 @@
       REAL(wp), DIMENSION(jpi,jpj)          , INTENT(  out) :: pvarout ! 2d average of pvarin
       !!-------------------------- IN  -------------------------------------
+      INTEGER                               , INTENT(in   ) :: Kmm           ! ocean time level index
       CHARACTER(len=1)                      , INTENT(in   ) :: cd_ptin       ! point of variable in/out
       REAL(wp), DIMENSION(jpi,jpj,jpk)      , INTENT(in   ) :: pvarin        ! 3d variable to average over the tbl
@@ -62 +63 @@
          !
          ! compute tbl lvl and thickness
-         CALL isf_tbl_lvl( hu_n, e3u_n, ktop, ikbot, zhtbl, zfrac )
+         CALL isf_tbl_lvl( hu(:,:,Kmm), e3u(:,:,:,Kmm), ktop, ikbot, zhtbl, zfrac )
          !
          ! compute tbl property at U point
-         CALL isf_tbl_avg( miku, ikbot, zhtbl, zfrac, e3u_n, pvarin, zvarout )
+         CALL isf_tbl_avg( miku, ikbot, zhtbl, zfrac, e3u(:,:,:,Kmm), pvarin, zvarout )
          !
          ! compute tbl property at T point
@@ -82 +83 @@
          !
          ! compute tbl lvl and thickness
-         CALL isf_tbl_lvl( hv_n, e3v_n, ktop, ikbot, zhtbl, zfrac )
+         CALL isf_tbl_lvl( hv(:,:,Kmm), e3v(:,:,:,Kmm), ktop, ikbot, zhtbl, zfrac )
          !
          ! compute tbl property at V point
-         CALL isf_tbl_avg( mikv, ikbot, zhtbl, zfrac, e3v_n, pvarin, zvarout )
+         CALL isf_tbl_avg( mikv, ikbot, zhtbl, zfrac, e3v(:,:,:,Kmm), pvarin, zvarout )
          !
          ! pvarout is an averaging of wet point
@@ -99 +100 @@
          !
          ! compute tbl property at T point
-         CALL isf_tbl_avg( ktop, kbot, phtbl, pfrac, e3t_n, pvarin, pvarout )
+         CALL isf_tbl_avg( ktop, kbot, phtbl, pfrac, e3t(:,:,:,Kmm), pvarin, pvarout )
          !
       END SELECT
@@ -252 +253 @@
       !
       ! if we need to recompute the top level at every time stepcompute top level (z*, z~) 
-      ! in case of weak ht_n variation we can assume the top level of htbl to be constant
+      ! in case of weak ht variation we can assume the top level of htbl to be constant
       ! => only done using gdepw_0
       ! be sure pdep is already correctly bounded