Changeset 14009 for NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/ICE/icestp.F90

Timestamp:

2020-12-02T15:42:07+01:00 (3 years ago)

Author:

gsamson

Message:

dev_r2052_ENHANCE-09_rbourdal_massfluxconvection update with trunk@r14008

Location:

NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection

Files:

• . (modified) (1 prop)
• src/ICE/icestp.F90 (modified) (6 diffs)

NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette_MPI3_LoopFusion@13943         sette
+^/utils/CI/sette_wave@13990         sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette_MPI3_LoopFusion@13943         sette
+^/utils/CI/sette_wave@13990         sette

NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/ICE/icestp.F90

@@ -121 +121 @@
       !!----------------------------------------------------------------------
       !
-      IF( ln_timing )   CALL timing_start('ice_stp')
+      IF( ln_timing )   CALL timing_start('icestp')
       !
       !                                      !-----------------------!
@@ -215 +215 @@
 !!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!!
       !
-      IF( ln_timing )   CALL timing_stop('ice_stp')
+      IF( ln_timing )   CALL timing_stop('icestp')
       !
    END SUBROUTINE ice_stp
@@ -373 +373 @@
       v_i_b (:,:,:)   = v_i (:,:,:)     ! ice volume
       v_s_b (:,:,:)   = v_s (:,:,:)     ! snow volume
+      v_ip_b(:,:,:)   = v_ip(:,:,:)     ! pond volume
+      v_il_b(:,:,:)   = v_il(:,:,:)     ! pond lid volume
       sv_i_b(:,:,:)   = sv_i(:,:,:)     ! salt content
       e_s_b (:,:,:,:) = e_s (:,:,:,:)   ! snow thermal energy
@@ -432 +434 @@
          diag_heat(ji,jj) = 0._wp ;   diag_sice(ji,jj) = 0._wp
          diag_vice(ji,jj) = 0._wp ;   diag_vsnw(ji,jj) = 0._wp
+         diag_aice(ji,jj) = 0._wp ;   diag_vpnd(ji,jj) = 0._wp
 
          tau_icebfr (ji,jj) = 0._wp   ! landfast ice param only (clem: important to keep the init here)
@@ -457 +460 @@
             qcn_ice    (ji,jj,jl) = 0._wp   ! conductive flux (ln_cndflx=T & ln_cndemule=T)
             qtr_ice_bot(ji,jj,jl) = 0._wp   ! part of solar radiation transmitted through the ice needed at least for outputs
+            ! Melt pond surface melt diagnostics (mv - more efficient: grouped into one water volume flux)
+            dh_i_sum_2d(ji,jj,jl) = 0._wp
+            dh_s_mlt_2d(ji,jj,jl) = 0._wp
          END_2D
       ENDDO
@@ -485 +491 @@
          diag_vsnw(:,:) = diag_vsnw(:,:) &
             &             + SUM(     v_s (:,:,:)          - v_s_b (:,:,:)                  , dim=3 ) * r1_Dt_ice * rhos
+         diag_vpnd(:,:) = diag_vpnd(:,:) &
+            &             + SUM(     v_ip + v_il          - v_ip_b - v_il_b                , dim=3 ) * r1_Dt_ice * rhow
          !
          IF( kn == 2 )    CALL iom_put ( 'hfxdhc' , diag_heat )   ! output of heat trend

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette_MPI3_LoopFusion@13943         sette
+^/utils/CI/sette_wave@13990         sette