Changeset 10714

Timestamp:

2019-02-22T16:13:22+01:00 (4 years ago)

Author:

mathiot

Message:

fix ticket #1595 included into the trunk

File:

• NEMO/trunk/src/OCE/ICB/icbclv.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/ICB/icbclv.F90

@@ -24 +24 @@
    USE icbdia         ! iceberg diagnostics
    USE icbutl         ! iceberg utility routines
+   USE icb_oce        ! iceberg parameters 
 
    IMPLICIT NONE
@@ -57 +58 @@
       ! this assumes that input is given as equivalent water flux so that pure water density is appropriate
 
-      zfact = ( (1000._wp)**3 / ( NINT(rday) * nyear_len(1) ) ) * 850._wp
-      berg_grid%calving(:,:) = src_calving(:,:) * tmask_i(:,:) * zfact
+      zfact = ( (1000._wp)**3 / ( NINT(rday) * nyear_len(1) ) ) * rn_rho_bergs
+      berg_grid%calving(:,:) = src_calving(:,:) * zfact * tmask_i(:,:) * tmask(:,:,1)
 
       ! Heat in units of W/m2, and mask (just in case)
-      berg_grid%calving_hflx(:,:) = src_calving_hflx(:,:) * tmask_i(:,:)
+      berg_grid%calving_hflx(:,:) = src_calving_hflx(:,:) * tmask_i(:,:) * tmask(:,:,1)
 
       IF( ll_first_call .AND. .NOT. l_restarted_bergs ) THEN      ! This is a hack to simplify initialization