Changeset 13359 for NEMO/branches/2020/tickets_icb_1900/src/OCE/ICB/icbthm.F90

Timestamp:

2020-07-30T15:40:36+02:00 (4 years ago)

Author:

mathiot

Message:

ticket #1900: add subroutine icb_utl_zavg, fix issue in icb_utl_getkb, add subroutine test_icb_utl_getkb to test awkward cases (will be removed after the review), simplify icbdyn.F90 icbthm.F90 according to the new routine created.

File:

• NEMO/branches/2020/tickets_icb_1900/src/OCE/ICB/icbthm.F90 (modified) (3 diffs)

NEMO/branches/2020/tickets_icb_1900/src/OCE/ICB/icbthm.F90

@@ -54 +54 @@
       REAL(wp) ::   zMbits, znMbits, zdMbitsE, zdMbitsM, zLbits, zAbits, zMbb
       REAL(wp) ::   zxi, zyj, zff, z1_rday, z1_e1e2, zdt, z1_dt, z1_dt_e1e2, zdepw
-      REAL(wp), DIMENSION(jpk) :: ztoce, zuoce, zvoce, ze3t, ztmp
+      REAL(wp), DIMENSION(jpk) :: ztoce, zuoce, zvoce, ze3t, zzMv
       TYPE(iceberg), POINTER ::   this, next
       TYPE(point)  , POINTER ::   pt
@@ -142 +142 @@
          IF ( ln_M2016 ) THEN
             ! Buoyant convection at sides (eqn M.A10) but averaging along all the iceberg draft
-            ztmp(:) = MAX( 7.62d-3*ztoce(:)+1.29d-3*(ztoce(:)**2), 0._wp ) * z1_rday
-            zMv = 0.0; zdepw = 0.0
-            DO jk = 1,ikb-1
-               zMv = zMv + ze3t(jk)*ztmp(jk)
-               zdepw = zdepw + ze3t(jk)
-            END DO
-            zMv = (zMv + (zD - zdepw)*ztmp(ikb)) / zD
+            zzMv(:) = MAX( 7.62d-3*ztoce(:)+1.29d-3*(ztoce(:)**2), 0._wp ) * z1_rday
+            CALL icb_utl_zavg(zMv, zzMv, ze3t, zD, ikb )
          ELSE
             zMv = MAX( 7.62d-3*zSST+1.29d-3*(zSST**2), 0._wp ) * z1_rday
@@ -262 +257 @@
 
 !!gm  add a test to avoid over melting ?
+!!pm  I agree, over melting could break conservation (more melt than calving)
 
          IF( zMnew <= 0._wp ) THEN       ! Delete the berg if completely melted