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

Timestamp:

2019-11-08T12:26:42+01:00 (4 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_nemo: add timing in the main isf routine + various bug fixes + cosmetic changes

File:

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

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

@@ -16 +16 @@
    USE isf     ! ice shelf variables
 
-   USE dom_oce ! vertical scale factor
+   USE dom_oce ! vertical scale factor and depth
 
    IMPLICIT NONE
@@ -250 +250 @@
       INTEGER,  DIMENSION(jpi,jpj), INTENT(  out) :: ktop        ! top level affected by the ice shelf parametrisation
       !!-------------------------- IN  -------------------------------------
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(in   ) :: pdep        ! top depth of the parametrisation influence
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) :: pdep        ! top depth of the parametrisation influence
       !!--------------------------------------------------------------------
       INTEGER :: ji,jj
@@ -256 +256 @@
       !!--------------------------------------------------------------------
       !
-      ! compute top level (need to be recomputed each time (z*, z~) 
+      ! 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
+      ! => only done using gdepw_0
       ! be sure pdep is already correctly bounded
       ! test: this routine run on isfdraft should return mikt
@@ -263 +265 @@
       DO ji = 1, jpi
          DO jj = 1, jpj
+            ! comput ktop
             ikt = 2
-            DO WHILE ( gdepw_n(ji,jj,ikt) <= pdep(ji,jj ) ) ;  ikt = ikt + 1 ;  END DO
+            DO WHILE ( gdepw_0(ji,jj,ikt) <= pdep(ji,jj ) ) ;  ikt = ikt + 1 ;  END DO
             ktop(ji,jj) = ikt - 1
+            !
+            ! update pdep
+            pdep(ji,jj) = gdepw_0(ji,jj,ktop(ji,jj))
          END DO
       END DO