Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/ISF/isfcavmlt.F90

Timestamp:

2021-11-28T18:59:49+01:00 (3 years ago)

Author:

gsamson

Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

Files:

• . (modified) (1 prop)
• src/OCE/ISF/isfcavmlt.F90 (modified) (8 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/ISF/isfcavmlt.F90

@@ -9 +9 @@
 
    !!----------------------------------------------------------------------
-   !!   isfcav_mlt    : compute or read ice shelf fwf/heat fluxes in the ice shelf cavity
+   !!   isfcav_mlt    : compute or read ice shelf fwf/heat fluxes from isf 
+   !!                   to oce
    !!----------------------------------------------------------------------
 
@@ -79 +80 @@
       !
       IF (ln_isfdebug) THEN
+         IF(lwp) WRITE(numout,*) ''
          CALL debug( 'isfcav_mlt qhc  :', pqhc (:,:) )
          CALL debug( 'isfcav_mlt qoce :', pqoce(:,:) )
          CALL debug( 'isfcav_mlt qfwf :', pqfwf(:,:) )
+         IF(lwp) WRITE(numout,*) ''
       END IF
       !
@@ -112 +115 @@
       CALL eos_fzp( pstbl(:,:), ztfrz(:,:), risfdep(:,:) )
       !
-      ! read input file
+      ! read input file of fwf (from isf to oce; ie melt)
       CALL fld_read ( kt, 1, sf_isfcav_fwf )
       !
       ! define fwf and qoce
       ! ocean heat flux is assume to be equal to the latent heat
-      pqfwf(:,:) = - sf_isfcav_fwf(1)%fnow(:,:,1)      ! fwf                ( >0 out)
-      pqoce(:,:) = - pqfwf(:,:) * rLfusisf             ! ocean heat flux    ( >0 out)
-      pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp     ! heat content flux  ( >0 out)
+      pqfwf(:,:) =   sf_isfcav_fwf(1)%fnow(:,:,1)      ! fwf                ( > 0 from isf to oce)
+      pqoce(:,:) = - pqfwf(:,:) * rLfusisf             ! ocean heat flux    ( > 0 from isf to oce)
+      pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp     ! heat content flux  ( > 0 from isf to oce)
       !
       ! output freezing point at the interface
-      CALL iom_put('isftfrz_cav', ztfrz )
+      CALL iom_put('isftfrz_cav', ztfrz(:,:) * mskisf_cav(:,:) )
       !
    END SUBROUTINE isfcav_mlt_spe
@@ -161 +164 @@
       !
       ! compute ocean-ice heat flux and then derive fwf assuming that ocean heat flux equal latent heat
-      pqfwf(:,:) = - pgt(:,:) * rho0_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 )
+      pqfwf(:,:) =   pgt(:,:) * rho0_rcp * zthd(:,:) / rLfusisf    ! fresh water flux  ( > 0 from isf to oce)
+      pqoce(:,:) = - pqfwf(:,:) * rLfusisf                         ! ocea-ice flux     ( > 0 from isf to oce)
+      pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp                 ! heat content flux ( > 0 from isf to oce)
       !
       ! output thermal driving and freezinpoint at the ice shelf interface
       CALL iom_put('isfthermald_cav', zthd )
-      CALL iom_put('isftfrz_cav'    , ztfrz )
+      CALL iom_put('isftfrz_cav'    , ztfrz(:,:) * mskisf_cav(:,:) )
       !
    END SUBROUTINE isfcav_mlt_2eq
@@ -210 +213 @@
       ! compute upward heat flux zhtflx and upward water flux zwflx
       ! Resolution of a 3d equation from equation 24, 25 and 26 (note conduction through the ice has been added to Eq 24)
-      DO_2D( 1, 1, 1, 1 )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
          !
          ! compute coeficient to solve the 2nd order equation
@@ -238 +241 @@
          !
          ! compute the upward water and heat flux (eq. 24 and eq. 26)
-         pqfwf(ji,jj) = rho0     * pgs(ji,jj) * ( zsfrz - pstbl(ji,jj) ) / MAX(zsfrz,zeps) ! fresh water flux    (> 0 out)
-         pqoce(ji,jj) = rho0_rcp * pgt(ji,jj) * zthd (ji,jj)                               ! ocean-ice heat flux (> 0 out)
-         pqhc (ji,jj) = rcp      * pqfwf(ji,jj) * ztfrz(ji,jj)                             ! heat content   flux (> 0 out)
+         pqfwf(ji,jj) = - rho0     * pgs(ji,jj) * ( zsfrz - pstbl(ji,jj) ) / MAX(zsfrz,zeps) ! fresh water flux    ( > 0 from isf to oce)
+         pqoce(ji,jj) = - rho0_rcp * pgt(ji,jj) * zthd (ji,jj)                               ! ocean-ice heat flux ( > 0 from isf to oce)
+         pqhc (ji,jj) =   rcp      * pqfwf(ji,jj) * ztfrz(ji,jj)                             ! heat content   flux ( > 0 from isf to oce)
          !
          zqcon(ji,jj) = zeps3 * ( ztfrz(ji,jj) - rtsurf )
@@ -281 +284 @@
       CALL eos_fzp( pstbl(:,:), ztfrz(:,:), risfdep(:,:) )
       !
-      ! read input file
+      ! read input file of fwf from isf to oce
       CALL fld_read ( kt, 1, sf_isfcav_fwf )
       !
       ! ice shelf 2d map
-      zfwf(:,:) = - sf_isfcav_fwf(1)%fnow(:,:,1)
+      zfwf(:,:) = sf_isfcav_fwf(1)%fnow(:,:,1)
       !
       ! compute glob sum from input file
@@ -300 +303 @@
       ! define fwf and qoce
       ! ocean heat flux is assume to be equal to the latent heat
-      pqfwf(:,:) =   zfwf(:,:)                         ! fwf                ( >0 out)
-      pqoce(:,:) = - pqfwf(:,:) * rLfusisf             ! ocean heat flux    ( >0 out)
-      pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp     ! heat content flux  ( >0 out)
+      pqfwf(:,:) =   zfwf(:,:)                         ! fwf                ( > 0 from isf to oce)
+      pqoce(:,:) = - pqfwf(:,:) * rLfusisf             ! ocean heat flux    ( > 0 from isf to oce)
+      pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp     ! heat content flux  ( > 0 from isf to oce)
       !
       CALL iom_put('isftfrz_cav', ztfrz * mskisf_cav(:,:) )

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+