Changeset 11541 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcavmlt.F90

Timestamp:

2019-09-12T18:41:17+02:00 (5 years ago)

Author:

mathiot

Message:

ENHANCE-02_ISF: simplify use of ln_isf, add extra comments + minor changes (ticket #2142)

File:

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

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

@@ -1 +1 @@
 MODULE isfcavmlt
    !!======================================================================
-   !!                       ***  MODULE  isfcav_mlt  ***
+   !!                       ***  MODULE  isfcavmlt  ***
    !! ice shelf module :  update surface ocean boundary condition under ice
    !!                   shelf
@@ -9 +9 @@
 
    !!----------------------------------------------------------------------
-   !!   isfcav_mlt    : 
+   !!   isfcav_mlt    : update surface ocean boundary condition under ice shelf
    !!----------------------------------------------------------------------
    USE oce            ! ocean dynamics and tracers
    USE isf            ! ice shelf public variables
-   USE isfutils
    USE dom_oce        ! ocean space and time domain
    USE phycst         ! physical constants
@@ -42 +41 @@
       &                           pqhc, pqoce, pqfwf  )
       !!----------------------------------------------------------------------
+      !!
+      !!                          ***  ROUTINE isfcav_mlt  ***
       !!
       !! ** Purpose    : compute or read ice shelf fwf/heat fluxes in the ice shelf cavity
@@ -79 +80 @@
 ! -------------------------------------------------------------------------------------------------------
 
-   SUBROUTINE isfcav_mlt_spe(kt, pstbl,              &  ! <<== in
+   SUBROUTINE isfcav_mlt_spe(kt, pstbl,          &  ! <<== in
       &                      pqhc , pqoce, pqfwf )  ! ==>> out
       !!----------------------------------------------------------------------
+      !!
+      !!                          ***  ROUTINE isfcav_mlt_spe  ***
+      !!
       !! ** Purpose    : - read ice shelf melt from forcing file
       !!                 - compute ocea-ice heat flux (assuming it is equal to latent heat)
@@ -109 +113 @@
    END SUBROUTINE isfcav_mlt_spe
 
-   SUBROUTINE isfcav_mlt_2eq(pgt, pttbl, pstbl,       &  ! <<== in
-      &                       pqhc , pqoce, pqfwf )  ! ==>> out
-      !!----------------------------------------------------------------------
+   SUBROUTINE isfcav_mlt_2eq(pgt , pttbl, pstbl, &  ! <<== in
+      &                      pqhc, pqoce, pqfwf  )  ! ==>> out
+      !!----------------------------------------------------------------------
+      !!
+      !!                          ***  ROUTINE isfcav_mlt_spe  ***
+      !!
       !! ** Purpose    : Compute ice shelf fwf/heqt fluxes using ISOMIP formulation (Hunter et al., 2006)
       !!
@@ -141 +148 @@
       !
       ! compute ocean-ice heat flux and then derive fwf assuming that ocean heat flux equal latent heat
-      pqfwf(:,:) = - pgt(:,:) * rau0_rcp * zthd(:,:) * r1_Lfusisf  ! fresh water flux  ( > 0 out )
+      pqfwf(:,:) = - pgt(:,:) * rau0_rcp * zthd(:,:) / rLfusisf    ! fresh water flux  ( > 0 out )
       pqoce(:,:) = - pqfwf(:,:) * rLfusisf                         ! ocea-ice flux     ( > 0 out )
       pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp                 ! heat content flux ( > 0 out )
@@ -150 +157 @@
    END SUBROUTINE isfcav_mlt_2eq
 
-   SUBROUTINE isfcav_mlt_3eq(pgt, pgs , pttbl, pstbl, &
-      &                       pqhc, pqoce, pqfwf  )
-      !!----------------------------------------------------------------------
+   SUBROUTINE isfcav_mlt_3eq(pgt, pgs , pttbl, pstbl, &  ! <<== in
+      &                           pqhc, pqoce, pqfwf  )  ! ==>> out
+      !!----------------------------------------------------------------------
+      !!
+      !!                          ***  ROUTINE isfcav_mlt_3eq  ***
+      !!
       !! ** Purpose    : Compute ice shelf fwf/heqt fluxes using the 3 equation formulation 
       !!
@@ -232 +242 @@
    END SUBROUTINE isfcav_mlt_3eq
 
-   SUBROUTINE isfcav_mlt_oasis(kt, pstbl,              &  ! <<== in
+   SUBROUTINE isfcav_mlt_oasis(kt, pstbl,          &  ! <<== in
       &                        pqhc , pqoce, pqfwf )  ! ==>> out
       !!----------------------------------------------------------------------
+      !!                          ***  ROUTINE isfcav_mlt_oasis  ***
       !!
       !! ** Purpose    : scale the fwf read from input file by the total amount received by the sbccpl interface
@@ -282 +293 @@
    END SUBROUTINE isfcav_mlt_oasis
 
-   !SUBROUTINE isfmlt_3eq_frz_ktm1
-   ! compute tfrz based on sfrz value at kt-1 (need to be SAVED local array)
-   ! => should reduce error due to linarisation
-   ! compute qfwf (eq 24)
-   ! compute zqoce, zqlat, zqcon, zqhc
-   ! compute sfrz (eq 26)
-   !END SUBROUTINE isfmlt_3eq_frz_ktm1
-
 END MODULE isfcavmlt