Changeset 11931 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcav.F90

Timestamp:

2019-11-19T18:30:57+01:00 (4 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_nemo: add comments, improve memory usage of ln_isfcpl_cons option, fix issue in ISOMIP+ configuration

File:

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

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

@@ -23 +23 @@
    !
    USE oce      , ONLY: tsn                    ! ocean tracers
-   USE dom_oce  , ONLY: jpi,jpj                ! ocean space and time domain
+   USE par_oce  , ONLY: jpi,jpj                ! ocean space and time domain
    USE phycst   , ONLY: grav,rau0,r1_rau0_rcp  ! physical constants
    USE eosbn2   , ONLY: l_useCT                ! l_useCT
@@ -90 +90 @@
       DO WHILE ( lit )    ! maybe just a constant number of iteration as in blk_core is fine
          !
-         ! compute gammat every where (2d)
+         ! compute gammat everywhere (2d)
          ! useless if melt specified
          IF ( TRIM(cn_isfcav_mlt) .NE. 'spe' ) THEN
@@ -101 +101 @@
             &                         zqhc   , zqoce, pqfwf  )
          !
-         ! define if we need to iterate (nn_gammablk 0/1 do not need iteration)
+         ! define if we need to iterate
          SELECT CASE ( cn_gammablk )
          CASE ( 'spe','ad15' )
@@ -123 +123 @@
       END DO
       !
-      ! compute heat and water flux  (change signe directly in the melt subroutine)
+      ! compute heat and water flux ( > 0 out )
       pqfwf(:,:) = pqfwf(:,:) * mskisf_cav(:,:)
       zqoce(:,:) = zqoce(:,:) * mskisf_cav(:,:)
       zqhc (:,:) = zqhc(:,:)  * mskisf_cav(:,:)
       !
-      ! compute heat content flux
-      zqlat(:,:) = - pqfwf(:,:) * rLfusisf    ! 2d latent heat flux (W/m2) ( > 0 out )
+      ! compute heat content flux ( > 0 out )
+      zqlat(:,:) = - pqfwf(:,:) * rLfusisf    ! 2d latent heat flux (W/m2)
       !
       ! total heat flux ( >0 out )
@@ -163 +163 @@
       INTEGER :: ierr
       !!---------------------------------------------------------------------
-
+      !
+      !==============
       ! 0: allocation
+      !==============
       !
       CALL isf_alloc_cav()
       !
+      !==================
       ! 1: initialisation
+      !==================
       !
       ! top and bottom level of the 'top boundary layer'
@@ -179 +183 @@
       mskisf_cav(:,:)    = (1._wp - tmask(:,:,1)) * ssmask(:,:)
       !
+      !================
       ! 2: read restart
+      !================
       !
       ! read cav variable from restart
       IF ( ln_rstart ) CALL isfrst_read('cav', risf_cav_tsc, fwfisf_cav, risf_cav_tsc_b, fwfisf_cav_b)
       !
+      !==========================================
       ! 3: specific allocation and initialisation (depending of scheme choice)
+      !==========================================
       !
       SELECT CASE ( TRIM(cn_isfcav_mlt) )