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

Timestamp:

2019-11-04T19:00:27+01:00 (4 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF_nemo: fix WED025 restartability, finish removing useless USE, remove useless lbc_lnk

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

@@ -13 +13 @@
    !!   isf_cav       : update ice shelf melting under ice shelf
    !!----------------------------------------------------------------------
-   USE oce            ! ocean dynamics and tracers
    USE isf            ! ice shelf public variables
-   USE isfutils
-   USE isftbl         ! ice shelf top boundary layer properties
-   USE isfcavmlt      ! ice shelf melt formulation
-   USE isfcavgam      ! ice shelf melt exchange coeficient
-   USE isfdiags       ! ice shelf diags
-   USE dom_oce        ! ocean space and time domain
-   USE phycst         ! physical constants
-   USE eosbn2         ! l_useCT
+   !
+   USE isfrst   , ONLY: isfrst_write, isfrst_read ! ice shelf restart read/write subroutine
+   USE isfutils , ONLY: debug          ! ice shelf debug subroutine
+   USE isftbl   , ONLY: isf_tbl        ! ice shelf top boundary layer properties subroutine
+   USE isfcavmlt, ONLY: isfcav_mlt     ! ice shelf melt formulation subroutine
+   USE isfcavgam, ONLY: isfcav_gammats ! ice shelf melt exchange coeficient subroutine
+   USE isfdiags , ONLY: isf_diags_flx  ! ice shelf diags subroutine
+   !
+   USE oce      , ONLY: tsn                    ! ocean tracers
+   USE dom_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
    !
    USE in_out_manager ! I/O manager
@@ -58 +61 @@
       !!---------------------------------------------------------------------
       !!-------------------------- OUT --------------------------------------
-      REAL(wp), DIMENSION(jpi,jpj)     , INTENT(inout) :: pqfwf
-      REAL(wp), DIMENSION(jpi,jpj,jpts), INTENT(inout) :: ptsc
+      REAL(wp), DIMENSION(jpi,jpj)     , INTENT(inout) :: pqfwf  ! ice shelf melt (>0 out)
+      REAL(wp), DIMENSION(jpi,jpj,jpts), INTENT(inout) :: ptsc   ! T & S ice shelf cavity contents
       !!-------------------------- IN  --------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time step
@@ -66 +69 @@
       INTEGER :: nit
       REAL(wp) :: zerr
-      REAL(wp), DIMENSION(jpi,jpj) :: zqlat, zqoce, zqhc, zqh
-      REAL(wp), DIMENSION(jpi,jpj) :: zqoce_b
-      REAL(wp), DIMENSION(jpi,jpj) :: zgammat, zgammas
-      REAL(wp), DIMENSION(jpi,jpj) :: zttbl, zstbl
+      REAL(wp), DIMENSION(jpi,jpj) :: zqlat, zqoce, zqhc, zqh  ! heat fluxes
+      REAL(wp), DIMENSION(jpi,jpj) :: zqoce_b                  !
+      REAL(wp), DIMENSION(jpi,jpj) :: zgammat, zgammas         ! exchange coeficient
+      REAL(wp), DIMENSION(jpi,jpj) :: zttbl, zstbl             ! temp. and sal. in top boundary layer
       !!---------------------------------------------------------------------
       !
@@ -140 +143 @@
       ptsc(:,:,jp_tem) = - zqh(:,:) * r1_rau0_rcp
       !
+      ! write restart variables (qoceisf, qhcisf, fwfisf for now and before)
+      IF (lrst_oce) CALL isfrst_write(kt, 'cav', ptsc, pqfwf)
+      !
       IF ( ln_isfdebug ) THEN
          CALL debug('isf_cav: ptsc T',ptsc(:,:,1))
@@ -158 +164 @@
       !!---------------------------------------------------------------------
 
-      ! allocation isfcav gamtisf, gamsisf, 
+      ! 0: allocation
+      !
       CALL isf_alloc_cav()
       !
-      ! cav
+      ! 1: initialisation
+      !
+      ! top and bottom level of the 'top boundary layer'
       misfkt_cav(:,:)    = mikt(:,:) ; misfkb_cav(:,:)    = 1
+      !
+      ! thickness of 'tbl' and fraction of bottom cell affected by 'tbl'
       rhisf_tbl_cav(:,:) = 0.0_wp    ; rfrac_tbl_cav(:,:) = 0.0_wp
+      !
+      ! cavity mask
+      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) )
@@ -199 +220 @@
       END SELECT
       !
-      ! compute mask
-      mskisf_cav(:,:) = (1._wp - tmask(:,:,1)) * ssmask(:,:)
-      !
    END SUBROUTINE isf_cav_init