Changeset 11876 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfstp.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/isfstp.F90 (modified) (11 diffs)

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

@@ -27 +27 @@
    USE lib_mpp, ONLY: ctl_stop, ctl_nam
    USE in_out_manager ! I/O manager
+   USE timing
 
    IMPLICIT NONE
@@ -59 +60 @@
       !!---------------------------------------------------------------------
       !
+      IF( ln_timing )   CALL timing_start('isf')
+      !
       IF ( ln_isfcav_mlt ) THEN
          !
@@ -67 +70 @@
          END IF
          !
-         ! compute tbl lvl/h
+         ! compute misfkb, rhisf_tbl, rfrac (deepest level, thickness, fraction of deepest cell affected by tbl)
          rhisf_tbl_cav(:,:) = rn_htbl * mskisf_cav(:,:)
          CALL isf_tbl_lvl(ht_n, e3t_n, misfkt_cav, misfkb_cav, rhisf_tbl_cav, rfrac_tbl_cav)
@@ -85 +88 @@
          !
          ! compute misfkb, rhisf_tbl, rfrac (deepest level, thickness, fraction of deepest cell affected by tbl)
+         ! by simplicity, we assume the top level where param applied do not change with time
          rhisf_tbl_par(:,:) = rhisf0_tbl_par(:,:)
          CALL isf_tbl_lvl(ht_n, e3t_n, misfkt_par, misfkb_par, rhisf_tbl_par, rfrac_tbl_par)
@@ -94 +98 @@
       !
       IF ( ln_isfcpl .AND. lrst_oce ) CALL isfcpl_rst_write(kt)
+      !
+      IF( ln_timing )   CALL timing_stop('isf')
       !
    END SUBROUTINE isf_stp
@@ -162 +168 @@
          !
          IF ( ln_isf ) THEN
+            WRITE(numout,*) '      Add debug print in isf module           ln_isfdebug     = ', ln_isfdebug
+            WRITE(numout,*)
             WRITE(numout,*) '      melt inside the cavity                  ln_isfcav_mlt   = ', ln_isfcav_mlt
             IF ( ln_isfcav_mlt) THEN
@@ -168 +176 @@
                WRITE(numout,*) '         gamma formulation                       cn_gammablk = ', TRIM(cn_gammablk) 
                IF ( TRIM(cn_gammablk) .NE. 'spe' ) THEN 
-                  WRITE(numout,*) '            gammat coefficient                       rn_gammat0  = ', rn_gammat0  
-                  WRITE(numout,*) '            gammas coefficient                       rn_gammas0  = ', rn_gammas0  
-                  WRITE(numout,*) '            top drag coef.    used (from namdrg_top) rn_Cd0      = ', r_Cdmin_top
-                  WRITE(numout,*) '            top background ke used (from namdrg_top) rn_ke0      = ', r_ke0_top
+                  WRITE(numout,*) '         gammat coefficient                       rn_gammat0  = ', rn_gammat0  
+                  WRITE(numout,*) '         gammas coefficient                       rn_gammas0  = ', rn_gammas0  
+                  WRITE(numout,*) '         top drag coef.    used (from namdrg_top) rn_Cd0      = ', r_Cdmin_top
+                  WRITE(numout,*) '         top background ke used (from namdrg_top) rn_ke0      = ', r_ke0_top
                END IF
             END IF
@@ -190 +198 @@
             !
          ELSE
-
+            !
             IF ( ln_isfcav ) THEN
                WRITE(numout,*) ''
@@ -196 +204 @@
                WRITE(numout,*) ''
             END IF
+            !
          END IF
 
@@ -207 +216 @@
       ! sanity check  ! issue ln_isfcav not yet known as well as l_isfoasis  => move this call in isf_stp ?
       ! melt in the cavity without cavity
-       IF ( ln_isfcav_mlt .AND. (.NOT. ln_isfcav) ) &
+      IF ( ln_isfcav_mlt .AND. (.NOT. ln_isfcav) ) &
           &   CALL ctl_stop('ice shelf melt in the cavity activated (ln_isfcav_mlt) but no cavity detected in domcfg (ln_isfcav), STOP' )
       !
@@ -256 +265 @@
          &             ln_isfcav_mlt, cn_isfcav_mlt, cn_gammablk, rn_gammat0, rn_gammas0, rn_htbl, sn_isfcav_fwf,   &
          &             ln_isfpar_mlt, cn_isfpar_mlt, sn_isfpar_fwf, sn_isfpar_zmin, sn_isfpar_zmax, sn_isfpar_Leff, &
-         &             ln_isfcpl    , nn_drown, ln_isfcpl_cons,                                                     &
+         &             ln_isfcpl    , nn_drown, ln_isfcpl_cons, ln_isfdebug,                                        &
          &             cn_isfload   , cn_isfdir
       !!----------------------------------------------------------------------